Merge branch 'szzh' into dev_hjq

Conflicts:
	public/stylesheets/new_user.css

app/controllers/account_controller.rb

@@ -41,6 +41,10 @@ class AccountController < ApplicationController
     render :layout => 'static_base'
   end
 
+  def about_us
+    render :layout => 'static_base'
+  end
+
   # Log out current user and redirect to welcome page
   def logout
     if User.current.anonymous?

app/controllers/comments_controller.rb

@@ -19,7 +19,7 @@ class CommentsController < ApplicationController
   default_search_scope :news
   include ApplicationHelper
   model_object News
-  before_filter :find_model_object 
+  before_filter :find_model_object
   before_filter :find_project_from_association
   before_filter :authorize
 
@@ -34,24 +34,31 @@ class CommentsController < ApplicationController
         ids = params[:asset_id].split(',')
         update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT
       end
-      # 与我相关动态的记录add start
-      if( @comment.id && @news.course )
-        if(@news.author_id != User.current.id)
-          notify = ActivityNotify.new()
-          notify.activity_container_id = @news.course.id
-          notify.activity_container_type = 'Course'
-          notify.activity_id = @comment.id
-          notify.activity_type = 'Comment'
-          notify.notify_to = @news.author_id
-          notify.is_read = 0
-          notify.save()
-        end
-      end
-      # 与我相关动态的记录add end
+      # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add start
+      # if( @comment.id && @news.course )
+      #   if(@news.author_id != User.current.id)
+      #     notify = ActivityNotify.new()
+      #     notify.activity_container_id = @news.course.id
+      #     notify.activity_container_type = 'Course'
+      #     notify.activity_id = @comment.id
+      #     notify.activity_type = 'Comment'
+      #     notify.notify_to = @news.author_id
+      #     notify.is_read = 0
+      #     notify.save()
+      #   end
+      # end
+      # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
       flash[:notice] = l(:label_comment_added)
     end
 
-    redirect_to news_url(@news)
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
+    else
+      redirect_to news_url(@news)
+    end
   end
 
   def destroy
@@ -69,6 +76,6 @@ class CommentsController < ApplicationController
     @comment = nil
     @news
   end
-   
-  
+
+
 end

app/controllers/homework_common_controller.rb

@@ -115,23 +115,16 @@ class HomeworkCommonController < ApplicationController
           end
         end
 
-        # uri = URI('http://test.gitlab.trustie.net/api/questions.json')
-        # req = Net::HTTP::Post.new(uri, initheader = {'Content-Type' =>'application/json'})
-        # req.body = question.to_json
-        # res = Net::HTTP.start(uri.hostname, uri.port) do |http|
-        #   http.request(req)
+        # uri = URI('http://192.168.80.21:8080/api/questions.json')
+        # body = question.to_json
+        # res = Net::HTTP.new(uri.host, uri.port).start do |client|
+        #   request                 = Net::HTTP::Post.new(uri.path)
+        #   request.body            = body
+        #   request["Content-Type"] = "application/json"
+        #   client.request(request)
         # end
-
-        uri = URI('http://192.168.80.21:8080/api/questions.json')
-        body = question.to_json
-        res = Net::HTTP.new(uri.host, uri.port).start do |client|
-          request                 = Net::HTTP::Post.new(uri.path)
-          request.body            = body
-          request["Content-Type"] = "application/json"
-          client.request(request)
-        end
-        result = JSON.parse(res.body)
-        homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
+        # result = JSON.parse(res.body)
+        # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
 
         homework.homework_detail_programing = homework_detail_programing
       else
@@ -254,15 +247,15 @@ class HomeworkCommonController < ApplicationController
         question[:input] << test.input
         question[:output] << test.output
       end
-      uri = URI("http://192.168.80.21:8080/api/questions/#{@homework_detail_programing.question_id}.json")
-      body = question.to_json
-      res = Net::HTTP.new(uri.host, uri.port).start do |client|
-        request                 = Net::HTTP::Put.new(uri.path)
-        request.body            = body
-        request["Content-Type"] = "application/json"
-        client.request(request)
-      end
-      result = JSON.parse(res.body)
+      # uri = URI("http://192.168.80.21:8080/api/questions/#{@homework_detail_programing.question_id}.json")
+      # body = question.to_json
+      # res = Net::HTTP.new(uri.host, uri.port).start do |client|
+      #   request                 = Net::HTTP::Put.new(uri.path)
+      #   request.body            = body
+      #   request["Content-Type"] = "application/json"
+      #   client.request(request)
+      # end
+      # result = JSON.parse(res.body)
     end
 
     @homework.save_attachments(params[:attachments])
@@ -406,4 +399,4 @@ class HomeworkCommonController < ApplicationController
     student_works += student_works
     student_works[index + 1 .. index + n]
   end
-end
+end

app/controllers/issues_controller.rb

@@ -20,11 +20,11 @@ class IssuesController < ApplicationController
   default_search_scope :issues
 
   before_filter :authorize1, :only => [:show]
-  before_filter :find_issue, :only => [:show, :edit, :update]
+  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal]
   before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
   before_filter :find_project, :only => [:new, :create, :update_form]
   #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index]
+  before_filter :authorize, :except => [:index,:add_journal]
 
   before_filter :find_optional_project, :only => [:index]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
@@ -66,14 +66,14 @@ class IssuesController < ApplicationController
 
     if @query.valid?
       case params[:format]
-      when 'csv', 'pdf'
-        @limit = 10#Setting.issues_export_limit.to_i
-      when 'atom'
-        @limit = 10#Setting.feeds_limit.to_i
-      when 'xml', 'json'
-        @offset, @limit = api_offset_and_limit({:limit => 10})
-      else
-        @limit = 10#per_page_option
+        when 'csv', 'pdf'
+          @limit = 10#Setting.issues_export_limit.to_i
+        when 'atom'
+          @limit = 10#Setting.feeds_limit.to_i
+        when 'xml', 'json'
+          @offset, @limit = api_offset_and_limit({:limit => 10})
+        else
+          @limit = 10#per_page_option
       end
       @assign_to_id = params[:assigned_to_id]
       @author_id = params[:author_id]
@@ -84,9 +84,9 @@ class IssuesController < ApplicationController
       @issue_pages = Paginator.new @issue_count, @limit, params['page']
       @offset ||= @issue_pages.offset
       @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
-                                :order => sort_clause,
-                                :offset => @offset,
-                                :limit => @limit)
+                              :order => sort_clause,
+                              :offset => @offset,
+                              :limit => @limit)
       @issue_count_by_group = @query.issue_count_by_group
       respond_to do |format|
         format.js
@@ -145,16 +145,16 @@ class IssuesController < ApplicationController
     @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
 
     respond_to do |format|``
-      format.html {
-        retrieve_previous_and_next_issue_ids
-        render :template => 'issues/show', :layout => @project_base_tag#by young
-      }
-      format.api
-      format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
-      format.pdf  {
-        pdf = issue_to_pdf(@issue, :journals => @journals)
-        send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
-      }
+    format.html {
+      retrieve_previous_and_next_issue_ids
+      render :template => 'issues/show', :layout => @project_base_tag#by young
+    }
+    format.api
+    format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
+    format.pdf  {
+      pdf = issue_to_pdf(@issue, :journals => @journals)
+      send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
+    }
     end
   end
 
@@ -324,8 +324,8 @@ class IssuesController < ApplicationController
       issue.reload
       if @copy
         issue = issue.copy({},
-          :attachments => params[:copy_attachments].present?,
-          :subtasks => params[:copy_subtasks].present?
+                           :attachments => params[:copy_attachments].present?,
+                           :subtasks => params[:copy_subtasks].present?
         )
       end
       journal = issue.init_journal(User.current, params[:notes])
@@ -355,21 +355,21 @@ class IssuesController < ApplicationController
     @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
     if @hours > 0
       case params[:todo]
-      when 'destroy'
-        # nothing to do
-      when 'nullify'
-        TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
-      when 'reassign'
-        reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
-        if reassign_to.nil?
-          flash.now[:error] = l(:error_issue_not_found_in_project)
-          return
+        when 'destroy'
+          # nothing to do
+        when 'nullify'
+          TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
+        when 'reassign'
+          reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
+          if reassign_to.nil?
+            flash.now[:error] = l(:error_issue_not_found_in_project)
+            return
+          else
+            TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
+          end
         else
-          TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
-        end
-      else
-        # display the destroy form if it's a user request
-        return unless api_request?
+          # display the destroy form if it's a user request
+          return unless api_request?
       end
     end
     @issues.each do |issue|
@@ -385,6 +385,18 @@ class IssuesController < ApplicationController
     end
   end
 
+  def add_journal
+    jour = Journal.new
+    jour.user_id = User.current.id
+    jour.notes = params[:notes]
+    jour.journalized = @issue
+    jour.save
+    @user_activity_id = params[:user_activity_id]
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def find_project
@@ -425,14 +437,14 @@ class IssuesController < ApplicationController
     issue_attributes = params[:issue]
     if issue_attributes && params[:conflict_resolution]
       case params[:conflict_resolution]
-      when 'overwrite'
-        issue_attributes = issue_attributes.dup
-        issue_attributes.delete(:lock_version)
-      when 'add_notes'
-        issue_attributes = issue_attributes.slice(:notes)
-      when 'cancel'
-        redirect_to issue_url(@issue)
-        return false
+        when 'overwrite'
+          issue_attributes = issue_attributes.dup
+          issue_attributes.delete(:lock_version)
+        when 'add_notes'
+          issue_attributes = issue_attributes.slice(:notes)
+        when 'cancel'
+          redirect_to issue_url(@issue)
+          return false
       end
     end
     @issue.safe_attributes = issue_attributes

app/controllers/messages_controller.rb

@@ -177,6 +177,7 @@ class MessagesController < ApplicationController
     @reply.board = @board
     @reply.safe_attributes = params[:reply]
     @reply.content = @quote + @reply.content
+    @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
     @topic.children << @reply
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
@@ -185,41 +186,18 @@ class MessagesController < ApplicationController
         update_kindeditor_assets_owner ids,@reply.id,OwnerTypeHelper::MESSAGE
       end
 
-      # 与我相关动态的记录add start
-      if(@board && @board.course) #项目的先不管
-        notifyto_arr = {}
-        notifyto_arr[@topic.author_id] = @topic.author_id
-        if( params[:parent_topic] != nil && params[:parent_topic] != '')
-          parent_topic = Message.find(params[:parent_topic])
-          notifyto_arr[parent_topic.author_id] = parent_topic.author_id
-        end
-        notifyto_arr.each do |k,user_id|
-          if(user_id != User.current.id)
-            notify = ActivityNotify.new()
-            if(@board.course)
-              notify.activity_container_id = @board.course_id
-              notify.activity_container_type = 'Course'
-            else
-              notify.activity_container_id = @board.project_id
-              notify.activity_container_type = 'Project'
-            end
-            notify.activity_id = @reply.id
-            notify.activity_type = 'Message'
-            notify.notify_to = user_id
-            notify.is_read = 0
-            notify.save()
-          end
-        end
-      end
-      # 与我相关动态的记录add end
-
       call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
       attachments = Attachment.attach_files(@reply, params[:attachments])
       render_attachment_warning_if_needed(@reply)
     else
       #render file: 'messages#show', layout: 'base_courses'
     end
-    if params[:is_board]
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
+    elsif params[:is_board]
       if @project
         redirect_to project_boards_path(@project)
       elsif @course

app/controllers/student_work_controller.rb

@@ -3,13 +3,45 @@ class StudentWorkController < ApplicationController
   include StudentWorkHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test]
   before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
   before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list]
   protect_from_forgery :except => :set_program_score
 
+  ### 
+  def program_test
+    resultObj = {status: 0, results: [], error_msg: '', time: Time.now}
+    student_work = find_or_save_student_work
+    unless student_work
+      resultObj[:status] = 100
+    else 
+      if @homework.homework_type == 2 && @homework.homework_detail_programing     
+        result = test_realtime(student_work, params[:src])
+        logger.debug result
+        resultObj[:status] = result["status"]
+        resultObj[:results] = result["results"]
+        resultObj[:error_msg] = result["error_msg"]
+        results = result["results"]
+        if result["status"].to_i == -2 #编译错误
+          results = [result["error_msg"]]
+        end
+        student_work_test = student_work.student_work_tests.build(status: result["status"],  results: results,
+          src: params[:src])
+        unless student_work.save
+          resultObj[:status] = 200
+        else
+          resultObj[:status] = result["status"].to_i
+          resultObj[:time] = student_work_test.created_at.to_s(:db)
+          resultObj[:index] = student_work.student_work_tests.count
+        end
+
+      end
+    end
+    render :json => resultObj
+  end
+
   def index
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages
@@ -102,20 +134,16 @@ class StudentWorkController < ApplicationController
   end
 
   def new
-    student_work = @homework.student_works.where("user_id = ?",User.current.id).first
-    if student_work.nil?
-      @stundet_work = StudentWork.new
-      respond_to do |format|
-        format.html
-      end
-    else
-      render_403
+    @student_work = @homework.student_works.where("user_id = ?",User.current.id).first
+    if @student_work.nil?
+      @student_work = StudentWork.new
     end
   end
 
   def create
     if params[:student_work]
-      stundet_work = StudentWork.new
+      stundet_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
+      stundet_work ||= StudentWork.new
       stundet_work.name = params[:student_work][:name]
       stundet_work.description = params[:student_work][:description]
       stundet_work.project_id = params[:student_work][:project_id]
@@ -128,23 +156,9 @@ class StudentWorkController < ApplicationController
         stundet_work.late_penalty = 0
       end
       render_attachment_warning_if_needed(stundet_work)
-
       if stundet_work.save
         if @homework.homework_type == 2 && @homework.homework_detail_programing       #编程作业，学生提交作品后计算系统得分
-          url = "http://192.168.80.21:8080/api/questions/#{@homework.homework_detail_programing.question_id}/solutions.json"
-          solutions = {
-              student_work_id:stundet_work.id,
-              src:Base64.encode64(stundet_work.description),
-              language:@homework.homework_detail_programing.language
-          }
-          uri = URI(url)
-          body = solutions.to_json
-          res = Net::HTTP.new(uri.host, uri.port).start do |client|
-            request                 = Net::HTTP::Post.new(uri.path)
-            request.body            = body
-            request["Content-Type"] = "application/json"
-            client.request(request)
-          end
+         
         end
         respond_to do |format|
           format.html {
@@ -584,4 +598,44 @@ class StudentWorkController < ApplicationController
     book.write xls_report
     xls_report.string
   end
+
+  def find_or_save_student_work
+    student_work = @homework.student_works.where(user_id: User.current.id).first
+    if student_work.nil?
+      @homework.student_works.build(
+        name: params[:title],
+        description: params[:src],
+        user_id: User.current.id
+        )
+      unless @homework.save
+      else
+        student_work = @homework.student_works.where(user_id: User.current.id).first
+      end
+    end
+    student_work
+  end
+
+
+  def test_realtime(student_work, src)
+    url = "#{Redmine::Configuration['judge_server']}api/realtime_test.json"
+
+    factor = []
+    @homework.homework_tests.each do |test|
+      factor << {input: test.input, output: test.output}
+    end
+    solutions = {
+        src:src,
+        language:@homework.homework_detail_programing.language,
+        factor: factor
+            }
+    uri = URI(url)
+    body = solutions.to_json
+    res = Net::HTTP.new(uri.host, uri.port).start do |client|
+      request                 = Net::HTTP::Post.new(uri.path)
+      request.body            = body
+      request["Content-Type"] = "application/json"
+      client.request(request)
+    end
+    JSON.parse(res.body)
+  end
 end

app/controllers/users_controller.rb

@@ -41,12 +41,12 @@ class UsersController < ApplicationController
   before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
   #edit has been deleted by huang, 2013-9-23
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
-                                  :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
-                                  :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
-                                  :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
-                                  :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
-                                  :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
-                                  :user_import_homeworks,:user_search_homeworks,:user_import_resource]
+                                      :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
+                                      :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
+                                      :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
+                                      :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
+                                      :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
+                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -218,7 +218,7 @@ class UsersController < ApplicationController
   end
 # end
 
-  ##added by fq
+##added by fq
   def watch_bids
     # cond = 'bids.reward_type <> 1'
     # @bids = Bid.watched_by(@user).where('reward_type = ?', 1) # added by huang
@@ -281,7 +281,7 @@ class UsersController < ApplicationController
     unless User.current.admin?
       if !@user.active? || (@user != User.current  && @memberships.empty? && events.empty?)
         render_404
-      return
+        return
       end
     end
 
@@ -342,6 +342,24 @@ class UsersController < ApplicationController
     end
   end
 
+  def new_user_commit_homework
+    @user = User.current
+    @homework = HomeworkCommon.find(params[:homework_id])
+    @student_work = @homework.student_works.where(user_id: User.current.id).first
+    if @student_work.nil?
+      @student_work = StudentWork.new
+    end
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base_user'}
+    end
+  end
+
+  def user_commit_homework
+    flash[:notice] = l(:notice_successful_create)
+    redirect_to user_homeworks_user_path(User.current)
+  end
+
   def user_new_homework
     if params[:homework_common]
       homework = HomeworkCommon.new
@@ -349,7 +367,7 @@ class UsersController < ApplicationController
       homework.description = params[:homework_common][:description]
       homework.end_time = params[:homework_common][:end_time] || Time.now
       homework.publish_time = Time.now
-      homework.homework_type = 1
+      homework.homework_type = params[:homework_type].to_i || 1
       homework.late_penalty = 2
       homework.user_id = User.current.id
       homework.course_id = params[:course_id]
@@ -358,17 +376,36 @@ class UsersController < ApplicationController
       render_attachment_warning_if_needed(homework)
 
       #匿评作业相关属性
-      homework_detail_manual = HomeworkDetailManual.new
-      homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-      homework_detail_manual.comment_status = 1
-      homework_detail_manual.evaluation_start = Time.now
-      homework_detail_manual.evaluation_end = Time.now
-      homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-      homework_detail_manual.absence_penalty = 2
-      homework.homework_detail_manual = homework_detail_manual
+      if homework.homework_type == 1
+        homework_detail_manual = HomeworkDetailManual.new
+        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+        homework_detail_manual.comment_status = 1
+        homework_detail_manual.evaluation_start = Time.now
+        homework_detail_manual.evaluation_end = Time.now
+        homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+        homework_detail_manual.absence_penalty = 2
+        homework.homework_detail_manual = homework_detail_manual
+      else
+        homework_detail_programing = HomeworkDetailPrograming.new
+        homework.homework_detail_programing = homework_detail_programing
+        homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+        homework_detail_programing.language = params[:program][:language].to_i
+
+        inputs = params[:program][:input]
+        if Array === inputs
+          inputs.each_with_index do |val, i|
+            homework.homework_tests << HomeworkTest.new(
+              input: val,
+              output: params[:program][:output][i]
+            )    
+          end
+        end
+        
+      end
 
       if homework.save
         homework_detail_manual.save if homework_detail_manual
+        homework_detail_programing.save if homework_detail_programing
         redirect_to user_homeworks_user_path(User.current.id)
       end
     end
@@ -376,9 +413,102 @@ class UsersController < ApplicationController
 
   #用户从资源库导入资源到作业
   def user_import_resource
-    user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @user = User.current
+    user_course_ids = @user.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
     @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
                                         "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    @type = params[:type]
+    @homework_id = params[:homework_id]
+    @limit = 7
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,7
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #引入资源列表根据类型过滤
+  def user_resource_type
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    if(params[:type].blank? || params[:type] == "1") #全部
+      user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                          "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    elsif params[:type] == "2" #课程资源
+      user_course_ids = User.current.courses.map { |c| c.id}
+      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
+    elsif params[:type] == "3" #项目资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
+    elsif params[:type] == "4" #附件
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+    elsif params[:type] == "5" #用户资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal'").order("created_on desc")
+    end
+    @type = params[:type]
+    @limit = 7
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,7
+    respond_to do |format|
+      format.js
+    end
+  end
+
+
+  #引入资源列表根据关键词过滤
+  def user_ref_resource_search
+    search = params[:search].to_s.strip.downcase
+    if(params[:type].blank? || params[:type] == "1") #全部
+      user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
+      @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                          " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "2" #课程资源
+      user_course_ids = User.current.courses.map { |c| c.id}
+      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "3" #项目资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "4" #附件
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "5" #用户资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
+    end
+    @type = params[:type]
+    @limit = 7
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,7
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #将资源批量引入
+  def import_resources_to_homework
+    @attachments = []
+    unless  params[:checkbox1].nil? || params[:checkbox1].blank?
+      params[:checkbox1].each do  |id|
+        atta = Attachment.find(id)
+        att_copy = atta.copy
+        att_copy.container_id = nil
+        att_copy.container_type = nil
+        att_copy.copy_from = atta.id
+        att_copy.save
+        @attachments << att_copy
+      end
+    end
     respond_to do |format|
       format.js
     end
@@ -440,16 +570,16 @@ class UsersController < ApplicationController
     sort_update %w(login firstname lastname mail admin created_on last_login_on)
 
     case params[:format]
-    when 'xml', 'json'
-      @offset, @limit = api_offset_and_limit({:limit => 15})
-    else
-      @limit = 15
+      when 'xml', 'json'
+        @offset, @limit = api_offset_and_limit({:limit => 15})
+      else
+        @limit = 15
     end
 
     # retrieve all users
     # 先内连一下statuses 保证排序之后数量一致
     scope = User.visible.
-                joins("INNER JOIN user_statuses ON users.id = user_statuses.user_id")
+        joins("INNER JOIN user_statuses ON users.id = user_statuses.user_id")
 
     # unknow
     scope = scope.in_group(params[:group_id]) if params[:group_id].present?
@@ -460,29 +590,29 @@ class UsersController < ApplicationController
 
     # users classify
     case params[:user_sort_type]
-    when '0'
-      # 创建时间排序
-      @s_type = 0
-      @users = scope.reorder('users.created_on DESC')
-    when '1'
-      # 活跃度排序, 就是所谓的得分情况
-      @s_type = 1
-      @users = scope.
-                joins("LEFT JOIN option_numbers ON users.id = option_numbers.user_id and option_numbers.score_type = 1").
-                reorder('option_numbers.total_score DESC')
-    when '2'
-      # 粉丝数排序
-      @s_type = 2
-      @users = scope.
-                #joins("INNER JOIN user_statuses ON users.id = user_statuses.user_id").
-                reorder('user_statuses.watchers_count DESC')
+      when '0'
+        # 创建时间排序
+        @s_type = 0
+        @users = scope.reorder('users.created_on DESC')
+      when '1'
+        # 活跃度排序, 就是所谓的得分情况
+        @s_type = 1
+        @users = scope.
+            joins("LEFT JOIN option_numbers ON users.id = option_numbers.user_id and option_numbers.score_type = 1").
+            reorder('option_numbers.total_score DESC')
+      when '2'
+        # 粉丝数排序
+        @s_type = 2
+        @users = scope.
+            #joins("INNER JOIN user_statuses ON users.id = user_statuses.user_id").
+            reorder('user_statuses.watchers_count DESC')
 
-    else
-      # 默认活跃度排序
-      @s_type = 1
-      @users = scope.
-          joins("LEFT JOIN option_numbers ON users.id = option_numbers.user_id and option_numbers.score_type = 1").
-          reorder('option_numbers.total_score DESC')
+      else
+        # 默认活跃度排序
+        @s_type = 1
+        @users = scope.
+            joins("LEFT JOIN option_numbers ON users.id = option_numbers.user_id and option_numbers.score_type = 1").
+            reorder('option_numbers.total_score DESC')
     end
 
     # limit and offset
@@ -502,20 +632,20 @@ class UsersController < ApplicationController
     sort_init 'login', 'asc'
     sort_update %w(login firstname lastname mail admin created_on last_login_on)
     (redirect_to user_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
-      case params[:format]
+    case params[:format]
       when 'xml', 'json'
         @offset, @limit = api_offset_and_limit({:limit => 15})
       else
         @limit = 15#per_page_option
-      end
-      #
-      #@status = params[:status] || 1
-      #has = {
-      #  "show_changesets" => true
-      #}
-      #   scope = User.logged.status(@status)
-      #   @search_by = params[:search_by] ? params[:search_by][:id] : 0
-      #   scope = scope.like(params[:name],@search_by) if params[:name].present?
+    end
+    #
+    #@status = params[:status] || 1
+    #has = {
+    #  "show_changesets" => true
+    #}
+    #   scope = User.logged.status(@status)
+    #   @search_by = params[:search_by] ? params[:search_by][:id] : 0
+    #   scope = scope.like(params[:name],@search_by) if params[:name].present?
     @search_by = params[:search_by] ? params[:search_by] : 0
 
     us = UsersService.new
@@ -548,13 +678,13 @@ class UsersController < ApplicationController
   def user_courses4show
     @page = params[:page].to_i + 1
     @courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
-      end
+  end
 
   #显示更多用户项目
   def user_projects4show
     @page = params[:page].to_i + 1
     @projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
-    end
+  end
 
   def user_course_activities
     lastid = nil
@@ -631,9 +761,7 @@ class UsersController < ApplicationController
   end
 
   def show
-
     @page = params[:page] ? params[:page].to_i + 1 : 0
-
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','poll')"
@@ -654,7 +782,7 @@ class UsersController < ApplicationController
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
         else
           @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
-     end
+      end
     else
       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
     end
@@ -672,124 +800,124 @@ class UsersController < ApplicationController
     # Author lizanle
     # Description type 1 :所有动态包括我关注的人 type 2:我的动态 type 3:关于我的回复
     case params[:type]
-    when "1"
-      if @user == User.current
-      activity = Activity.where('user_id = ?', User.current.id).order('id desc')
-      @activity_count = activity.count
-      @activity_pages = Paginator.new @activity_count, pre_count, params['page']
-      @activity = activity.offset(@activity_pages.offset).limit(@activity_pages.per_page).all
-      @state = 1
-      end
-    when "2"
-      message = []
-      if @user == User.current
-        message = JournalsForMessage.reference_message(@user.id)
-        message += Journal.reference_message(@user.id)
-      end
-      @activity_count = message.size
-      @info_pages = Paginator.new @activity_count, pre_count, params['page']
-      messages = message.sort {|x,y| y.created_on <=> x.created_on }
-      @message = messages[@info_pages.offset, @info_pages.per_page]
-      @state = 2
-      else
-      # Time 2015-02-04 10:50:49
-      # Author lizanle
-      # Description 所有动态
-      where_condition = nil;
-      # where_condition = "act_type <> 'JournalsForMessage'"
-      user_ids = []
-      if @user == User.current
-        watcher = User.watched_by(@user)
-        watcher.push(User.current)
-        user_ids = watcher.map{|x| x.id}
-      else
-        user_ids << @user.id
-      end
-      activity = Activity.where(where_condition).where(user_id: user_ids).order('id desc')
-
-      permission = !User.current.admin?
-      if permission
-        #Issue
-        act_ids = activity.where(act_type: 'Issue').select('act_id').map{|x| x.act_id}
-        project_ids = Issue.where(id: act_ids).select('distinct project_id').map{|x| x.project_id}
-        p_ids = []
-        Project.where(id: project_ids).each do |x|
-          p_ids << x.id unless x.visible?(User.current)
-        end
-        ids = []
-        ids << Issue.where(id: act_ids, project_id: p_ids).map{|x| x.id}
-
-        #HomeworkCommon
-        act_ids = activity.where(act_type: 'HomeworkCommon').select('act_id').map{|x| x.act_id}
-        course_ids = HomeworkCommon.where(id: act_ids).select('distinct course_id').map{|x| x.course_id}
-        c_ids = []
-        Course.where(id: course_ids).each do |x|
-          c_ids << x.id unless x.is_public !=0 && User.current.member_of_course?(x)
+      when "1"
+        if @user == User.current
+          activity = Activity.where('user_id = ?', User.current.id).order('id desc')
+          @activity_count = activity.count
+          @activity_pages = Paginator.new @activity_count, pre_count, params['page']
+          @activity = activity.offset(@activity_pages.offset).limit(@activity_pages.per_page).all
+          @state = 1
         end
-        ids << HomeworkCommon.where(id: act_ids, course_id: c_ids).map{|x| x.id}
-
-        #Journal
-        act_ids = activity.where(act_type: 'Journal').select('act_id').map{|x| x.act_id}
-        project_ids =  Journal.where(id:act_ids, journalized_type: 'Project').select('distinct journalized_id').map{|x| x.journalized_id}
-        p_ids = []
-        Project.where(id: project_ids).each do |x|
-          p_ids << x.id unless x.visible?(User.current)
+      when "2"
+        message = []
+        if @user == User.current
+          message = JournalsForMessage.reference_message(@user.id)
+          message += Journal.reference_message(@user.id)
         end
-        ids << Journal.where(id: act_ids, journalized_id: p_ids, journalized_type: 'Project').map{|x| x.id}
-
-        #News
-        act_ids = activity.where(act_type: 'News').select('act_id').map{|x| x.act_id}
-        project_ids = News.where(id: act_ids).select('distinct project_id').map{|x| x.project_id}
-        p_ids = []
-        Project.where(id: project_ids).each do |x|
-          p_ids << x.id unless x.visible?(User.current)
+        @activity_count = message.size
+        @info_pages = Paginator.new @activity_count, pre_count, params['page']
+        messages = message.sort {|x,y| y.created_on <=> x.created_on }
+        @message = messages[@info_pages.offset, @info_pages.per_page]
+        @state = 2
+      else
+        # Time 2015-02-04 10:50:49
+        # Author lizanle
+        # Description 所有动态
+        where_condition = nil;
+        # where_condition = "act_type <> 'JournalsForMessage'"
+        user_ids = []
+        if @user == User.current
+          watcher = User.watched_by(@user)
+          watcher.push(User.current)
+          user_ids = watcher.map{|x| x.id}
+        else
+          user_ids << @user.id
         end
-        ids << News.where(id: act_ids, project_id: p_ids).map{|x| x.id}
+        activity = Activity.where(where_condition).where(user_id: user_ids).order('id desc')
+
+        permission = !User.current.admin?
+        if permission
+          #Issue
+          act_ids = activity.where(act_type: 'Issue').select('act_id').map{|x| x.act_id}
+          project_ids = Issue.where(id: act_ids).select('distinct project_id').map{|x| x.project_id}
+          p_ids = []
+          Project.where(id: project_ids).each do |x|
+            p_ids << x.id unless x.visible?(User.current)
+          end
+          ids = []
+          ids << Issue.where(id: act_ids, project_id: p_ids).map{|x| x.id}
+
+          #HomeworkCommon
+          act_ids = activity.where(act_type: 'HomeworkCommon').select('act_id').map{|x| x.act_id}
+          course_ids = HomeworkCommon.where(id: act_ids).select('distinct course_id').map{|x| x.course_id}
+          c_ids = []
+          Course.where(id: course_ids).each do |x|
+            c_ids << x.id unless x.is_public !=0 && User.current.member_of_course?(x)
+          end
+          ids << HomeworkCommon.where(id: act_ids, course_id: c_ids).map{|x| x.id}
+
+          #Journal
+          act_ids = activity.where(act_type: 'Journal').select('act_id').map{|x| x.act_id}
+          project_ids =  Journal.where(id:act_ids, journalized_type: 'Project').select('distinct journalized_id').map{|x| x.journalized_id}
+          p_ids = []
+          Project.where(id: project_ids).each do |x|
+            p_ids << x.id unless x.visible?(User.current)
+          end
+          ids << Journal.where(id: act_ids, journalized_id: p_ids, journalized_type: 'Project').map{|x| x.id}
+
+          #News
+          act_ids = activity.where(act_type: 'News').select('act_id').map{|x| x.act_id}
+          project_ids = News.where(id: act_ids).select('distinct project_id').map{|x| x.project_id}
+          p_ids = []
+          Project.where(id: project_ids).each do |x|
+            p_ids << x.id unless x.visible?(User.current)
+          end
+          ids << News.where(id: act_ids, project_id: p_ids).map{|x| x.id}
 
-        project_ids = News.where(id: act_ids).select('distinct course_id').map{|x| x.course_id}
-        c_ids = []
-        Course.where(id: project_ids).each do |x|
-          c_ids << x.id unless x.is_public !=0 && User.current.member_of_course?(x)
-        end
-        ids << News.where(id: act_ids, course_id: p_ids).map{|x| x.id}
-
-        #Message
-        act_ids = activity.where(act_type: 'Message').select('act_id').map{|x| x.act_id}
-        board_ids = Message.where(id: act_ids).select('distinct board_id').map{|x| x.board_id}
-        project_ids = Board.where(id: board_ids).select('distinct project_id').map{|x| x.project_id}
-        p_ids = []
-        Project.where(id: project_ids).each do |x|
-          p_ids << x.id unless x.visible?(User.current)
-        end
-        ids << Message.where(id: act_ids, board_id: p_ids).map{|x| x.id}
+          project_ids = News.where(id: act_ids).select('distinct course_id').map{|x| x.course_id}
+          c_ids = []
+          Course.where(id: project_ids).each do |x|
+            c_ids << x.id unless x.is_public !=0 && User.current.member_of_course?(x)
+          end
+          ids << News.where(id: act_ids, course_id: p_ids).map{|x| x.id}
+
+          #Message
+          act_ids = activity.where(act_type: 'Message').select('act_id').map{|x| x.act_id}
+          board_ids = Message.where(id: act_ids).select('distinct board_id').map{|x| x.board_id}
+          project_ids = Board.where(id: board_ids).select('distinct project_id').map{|x| x.project_id}
+          p_ids = []
+          Project.where(id: project_ids).each do |x|
+            p_ids << x.id unless x.visible?(User.current)
+          end
+          ids << Message.where(id: act_ids, board_id: p_ids).map{|x| x.id}
 
-        project_ids = Board.where(id: board_ids).select('distinct course_id').map{|x| x.course_id}
-        c_ids = []
-        Course.where(id: project_ids).each do |x|
-          c_ids << x.id unless x.is_public !=0 && User.current.member_of_course?(x)
-        end
-        ids << Message.where(id: act_ids, board_id: c_ids).map{|x| x.id}
+          project_ids = Board.where(id: board_ids).select('distinct course_id').map{|x| x.course_id}
+          c_ids = []
+          Course.where(id: project_ids).each do |x|
+            c_ids << x.id unless x.is_public !=0 && User.current.member_of_course?(x)
+          end
+          ids << Message.where(id: act_ids, board_id: c_ids).map{|x| x.id}
 
-        logger.debug "filter ids #{ids}"
+          logger.debug "filter ids #{ids}"
 
-        activity = activity.where('act_id not in (?)', ids.flatten ).order('id desc') unless ids.flatten.empty?
-      end
+          activity = activity.where('act_id not in (?)', ids.flatten ).order('id desc') unless ids.flatten.empty?
+        end
 
-      # activity = activity.reject { |e|
-      #       e.act.nil? ||
-      #       (!User.current.admin? && !e.act.nil?
-      #       (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
-      #           (e.act_type == "Bid" && !e.act.courses.first.nil? && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
-      #           (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
-      #           (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
-      #           (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))))
-      # }
-      #
+        # activity = activity.reject { |e|
+        #       e.act.nil? ||
+        #       (!User.current.admin? && !e.act.nil?
+        #       (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
+        #           (e.act_type == "Bid" && !e.act.courses.first.nil? && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
+        #           (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
+        #           (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
+        #           (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))))
+        # }
+        #
 
-      @activity_count = activity.count
-      @activity_pages = Paginator.new @activity_count, pre_count, params['page']
-      @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
-      @state = 0
+        @activity_count = activity.count
+        @activity_pages = Paginator.new @activity_count, pre_count, params['page']
+        @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
+        @state = 0
     end
 
     if params[:user].present?
@@ -817,7 +945,7 @@ class UsersController < ApplicationController
       if !@user.active? #|| (@user != User.current  && @memberships.empty? && events.empty?)
         # redirect_to home_path
         render_404
-      return
+        return
       end
     end
 
@@ -849,7 +977,7 @@ class UsersController < ApplicationController
     unless User.current.admin?
       if !@user.active?
         render_404
-      return
+        return
       end
     end
 
@@ -907,7 +1035,7 @@ class UsersController < ApplicationController
     unless @user.id.nil?
       #后台注册的用户默认权限为男性开发员
       ue = UserExtensions.create(:identity => 3,
-                                  :gender => 0,
+                                 :gender => 0,
                                  :user_id => @user.id)
       ue.save
     end
@@ -977,8 +1105,8 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
     #@user.save_attachments(params[:attachments],User.current)
     # Container_type为Principal
-      Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type])
-    if(params[:type].nil? || params[:type] == "1") #全部
+    Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type])
+    if(params[:type].blank?|| params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
         @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
@@ -1033,14 +1161,14 @@ class UsersController < ApplicationController
   # 删除用户资源，分为批量删除 和 单个删除，只能删除自己上传的资源
   def user_resource_delete
     if params[:resource_id].present?
-     Attachment.where("author_id = #{User.current.id}").delete(params[:resource_id])
+      Attachment.where("author_id = #{User.current.id}").delete(params[:resource_id])
     elsif params[:checkbox1].present?
-       params[:checkbox1].each do |id|
-         Attachment.where("author_id = #{User.current.id}").delete(id)
+      params[:checkbox1].each do |id|
+        Attachment.where("author_id = #{User.current.id}").delete(id)
       end
     end
 
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
         @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
@@ -1087,17 +1215,17 @@ class UsersController < ApplicationController
     @offset ||= @atta_pages.offset
     #@curse_attachments_all = @all_attachments[@offset, @limit]
     @attachments = paginateHelper @attachments,25
-     respond_to do |format|
-       format.js
-     end
+    respond_to do |format|
+      format.js
+    end
   end
 
   #根据id或者名称搜索教师或者助教为当前用户的课程
   def search_user_course
     @user = User.current
     if !params[:search].nil?
-        @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like '%#{params[:search.to_s]}%'")
-              .select { |course|  @user.allowed_to?(:as_teacher,course)}
+      @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like '%#{params[:search.to_s]}%'")
+      .select { |course|  @user.allowed_to?(:as_teacher,course)}
     else
       @course = @user.courses
       .select { |course|  @user.allowed_to?(:as_teacher,course)}
@@ -1129,28 +1257,28 @@ class UsersController < ApplicationController
   # 将资源发送到对应的课程,分为发送单个，或者批量发送
   def add_exist_file_to_course
     @flag = true
-   if  params[:send_id].present?
+    if  params[:send_id].present?
       send_id  = params[:send_id]
       ori = Attachment.find_by_id(send_id)
       course_ids = params[:course_ids]
       if course_ids.nil?
         @flag = false
       end
-        unless course_ids.nil?
-          course_ids.each do |id|
-            next if ori.blank?
-            attach_copied_obj = ori.copy
-            attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
-            attach_copied_obj.container = Course.find(id)
-            attach_copied_obj.created_on = Time.now
-            attach_copied_obj.author_id = User.current.id
-            if attach_copied_obj.attachtype == nil
-              attach_copied_obj.attachtype = 4
-            end
-            attach_copied_obj.save
-            @save_message = attach_copied_obj.errors.full_messages
-        end
+      unless course_ids.nil?
+        course_ids.each do |id|
+          next if ori.blank?
+          attach_copied_obj = ori.copy
+          attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+          attach_copied_obj.container = Course.find(id)
+          attach_copied_obj.created_on = Time.now
+          attach_copied_obj.author_id = User.current.id
+          if attach_copied_obj.attachtype == nil
+            attach_copied_obj.attachtype = 4
+          end
+          attach_copied_obj.save
+          @save_message = attach_copied_obj.errors.full_messages
         end
+      end
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(" ")
       course_ids = params[:course_ids]
@@ -1177,8 +1305,20 @@ class UsersController < ApplicationController
         end
       end
     else
-     @flag = false
+      @flag = false
     end
+    user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    @type = params[:type]
+    @limit = 25
+    @user = User.current
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
     end
@@ -1235,7 +1375,18 @@ class UsersController < ApplicationController
     else
       @flag=true
     end
-
+    user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    @type = params[:type]
+    @limit = 25
+    @user = User.current
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
     end
@@ -1243,15 +1394,15 @@ class UsersController < ApplicationController
 
   # 资源预览
   def resource_preview
-      preview_id = params[:resource_id]
-      @file = Attachment.find(preview_id)
-      @preview_able = false;
-      if %w(pdf pptx doc docx xls xlsx).any?{|x| @file.filename.downcase.end_with?(x)}
-         @preview_able = true;
-      end
-      respond_to do |format|
-        format.js
-      end
+    preview_id = params[:resource_id]
+    @file = Attachment.find(preview_id)
+    @preview_able = false;
+    if %w(pdf pptx doc docx xls xlsx).any?{|x| @file.filename.downcase.end_with?(x)}
+      @preview_able = true;
+    end
+    respond_to do |format|
+      format.js
+    end
   end
 
   # 重命名资源
@@ -1291,7 +1442,7 @@ class UsersController < ApplicationController
   def destroy_membership
     @membership = Member.find(params[:membership_id])
     if @membership.deletable?
-    @membership.destroy
+      @membership.destroy
     end
     respond_to do |format|
       format.html { redirect_to edit_user_url(@user, :tab => 'memberships') }
@@ -1306,31 +1457,31 @@ class UsersController < ApplicationController
     @obj_flag = params[:tag_for_save][:object_flag]
 
     case @obj_flag
-    when '1' then
-      @obj = User.find_by_id(@obj_id)
-    when '2' then
-      @obj = Project.find_by_id(@obj_id)
-    when '3' then
-      @obj = Issue.find_by_id(@obj_id)
-    when '4' then
-      # @obj = Bid.find_by_id(@obj_id)
-    when '5' then
-      @obj = Forum.find_by_id(@obj_id)
-    when '6'
-      @obj = Attachment.find_by_id(@obj_id)
-    when '7' then
-      @obj = Contest.find_by_id(@obj_id)
-    when '8'
-      @obj = OpenSourceProject.find_by_id(@obj_id)
-    when '9'
-      @obj = Course.find_by_id(@obj_id)
-    else
-    @obj = nil
+      when '1' then
+        @obj = User.find_by_id(@obj_id)
+      when '2' then
+        @obj = Project.find_by_id(@obj_id)
+      when '3' then
+        @obj = Issue.find_by_id(@obj_id)
+      when '4' then
+        # @obj = Bid.find_by_id(@obj_id)
+      when '5' then
+        @obj = Forum.find_by_id(@obj_id)
+      when '6'
+        @obj = Attachment.find_by_id(@obj_id)
+      when '7' then
+        @obj = Contest.find_by_id(@obj_id)
+      when '8'
+        @obj = OpenSourceProject.find_by_id(@obj_id)
+      when '9'
+        @obj = Course.find_by_id(@obj_id)
+      else
+        @obj = nil
     end
     unless @obj.nil?
       @obj.tag_list.add(@tags.split(","))
     else
-    return
+      return
     end
     if @obj.save
       logger.debug "#{__FILE__}:#{__LINE__} ===> #{@obj.to_json}"
@@ -1421,9 +1572,9 @@ class UsersController < ApplicationController
   def update_extensions(user_extensions)
     user_extensions = params[:user_extensions]
     unless user_extensions.nil?
-     user_extensions = UserExtensions.find_by_id(user_extensions.user_id)
+      user_extensions = UserExtensions.find_by_id(user_extensions.user_id)
 
-     # user_extensions.
+      # user_extensions.
     end
   end
 
@@ -1450,7 +1601,7 @@ class UsersController < ApplicationController
       render_403
       return
     end
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
         @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
@@ -1514,9 +1665,9 @@ class UsersController < ApplicationController
       else
         user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
         @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type in" +
-         " ('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon'))"+
-         " or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )" +
-         " and (filename like '%#{search}%') ").order("created_on desc")
+                                            " ('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon'))"+
+                                            " or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )" +
+                                            " and (filename like '%#{search}%') ").order("created_on desc")
       end
     elsif params[:type] == "2" #课程资源
       if User.current.id.to_i == params[:id].to_i
@@ -1525,7 +1676,7 @@ class UsersController < ApplicationController
       else
         user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
         @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type = 'Course') "+
-                                              "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )"+
+                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )"+
                                             " and (filename like '%#{search}%') ").order("created_on desc")
       end
     elsif params[:type] == "3" #项目资源

app/helpers/application_helper.rb

@@ -2338,7 +2338,7 @@ module ApplicationHelper
   #根据传入作业确定显示为编辑作品还是新建作品,或者显示作品数量
   def user_for_homework_common homework,is_teacher
     if is_teacher #老师显示作品数量
-      link_to "提交（#{homework.student_works.count}）",student_work_index_path(:homework => homework.id),:class => "c_blue"
+      link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
     else #学生显示提交作品、修改作品等按钮
       work = cur_user_works_for_homework homework
       if work.nil?

app/helpers/journals_helper.rb

@@ -116,7 +116,7 @@ module JournalsHelper
       end
     end
     #content << content_tag('div', links.join(' ').html_safe, :class => 'contextual', :style => 'margin-top:-25px;') unless links.empty?
-    content << textilizable(journal, :notes)
+    content << textAreailizable(journal, :notes)
     css_classes = "wiki"
     css_classes << " editable" if editable
     content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes ,:style => "width:510px")

app/helpers/users_helper.rb

@@ -71,7 +71,7 @@ module UsersHelper
   def user_settings_tabs
     tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
             {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
-            ]
+    ]
     if Group.all.any?
       tabs.insert 1, {:name => 'groups', :partial => 'users/groups', :label => :label_group_plural}
     end
@@ -83,7 +83,7 @@ module UsersHelper
   def get_users_by_tag(tag_name)
     User.tagged_with(tag_name).order('updated_on desc')
   end
-  
+
   # added by fq
   # <div class="pagination" >
   # <ul>
@@ -91,7 +91,7 @@ module UsersHelper
   # <li><%= link_to("只看自己", {:controller => 'users', :action => 'show', :type => 1}) %></li>
   # <li><%= link_to("所有反馈", {:controller => 'users', :action => 'show', :type => 2}) %></li>
   # </ul></div> 
-  
+
   # TODO: 待删
   # def show_activity(state)
   #   content = ''.html_safe
@@ -114,19 +114,19 @@ module UsersHelper
   #   end
   #   content_tag('div', content, :class => "pagination")
   # end
-  
+
   #TODO: 待删
   def watch_projects(state)
     content = ''.html_safe
     case state
-    when 0
-      s = content_tag('span', l(:label_project_take), :class => "current-page")
-      content << content_tag('li', s)
-      content << content_tag('li', link_to(l(:label_has_watched_project), {:controller => 'users', :action => 'watch_projects', :type => 1}))
-    when 1
-      s = content_tag('span', l(:label_has_watched_project), :class => "current-page")
-      content << content_tag('li', link_to(l(:label_project_take), {:controller => 'users', :action => 'user_projects'}))
-      content << content_tag('li', s, :class => "current-page")
+      when 0
+        s = content_tag('span', l(:label_project_take), :class => "current-page")
+        content << content_tag('li', s)
+        content << content_tag('li', link_to(l(:label_has_watched_project), {:controller => 'users', :action => 'watch_projects', :type => 1}))
+      when 1
+        s = content_tag('span', l(:label_has_watched_project), :class => "current-page")
+        content << content_tag('li', link_to(l(:label_project_take), {:controller => 'users', :action => 'user_projects'}))
+        content << content_tag('li', s, :class => "current-page")
     end
     content_tag('div', content, :class => "pagination")
   end
@@ -134,59 +134,59 @@ module UsersHelper
   def user_course(state)
     content = ''.html_safe
     if @user != User.current
-      if  @user.user_extensions.identity == 0 
+      if  @user.user_extensions.identity == 0
         case state
-        when 0
-          s = content_tag('span', '他执教的课程', :class => "current-page")
-          content << content_tag('li', s)
-          content << content_tag('li', link_to('他发布的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
-          content_tag('div', content, :class => "pagination")
-        when 1
-          s = content_tag('span', '他发布的作业', :class => "current-page")
-          content << content_tag('li', link_to('他执教的课程', {:controller => 'users', :action => 'user_courses'}))
-          content << content_tag('li', s, :class => "current-page")    
-          content_tag('div', content, :class => "pagination")
+          when 0
+            s = content_tag('span', '他执教的课程', :class => "current-page")
+            content << content_tag('li', s)
+            content << content_tag('li', link_to('他发布的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
+            content_tag('div', content, :class => "pagination")
+          when 1
+            s = content_tag('span', '他发布的作业', :class => "current-page")
+            content << content_tag('li', link_to('他执教的课程', {:controller => 'users', :action => 'user_courses'}))
+            content << content_tag('li', s, :class => "current-page")
+            content_tag('div', content, :class => "pagination")
         end
-      else    
+      else
         case state
-        when 0
-          s = content_tag('span', '他的课程', :class => "current-page")
-          content << content_tag('li', s)
-          content << content_tag('li', link_to('他的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
-          content_tag('div', content, :class => "pagination")      
-        when 1
-          s = content_tag('span', '他的作业', :class => "current-page")
-          content << content_tag('li', link_to('他的课程', {:controller => 'users', :action => 'user_courses', :type => 0}))
-          content << content_tag('li', s, :class => "current-page")      
-          content_tag('div', content, :class => "pagination")
+          when 0
+            s = content_tag('span', '他的课程', :class => "current-page")
+            content << content_tag('li', s)
+            content << content_tag('li', link_to('他的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
+            content_tag('div', content, :class => "pagination")
+          when 1
+            s = content_tag('span', '他的作业', :class => "current-page")
+            content << content_tag('li', link_to('他的课程', {:controller => 'users', :action => 'user_courses', :type => 0}))
+            content << content_tag('li', s, :class => "current-page")
+            content_tag('div', content, :class => "pagination")
         end
       end
     else
-      if  @user.user_extensions.identity == 0 
+      if  @user.user_extensions.identity == 0
         case state
-        when 0
-          s = content_tag('span', l(:label_teaching_course), :class => "current-page")
-          content << content_tag('li', s)
-          content << content_tag('li', link_to(l(:label_release_homework), {:controller => 'users', :action => 'user_courses', :type => 1}))
-          content_tag('div', content, :class => "pagination")
-        when 1
-          s = content_tag('span', l(:label_release_homework), :class => "current-page")
-          content << content_tag('li', link_to(l(:label_teaching_course), {:controller => 'users', :action => 'user_courses'}))
-          content << content_tag('li', s, :class => "current-page")    
-          content_tag('div', content, :class => "pagination")
+          when 0
+            s = content_tag('span', l(:label_teaching_course), :class => "current-page")
+            content << content_tag('li', s)
+            content << content_tag('li', link_to(l(:label_release_homework), {:controller => 'users', :action => 'user_courses', :type => 1}))
+            content_tag('div', content, :class => "pagination")
+          when 1
+            s = content_tag('span', l(:label_release_homework), :class => "current-page")
+            content << content_tag('li', link_to(l(:label_teaching_course), {:controller => 'users', :action => 'user_courses'}))
+            content << content_tag('li', s, :class => "current-page")
+            content_tag('div', content, :class => "pagination")
         end
-      else    
+      else
         case state
-        when 0
-          s = content_tag('span', l(:label_my_course), :class => "current-page")
-          content << content_tag('li', s)
-          content << content_tag('li', link_to('我的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
-          content_tag('div', content, :class => "pagination")      
-        when 1
-          s = content_tag('span', '我的作业', :class => "current-page")
-          content << content_tag('li', link_to(l(:label_my_course), {:controller => 'users', :action => 'user_courses', :type => 0}))
-          content << content_tag('li', s, :class => "current-page")      
-          content_tag('div', content, :class => "pagination")
+          when 0
+            s = content_tag('span', l(:label_my_course), :class => "current-page")
+            content << content_tag('li', s)
+            content << content_tag('li', link_to('我的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
+            content_tag('div', content, :class => "pagination")
+          when 1
+            s = content_tag('span', '我的作业', :class => "current-page")
+            content << content_tag('li', link_to(l(:label_my_course), {:controller => 'users', :action => 'user_courses', :type => 0}))
+            content << content_tag('li', s, :class => "current-page")
+            content_tag('div', content, :class => "pagination")
         end
       end
     end
@@ -196,42 +196,42 @@ module UsersHelper
   def sort_user(state, project_type)
     content = ''.html_safe
     case state
-    when 0
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) )))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) )))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) ), :class=>"selected") )
-    when 1
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) ), :class=>"selected") )
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) )))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) )))
-    when 2
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) )))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) ), :class=>"selected") )
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) )))
+      when 0
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) )))
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) )))
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) ), :class=>"selected") )
+      when 1
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) ), :class=>"selected") )
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) )))
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) )))
+      when 2
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) )))
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) ), :class=>"selected") )
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) )))
     end
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs")
-  end  
-  
+  end
+
   def sort_user_enterprise(state, project_type)
     content = ''.html_safe
     case state
-    when 0
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
-    when 1
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
-    when 2
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
+      when 0
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      when 1
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
+      when 2
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
     end
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs_enterprise")
-  end 
+  end
 
   def gender_avatar_uri user
     img_uri = '/images/sidebar/female.png'
@@ -256,7 +256,7 @@ module UsersHelper
     #   people_ids += (members_to_user_ids(tmp)) unless tmp.nil?
     # end
     # people_ids.include?(login_user.id) or (login_user == user) or login_user.admin?
-    
+
     false
   end
 
@@ -290,7 +290,7 @@ module UsersHelper
     membership.collect { |e|
       memberships.push(e)
     }
-                                            ## 判断课程是否过期 [需封装]
+    ## 判断课程是否过期 [需封装]
     memberships_doing = []
     memberships_done  = []
     memberships.map { |e|
@@ -544,9 +544,13 @@ module UsersHelper
   #获取指定用户作为老师的课程
   def get_as_teacher_courses user
     type = []
+    option = []
+    option << "请选择发布作业的课程"
+    option << -1
+    type << option
     user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
       option = []
-      option << course.name
+      option << course.name+"（"+course.time.to_s+course.term+"）"
       option << course.id
       type << option
     end

app/models/homework_common.rb

@@ -56,4 +56,6 @@ class HomeworkCommon < ActiveRecord::Base
     Mailer.run.homework_added(self)
   end
 
+  delegate :language_name, :to => :homework_detail_programing
+
 end

app/models/homework_detail_programing.rb

@@ -2,4 +2,8 @@ class HomeworkDetailPrograming < ActiveRecord::Base
   attr_accessible :language, :standard_code, :homework_common_id
 
   belongs_to :homework_common
+
+  def language_name
+    %W(c c++).at(self.language.to_i - 1)
+  end
 end

app/models/homework_test.rb

@@ -2,5 +2,4 @@ class HomeworkTest < ActiveRecord::Base
   attr_accessible :input, :output, :homework_common_id,:result,:error_msg
 
   belongs_to :homework_common
-  has_many :student_work_test
 end

app/models/student_work.rb

@@ -7,7 +7,7 @@ class StudentWork < ActiveRecord::Base
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
   belongs_to :project
-  has_many :student_work_test
+  has_many :student_work_tests, order: 'id desc'
 
   before_destroy :delete_praise
 

app/models/student_work_test.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 class StudentWorkTest < ActiveRecord::Base
-  attr_accessible :student_work_id, :homework_test_id, :result, :error_msg
-
-  belongs_to :homework_test
+  attr_accessible :student_work_id, :results, :status, :src
   belongs_to :student_work
 
+  serialize :results, Array
+
   def status_to_s
-    case self.result.to_i
+    case self.status.to_i
       when -1
         '编译出错'
       when -2
@@ -33,10 +33,11 @@ class StudentWorkTest < ActiveRecord::Base
   end
 
   def test_score
-    if self.result.to_i == 0
+    if self.status.to_i == 0
       format("%.1f",100.0 / self.student_work.homework_common.homework_tests.count)
     else
       0
     end
   end
+
 end

app/views/account/about_us.html.erb

@@ -0,0 +1,50 @@
+<%= stylesheet_link_tag 'new_user'%>
+<div class="homepageContent BgBox">
+  <h2 class="BgBox_h2">关于我们</h2>
+  <div class="AgreementBox">
+    <p class="AgreementTxt">
+      Trustie是一个面向高校创新实践的在线协作社区，是在中国高校推行大规模开放在线研究（Massive Open Online Research, MOORE）的支撑平台，也简称Trustie平台。老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。
+    </p>
+    <p class="AgreementTxt">
+      MOORE是国防科学技术大学杨学军院士提出的一个面向高校科研教学活动的新型创新实践概念，为全面支持高校人才培养和科学研究提供了一种新思路。MOORE是对大规模在线开放课程（Massive Open Online Course, MOOC）的拓展，是课堂教学与创新实践深度结合的全新模式，可以看作MOOC2.0。
+    </p>
+    <p class="AgreementTxt">
+      2005年开始，Trustie研制团队围绕网络时代的软件开发效率和质量这一核心问题展开研究，经过十年的磨砺与攻关，逐步揭示出以大众化协同开发、开放式资源共享、持续性可信评估为核心的互联网大规模协同机理，提出了全新的软件开发群体化方法。2008年起，研制团队开始探索如何将这种协同机理引入软件人才培养。MOORE概念的提出为研制团队的人才培养实践提供了新的发展方向和应用模式，使Trustie技术和工具能够更直接、更有效地与高校人才培养对接，形成了今天已被大量师生接受的在线人才培养平台。
+    </p>
+    <p class="AgreementTxt">
+      研制团队认为MOORE的创新人才培养模式（如图1左图）是将互联网大规模协同机理与高校创新实践活动相结合的全新人才培养方法和模式，研制团队并基于本平台的架构形成了对MOORE核心机理的三方面认识（如图1右图）。
+    </p>
+    <div class="AgreementImg" >
+      <img src="images/aboutus_01.jpg" width="820" height="285" />
+      <p class="AgreementTxt T_C fb mt10">图1 基于MOORE的创新人才培养模式与核心机理</p>
+    </div>
+    <p class="AgreementTxt">
+      目前，Trustie平台已经初步展现出大规模开放在线研究的生态系统蓝图，其核心是在线教学实践平台和在线协同研究平台，如图2。Trustie在线教学实践平台是支持教师和学生围绕课堂学习开展实践的平台（如图2），Trustie在线协同研究平台是支持开发小组围绕实践任务或研究工作开展分布式协作的平台（如图2）。两个核心平台为一名"新手"大学生成长为具有一定创新能力的"创客"提供了从学习到研究的一个渐进式成长环境（如图2）。
+    </p>
+    <p class="AgreementTxt">
+      特别是，根据师生的实际需要，Trustie平台提供了私有模式和公开模式，支持针对未公开成果实施有效知识产权保护为前提的交流分享（如图2）。随着越来越多的高校、课程和研究小组的加入，MOORE创新实践模式的生态效益将不断显现出来。
+    </p>
+    <div class="AgreementImg" >
+      <img src="images/aboutus_02.jpg" width="756" height="496" />
+      <p class="AgreementTxt T_C fb mt10">图2 基于MOORE的支撑平台和生态系统</p>
+    </div>
+    <p class="AgreementTxt">
+      研制团队特别感谢高校老师和学生的积极反馈、无私创意。平台的很多实用便捷的功能都是老师们积极参与和设计的结果，汇聚了大量师生的宝贵贡献，是研制团队和用户群体共同成长的结果。
+    </p>
+    <p class="AgreementTxt">
+      Trustie平台的基本思路是将开源模式与中国高校人才培养活动相结合，但其本质上是一种O2O（Online To Offline）的创新人才培养模式，只有在以下两个方面同步推进，才能在持续解决实际需求的过程中快速发展：<br />
+      &nbsp;&nbsp;&nbsp;&nbsp;（1）构建实践平台，激活创新能力：成为支持不同规模的团队进行协同研究和协同开发的实践平台，支持各类可公开的课程实验任务、教研室科研任务的在线协同，能够有效提升和评估学生的创新能力、协作能力和实践能力。<br />
+      &nbsp;&nbsp;&nbsp;&nbsp;（2）引入开源理念，形成创客文化：将互联网开源软件运动中的自由、对等、共享、创新的理念引入高校，使"自主创意并亲自动手实现创意"的创客精神深入人才培养活动，在学生群体中形成大胆创意、大胆实践的创新文化。
+    </p>
+    <p class="AgreementTxt">
+      研制团队认为，Trustie平台是一种"互联网+"思维在高校教育领域的大型探索性实践。作为一种互联网应用，Trustie平台自身的开发也采取了互联网模式：Trustie研制团队采用了"网构化软件开发模式"，坚持"每周一更"的快速上线、快速体验模式，以最大程度上贴近用户实际需求提升。欢迎高校师生一同投身创新实践，共同见证MOORE创新生态的早日形成。
+    </p>
+  </div>
+
+
+
+</div><!---BgBox end--->
+
+<div class="footer"></div>
+
+

app/views/account/lost_password.html.erb

@@ -1,6 +1,6 @@
 <%= stylesheet_link_tag 'new_user'%>
 
-<div class="homepageContentContainer " style="margin-top:20px;">
+<div class="homepageContentContainer ">
   <div class="homepageContent BgBox">
   	<h2 class="BgBox_h2">忘记密码</h2>
     <div class="BgBoxCon">
@@ -9,7 +9,7 @@
     	 <!--<input type="text"  class="NomalInput mb20 " value="请输入登录邮箱地址"  />-->
           <%= text_field_tag 'mail', nil, :size => 40, :placeholder => '请输入注册邮箱',:class=>'NomalInput mb20'%>
           <% if  flash[:error] %>
-              <p class="c_red mb5"><%=  flash[:error]%></p>
+              <p class="c_red mt-20 ml5"><%=  flash[:error]%></p>
               <!--<div style="color: red" class="mb5" ><%#=  flash[:error]%></div>-->
           <% elsif  flash[:notice] %>
               <p class="c_green mb5"><%=  flash[:notice]%></p>

app/views/boards/_course_show.html.erb

@@ -37,7 +37,7 @@
     <% @topics.each do |topic| %>
         <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;" id="topic<%= topic.id %>" nhname="container_board" mhname="container_board_reply">
           <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
-          <div class="talkmain_txt fl mt5 f14">
+          <div class="talkmain_txt fl mt5 f12">
             <% author = topic.author.to_s %>
             <div style="max-width:120px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">
               <%= link_to User.current.member_of_course?(@board.course) ? "#{topic.author.show_name}(#{topic.author.login})" : "#{topic.author}" , user_path(topic.author),
@@ -48,7 +48,7 @@
 
             <p class="talkmain_tit fl fb break_word f14" title="<%=  h(topic.subject) %>" style="width:auto;float:left;max-width:360px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
             <% if topic.course_editable_by?(User.current) %>
-                <a href="javascript:void(0)" nhname="showbtn"  style="color: #426e9a;float: right;
+                <a href="javascript:void(0)" nhname="showbtn" class="linkBlue"  style="float: right;
                         margin-right: 10px;"><%= l(:button_edit) %></a>
             <% end %>
 
@@ -120,7 +120,7 @@
             <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
 
           </div>
-          <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr f14" style="margin-right:10px;"><%= l(:button_reply) %></a>
+          <a href="javascript:void(0)" nhname="showbtn_reply" class="linkBlue fr f12" style="margin-right:10px;"><%= l(:button_reply) %></a>
 
           <div class="cl"></div>
 
@@ -171,7 +171,7 @@
                             </div>
                             <input nhname="nh_content_val" value="<%= message.content %>" type="hidden"/>
                             <br/><div class="cl"></div>
-                            <span class=" c_grey fl f14"><%= format_time(message.created_on) %></span>
+                            <span class=" c_grey fl f12"><%= format_time(message.created_on) %></span>
                             <%= link_to(
 
                                         l(:button_delete),
@@ -179,13 +179,13 @@
                                         :method => :post,
                                         :data => {:confirm => l(:text_are_you_sure)},
                                         :title => l(:button_delete),
-                                        :class => ' c_dblue fr f14'
+                                        :class => ' linkBlue fr f12'
                                 ) if message.course_destroyable_by?(User.current) %>
                             <%= link_to(
                                         l(:button_reply),
                                         'javascript:;',
                                         :nhname =>'showbtn_child_reply',
-                                        :class => ' c_dblue fr f14',
+                                        :class => ' linkBlue fr f12',
                                         :style => 'margin-right: 10px;',
                                         'data-topic-id' =>message.id,
                                         :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %>

app/views/comments/create.js.erb

@@ -0,0 +1,3 @@
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+
+init_KindEditor_data('<%= @user_activity_id%>');

app/views/courses/search.html.erb

@@ -20,12 +20,12 @@
                 <% end %>
             <% end %>
             </td>
-            <td rowspan="2" >
+            <!--<td rowspan="2" >
               <div class="project-search" style="float: right">
-                <%= text_field_tag 'name', params[:name], :size => 30 %>
-                <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+                <%#= text_field_tag 'name', params[:name], :size => 30 %>
+                <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
               </div>
-            </td>
+            </td>-->
             </tr>
         <tr>
           <td >

app/views/homework_common/_new_homework_detail_manual_form.html.erb

@@ -0,0 +1,74 @@
+<div class="homepageRight">
+  <div class="HomeWork">
+    <div class="RightBanner">
+      <div class="NewsBannerName">发布作业</div>
+    </div>
+    <div class="HomeWorkCon">
+        <div class="mt15">
+            <textarea class="InputBox  W700 " placeholder="请输入作业标题" name="homework_common[name]" id="homework_name" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>"></textarea>
+        </div>
+        <div class=" mt10">
+            <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
+            <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.end_time%>" placeholder="截止日期"></input>
+                <div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date"></a></div>
+                <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.publish_time%>" placeholder="发布日期"></input>
+                <div class="fl DateBorder"><a href="javascript:void(0);" class="pic_date"></a></div>
+            <div class="cl"></div>
+        </div>
+        <div class="mt10">
+        <% if edit_mode %>
+            <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
+        <% else %>
+            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+            <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
+        <% end %>
+        </div>
+        <div class="mt10">
+            <textarea class="InputBox  W700 SearchIcon" placeholder="发送到课程" style="margin-top: 0px; margin-bottom: 0px; height: 29px;"></textarea>
+        </div>
+        <div class="mt5">
+            <a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
+            <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
+            <div class="cl"></div>
+        </div>
+        
+        <div class="mt10">
+            <a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
+            <div class="DropLine"></div>
+            <div class="cl"></div>
+        </div>
+        <div class="advanced_option" style="display:none;">
+          <div class="mt10">
+              <select class="InputBox W120" required="true">
+                  <option value="语言选择">语言选择</option>
+                  <option value="C语言">C语言</option>
+                  <option value="C++">C++</option>
+                </select>
+          </div>
+          
+          <div class="mt10">
+              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></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>
+          </div>
+        </div>
+        <div class="mt10">
+            <a href="javascript:void(0);" onClick="submit_homework('new_homework_common');" class="BlueCirBtnMini fr">发布</a>
+            <span class="fr mr10 mt3">或</span><%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'fr mr10 mt3'%>
+            <div class="cl"></div>
+        </div>
+    </div>
+  </div><!----HomeWork end-->
+  
+</div>
+
+<script id="t:test-answer-list" type="text/html">
+  <div class="mt10">
+      <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></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>
+  </div>
+</script>
+

app/views/homework_common/new.html.erb

@@ -1,17 +1,16 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<% content_for :header_tags do %>
+  <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+  <%= javascript_include_tag 'homework','baiduTemplate' %>
+<% end %>
+
 <%= error_messages_for 'homework_common' %>
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_course_homework_new)%>
-  </h2>
-</div>
+
 <div class="hwork_new">
   <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
       <%= hidden_field_tag "course",@course.id%>
-      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-      <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+      <%= render :partial => 'homework_common/new_homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
   <% end%>
 </div><!--hwork_new end-->
+
+
 <div class="cl"></div>

app/views/homework_common/next_step.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= error_messages_for 'homework_common' %>
 <div class="project_r_h">
   <h2 class="project_h2">

app/views/issues/add_journal.js.erb

@@ -0,0 +1,3 @@
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
+
+init_KindEditor_data(<%= @user_activity_id%>);

app/views/layouts/_footer.html.erb

@@ -1,9 +1,9 @@
-<div id="Footer">
+<div id="Footer" class="f12">
   <div class="footerAboutContainer">
     <ul class="footerAbout">
-      <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_about_us)%></span>|</li>
-      <li class="fl"><a href="http://forge.trustie.net/projects/2/member" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
-      <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
+      <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
+      <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
       <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
       <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_forums)%></span></li>
 

app/views/layouts/_user_courses.html.erb

@@ -1,6 +1,6 @@
 <% courses.each do |course|%>
     <li class="homepageLeftMenuCoursesLine">
-      <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", :title => course.name%>
+      <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", :title => course.name+"（"+course.time.to_s+course.term+"）"%>
     </li>
 <% end %>
 

app/views/layouts/new_base_user.html.erb

@@ -101,9 +101,9 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
           <% if is_current_user%>
               <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
-                  <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_course_path%>
+                  <%=link_to "", new_course_path, :class => "homepageMenuSetting fr", :title => "新建课程"%>
               <% else%>
-                  <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), join_private_courses_courses_path ,:remote => true%>
+                  <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:remote => true, :title => "加入课程"%>
               <% end%>
           <% end%>
         </div>
@@ -117,7 +117,7 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuForge').slideToggle();">项目</a>
 
           <% if is_current_user%>
-              <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_project_path%>
+              <%=link_to "", new_project_path, :class => "homepageMenuSetting fr", :title => "新建项目"%>
           <% end%>
         </div>
         <div class="homepageLeftMenuCourses" id="homepageLeftMenuForge">

app/views/messages/reply.js.erb

@@ -0,0 +1,6 @@
+<%if @project%>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
+<%elsif @course%>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
+<%end%>
+init_KindEditor_data(<%= @user_activity_id%>);

app/views/projects/search.html.erb

@@ -17,13 +17,13 @@
 				    <% end %>
 				<% end %>	
 				</td>
-				<td rowspan="2" >	
+				<!--<td rowspan="2" >
 				<div class="project-search" style="float: right">
-				<%= text_field_tag 'name', params[:name], :size => 30 %>
-				<%= hidden_field_tag 'project_type', params[:project_type] %>
-				<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+				<%#= text_field_tag 'name', params[:name], :size => 30 %>
+				<%#= hidden_field_tag 'project_type', params[:project_type] %>
+				<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
 				</div>			
-				</td>
+				</td>-->
 			</tr>
 			<tr>
 				<td style="padding-left: 8px"><a><%= link_to request.host() + "/projects", :controller => 'projects', :action => 'course', :project_type => 1 %> </a></td>
@@ -44,14 +44,14 @@
                             <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
                         <% end %>
 					</td>
-					<td rowspan="2" >
+					<!--<td rowspan="2" >
                         <script type="text/javascript">
                           function regexName()
                           {
                               var name = $.trim($("#name").val());
                               if(name.length == 0)
                               {
-                                  $("#project_name_span").text("<%= l(:label_search_conditions_not_null) %>");
+                                  $("#project_name_span").text("<%#= l(:label_search_conditions_not_null) %>");
                                   $("#project_name_span").css('color','#ff0000');
                                   $("#project_name_span").focus();
                                   return false;
@@ -69,16 +69,16 @@
                           }
                         </script>
                         <div class="project-search" style="float: right">
-                            <%= text_field_tag 'name', params[:name], :size => 30, :onkeyup => "regexName();" %>
-                            <%= hidden_field_tag 'project_type', params[:project_type] %>
-                            <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>  <!--修改项目搜索按钮的样式 -->
-                           <!-- <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
-                              <%= l(:label_search)%>
-                            </a> -->
+                            <%#= text_field_tag 'name', params[:name], :size => 30, :onkeyup => "regexName();" %>
+                            <%#= hidden_field_tag 'project_type', params[:project_type] %>
+                            <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>  &lt;!&ndash;修改项目搜索按钮的样式 &ndash;&gt;
+                           &lt;!&ndash; <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
+                              <%#= l(:label_search)%>
+                            </a> &ndash;&gt;
                             <br />
                             <span id="project_name_span" style="float: left"></span>
                         </div>
-					</td>
+					</td>-->
 				</tr>
 				<tr>
 					<td style="padding-left: 8px">

app/views/student_work/new.html.erb

@@ -1,3 +1,8 @@
+<% content_for :header_tags do %>
+   <%= javascript_include_tag 'homework','baiduTemplate' %>
+<% end %>
+
+<% if @homework.homework_type == 1 %>
 <script type="text/javascript">
   <%if @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status != 1%>
     $(function(){
@@ -18,7 +23,7 @@
 <div class="Newwork">
   <div class="hwork_ctt">
     <div class="hwork_dis" id="tbc_01">
-      <%= form_for(@stundet_work,
+      <%= form_for(@student_work,
                    :html => { :multipart => true },
                    :url => {:controller => 'student_work',
                             :action => 'create',
@@ -80,4 +85,122 @@
     </div>
   </div>
 </div><!--新建作业结束-->
-<div class="cl"></div>
+<div class="cl"></div>
+
+<% else %>
+
+
+<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<script id="t:result-list" type="text/html">
+    <div class="ProResultTop">
+      <p class="c_blue fl">第<!=index!>次测试</p><span class="fr c_grey"><!= time !></span>
+      <div class="cl"></div>
+    </div>
+
+    <! if(status == -2){!>
+      <div class="ProResultCon "><!= error_msg !></div>
+    <!}else{!>
+      <div class="ProResultTable " >
+        <ul class="ProResultUl " >
+          <! for(var i =0; i <results.length; ++i){ !>
+            <li ><span class="w60 T_C">测试<!=i+1!></span>
+            <! if(results[i]["status"]!=0){ !>
+              <span class="w150 c_red">测试错误！</span>
+              <span class="w60">您的输出：</span>
+              <span class="W200"><!=results[i]["result"]!></span>
+              <span class="w60">正确输出：</span>
+              <span  class="W200"><!=results[i]["output"]!></span>
+              <div class="cl"></div>
+            </li>
+            <!}else{!>
+              <span class="w150 c_green">测试正确！</span>
+              <div class="cl"></div>
+            </li>
+            <!}!>
+          <!}!>
+       </ul>
+      </div>
+    <! } !>
+
+</script>
+<!-- 模板1结束 -->
+
+ <div class="homepageRight">
+      <div class="HomeWork">
+        <div class="RightBanner">
+          <div class="NewsBannerName">提交作品</div>
+        </div>
+        <div class="HomeWorkBox">
+          <div class="">
+              <div class="homepagePostTitle fl"><%= @homework.name %></div><span class="fr c_grey">截止时间：<%= @homework.end_time %></span>
+                <div class="cl"></div>
+                <a href="javascript:void(0);" class="c_blue"><%= @homework.user.show_name %></a>
+                <p class="HomeWorkP"><%= @homework.description %> <br />
+输入  2 1 1 4 4 2 3 6 5 <br />
+输出  15<br />
+                 </p>
+            </div>
+            <p class="c_grey mt15">注：迟交扣<span class="c_red">2</span>分，缺评一个作品扣<span class="c_red">2</span>分</p>
+        </div><!---HomeWorkBox end  -->
+        <div class="HomeWorkCon">
+        <%= form_for(@student_work,
+                   :html => { :multipart => true },
+                   :url => {:controller => 'student_work',
+                            :action => 'create',
+                            :student_work_id => @student_work.id,
+                            :homework => @homework.id
+                   },
+                   :method => :post) do |f|%>
+
+          <div class="mt15">
+            <span>请使用 <%= @homework.language_name %> 语言编写</span>
+            </div>
+          <div class="mt10">
+              <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能" %>
+            </div>
+            <div class="mt10">
+            <%= f.text_area :description, id: 'program-src', class:"  W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
+            </div>
+            <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>
+                <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
+                <div class="cl"></div>
+            </div>
+        <% end %>
+        </div><!----HomeWorkCon end-->
+      </div><!----HomeWork end-->
+      <div class="ProResult mt10">
+        <% @student_work.student_work_tests.each_with_index do |test, index| %>
+          <div class="ProResultTop">
+             <p class="c_blue fl">第<%= @student_work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
+               <div class="cl"></div>
+          </div>
+          <% if test.status.to_i == -2 %>
+            <div class="ProResultCon "><%= test.results.first %></div>
+          <% else %>
+            <div class="ProResultTable " >
+              <ul class="ProResultUl " >
+                <% test.results.each_with_index do |x, i| %>
+                  <li ><span class="w60 T_C">测试<%=i+1%></span>
+                  <% if x["status"].to_i != 0 %>
+                    <span class="w150 c_red">测试错误！</span>
+                    <span class="w60">您的输出：</span>
+                    <span class="W200"><%=x["result"]%></span>
+                    <span class="w60">正确输出：</span>
+                    <span  class="W200"><%=x["output"]%></span>
+                    <div class="cl"></div>
+                  </li>
+                  <% else %>
+                    <span class="w150 c_green">测试正确！</span>
+                    <div class="cl"></div>
+                  </li>
+                  <% end %>
+                <% end %>
+             </ul>
+            </div>
+          <% end %>
+        <% end %>
+      </div><!----ProResult end-->
+    </div><!--homepageRight end-->
+
+<% end %>

app/views/users/_course_homework.html.erb

@@ -21,17 +21,10 @@
         </div>
         <div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
         作业描述：<%= activity.description.html_safe %>
       </div>
-      <!--<p style="display: none" id="activity_message_<%#= user_activity.id%>">
-        <a id="expend_more_information<%#= user_activity.id%>" href="javascript:void(0)" style="color: #0781b4;" onclick="show_more_reply('#activity_description_<%#=user_activity.id%>','#expend_more_information<%#= user_activity.id%>','#arrow<%#=user_activity.id%>');"  value="show_more">[展开]</a>
-                <span class="g-arr-down">
-                    <img id="arrow<%#=user_activity.id%>" src="/images/jiantou.jpg" width="12" height="6" />
-                </span>
-
-      </p>-->
-      <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity.id %>">
+      <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity_id %>">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">

app/views/users/_course_message.html.erb

@@ -1,118 +1,116 @@
-    <div class="resources mt10">
-      <div class="homepagePostBrief"> <!--  onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')"-->
-        <div class="homepagePostPortrait">
-          <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
-        </div>
-        <div class="homepagePostDes">
-          <div class="homepagePostTo break_word">
-            <% if activity.try(:author).try(:realname) == ' ' %>
-                <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-            <% else %>
-                <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-            <% end %>
-            TO
-            <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course), :class => "newsBlue ml15 mr5"%>
-            <%#= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5"%>
-          </div>
-          <div class="homepagePostTitle break_word">
-            <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-              <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" %>
-            <% else %>
-                <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey"%>
-            <% end %>
-          </div>
-          <div class="homepagePostDate">
-            发帖时间：<%= format_date(activity.created_on) %>
-          </div>
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course), :class => "newsBlue ml15 mr5"%>
+      </div>
+      <div class="homepagePostTitle break_word">
+        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+            <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" %>
+        <% else %>
+            <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey"%>
+        <% end %>
+      </div>
+      <div class="homepagePostDate">
+        发帖时间：<%= format_date(activity.created_on) %>
+      </div>
 
 
-          <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">帖子描述：
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-          </div>
-          <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-                  <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-                  <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-                </ul>
-              </li>
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">帖子描述：
+        <% if activity.parent_id.nil? %>
+            <%= activity.content.to_s.html_safe%>
+        <% else %>
+            <%= activity.parent.content.to_s.html_safe%>
+        <% end %>
+      </div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
             </ul>
-          </div>
-        </div>
-        <div class="cl"></div>
+          </li>
+        </ul>
       </div>
-      <div class="homepagePostReply">
-        <div class="homepagePostReplyBanner">
-          <% count=0 %>
-          <div class="homepagePostReplyBannerCount">回复(
-             <% if activity.parent_id.nil? %>
-                <% count=activity.replies_count%>
-                <%=count %>
-            <% else %>
-                <% count=activity.parent.replies_count%>
-                <%=count %>
-            <% end %>
-            )</div>
-          <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
-          <%if count>2 %>
-              <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity.id%>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
-          <% end %>
-          <!--<div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" nhname='reply_ex_btn' class="replyGrey">点击展开更多回复</a>
-          </div>-->
-        </div>
-        <!--<div class="homepagePostReplyInputContainer">
-          <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
-        </div>
-        <div class="homepagePostReplyInputContainer">
-          <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
-          <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
-          </div>
-          <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
-          </div>
-          <div class="cl"></div>
-        </div>-->
-        <% activity= activity.parent_id.nil? ? activity:activity.parent%>
-        <% replies_all_i = 0 %>
-        <%  unless activity.children.empty? %>
-            <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity.id %>">
-                <ul>
-                    <% activity.children.reorder("created_on desc").each do |reply|%>
-                          <% replies_all_i=replies_all_i+1 %>
-                          <li nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
-                            <div class="homepagePostReplyPortrait">
-                              <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
-                            </div>
-                            <div class="homepagePostReplyDes">
-                              <div class="homepagePostReplyPublisher">
-                                <% if reply.try(:author).try(:realname) == ' ' %>
-                                    <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                                <% else %>
-                                    <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                                <% end %>
-                                <%= format_date(reply.created_on) %>
-                                <%#= link_to(
-                                            l(:button_delete),
-                                            {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
-                                            :method => :post,
-                                            :data => {:confirm => l(:text_are_you_sure)},
-                                            :title => l(:button_delete),
-                                            :class => 'replyGrey fr ml10'
-                                    ) if reply.course_destroyable_by?(User.current) %>
-                                <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
-                              </div>
-                              <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
-                            </div>
-                            <div class="cl"></div>
-                          </li>
-                    <% end %>
-                  </ul>
-            </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <% count=0 %>
+      <div class="homepagePostReplyBannerCount">回复(
+        <% if activity.parent %>
+            <% count=activity.parent.children.count%>
+       <% else %>
+            <% count=activity.children.count%>
         <% end %>
+        <%= count %>
+        )</div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
+      <%if count > 2 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              点击展开更多回复(<%= count.to_s%>)
+            </a>
+          </div>
+      <% end %>
+    </div>
+
+    <div class="homepagePostReplyInputContainer">
+      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+        <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+            <input type="hidden" name="quote[quote]" value="">
+            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+            <p nhname='contentmsg_<%= user_activity_id%>'></p>
+            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
+            <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
+            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:6px;">发送</a>
+        <% end%>
       </div>
+      <div class="cl"></div>
     </div>
+
+    <% activity= activity.parent ? activity.parent : activity%>
+    <% replies_all_i = 0 %>
+    <%  if count > 0 %>
+        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.children.reorder("created_on desc").each do |reply|%>
+                <% replies_all_i=replies_all_i+1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher">
+                      <% if reply.try(:author).try(:realname) == ' ' %>
+                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_date(reply.created_on) %>
+                    </div>
+                    <div class="homepagePostReplyContent break_word">
+                      <%= reply.content.html_safe %>
+                    </div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+  </div>
+</div>

app/views/users/_course_news.html.erb

@@ -1,4 +1,4 @@
-<div class="resources mt10">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -18,56 +18,50 @@
       <div class="homepagePostDate">
         发布时间：<%= format_date(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id %>">通知描述：<%= activity.description.html_safe %></div>
-
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-            </ul>
-          </li>
-        </ul>
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
+        通知描述：
+        <%= activity.description.html_safe %>
       </div>
     </div>
     <div class="cl"></div>
   </div>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
-      <% count=activity.comments_count %>
-      <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
+      <% count=activity.comments.count %>
+      <div class="homepagePostReplyBannerCount">
+        回复（<%= count %>）
+      </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>2 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity.id%>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              点击展开更多回复(<%= count.to_s%>)
+            </a>
+          </div>
       <% end %>
-<!--
-      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
-      </div>-->
     </div>
-    <%#= render :partial => 'course_news_reply',:locals => { :contest => @contest, :journals => @jour, :state => false}%>
 
-    <!--<div class="homepagePostReplyInputContainer">
-      <%= form_tag({:controller => 'comments', :action => 'create', :id => activity}, :id => "add_reply_form") do %>
-          <textarea id="new_reply" class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+    <div class="homepagePostReplyInputContainer">
+      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+        <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+            <p nhname='contentmsg_<%= user_activity_id%>'></p>
+            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
+            <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
+            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:6px;">发送</a>
+        <% end%>
+      </div>
+      <div class="cl"></div>
+    </div>
 
-          <div class="homepagePostReplyCancel">
-            <a href="javascript:void(0);" class="postReplyCancel" onclick="$('#new_reply').value('');">取消</a>
-          </div>
-          <div class="homepagePostReplySubmit">
-            <a href="javascript:void(0);" class="postReplySubmit" onclick="$('#add_reply_form').submit();">发送</a>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-    </div>-->
     <% replies_all_i = 0 %>
-    <% unless activity.comments.empty? %>
-        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity.id %>">
+    <% if count > 0 %>
+        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
           <ul>
             <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <% replies_all_i=replies_all_i+1 %>
-                <li nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
+                <% replies_all_i = replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 2 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %>
                   </div>
@@ -79,9 +73,6 @@
                           <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_date(comment.created_on) %>
-                      <%#= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment},
-                                                       :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
-                      <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
                     <div class="homepagePostReplyContent break_word"><%= comment.comments.html_safe %></div>
                   </div>
@@ -90,6 +81,6 @@
             <% end %>
           </ul>
         </div>
-  <% end %>
+    <% end %>
   </div>
 </div>

app/views/users/_course_poll.html.erb

@@ -28,8 +28,8 @@
       <div class="homepagePostDate">
         发布时间：<%= format_date(activity.published_at) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">

app/views/users/_project_issue.html.erb

@@ -1,4 +1,4 @@
-<div class="resources mt10">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -11,24 +11,29 @@
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目缺陷", project_issues_path(activity.project), :class => "newsBlue ml15"%>
-        </div>
+      </div>
       <div class="homepagePostTitle break_word">
         <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>
-        <span class='<%= get_issue_priority(activity.priority_id)[0] %>'><%= get_issue_priority(activity.priority_id)[1] %></span>
+        <span class='<%= get_issue_priority(activity.priority_id)[0] %>'>
+          <%= get_issue_priority(activity.priority_id)[1] %>
+        </span>
       </div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
           <% unless activity.assigned_to_id.nil? %>
-            <% if activity.try(:assigned_to).try(:realname) == ' ' %>
-              <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
-            <% else %>
-              <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
-            <% end %>
+              <% if activity.try(:assigned_to).try(:realname) == ' ' %>
+                  <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% else %>
+                  <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% end %>
           <% end %>
         </div>
-        <div class="homepagePostDeadline">时间：<%=format_date(activity.created_on) %></div>
+        <div class="homepagePostDeadline">
+          时间：
+          <%=format_date(activity.created_on) %>
+        </div>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id %>">缺陷描述：
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">缺陷描述：
         <% if activity.description? %>
             <%= textAreailizable activity, :description, :attachments => activity.attachments %>
         <% end %>
@@ -37,74 +42,63 @@
       <div class="mt10" style="font-weight:normal;">
         <% if activity.attachments.any? %>
             <% activity.attachments.each do |attachment| %>
-                  <div class="break_word">
+                <div class="break_word">
                   <span title="<%= attachment.filename %>" id="attachment_">
                     <%= link_to_short_attachment attachment,:length=> 58, :class => 'homepagePostFileAtt newsBlue', :download => true -%>
                   </span>
-                   <% if attachment.is_text? %>
-                        <%= link_to image_tag('magnifier.png'),
-                                    :controller => 'attachments',
-                                    :action => 'show',
-                                    :id => attachment,
-                                    :filename => attachment.filename %>
-                    <% end %>
-                   <span class="postAttSize">(
+                  <% if attachment.is_text? %>
+                      <%= link_to image_tag('magnifier.png'),
+                                  :controller => 'attachments',
+                                  :action => 'show',
+                                  :id => attachment,
+                                  :filename => attachment.filename %>
+                  <% end %>
+                  <span class="postAttSize">(
                     <%= number_to_human_size attachment.filesize %>)
                   </span>
-                  </div>
+                </div>
             <% end %>
         <% end %>
       </div>
-      <!--<div class="mt10">
-        <a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span>
-      </div>
-      <div>
-        <a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span>
-      </div>-->
-      <div class="homepagePostSetting" id="act-<%=user_activity.id %>" style="visibility: hidden">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
     </div>
     <div class="cl"></div>
   </div>
   <div class="homepagePostReply">
 
     <div class="homepagePostReplyBanner">
-      <% count=activity.journals.count %>
+      <% count = activity.journals.count %>
       <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <% if count>2 %>
+      <% if count > 2 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= user_activity.id %>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">点击展开更多回复(<%= count.to_s %>
-              )</a></div>
+            <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+              点击展开更多回复(<%= count.to_s %>)
+            </a>
+          </div>
       <% end %>
-      <!--<div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
-      </div>-->
-    </div>
-    <!--<div class="homepagePostReplyInputContainer">
-      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
     </div>
+
     <div class="homepagePostReplyInputContainer">
-      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
-      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
-      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
+      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+        <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
+            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+            <p nhname='contentmsg_<%= user_activity_id%>'></p>
+            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
+            <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
+            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:6px;">发送</a>
+        <% end%>
+      </div>
       <div class="cl"></div>
-    </div>-->
+    </div>
+
     <% replies_all_i = 0 %>
-    <% unless activity.journals.empty? %>
-        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity.id %>">
+    <% if count > 0 %>
+        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
           <ul>
             <% activity.journals.reorder("created_on desc").each do |reply| %>
-                <% replies_all_i=replies_all_i+1 %>
-                <li nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
+                <% replies_all_i=replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %>
                   </div>
@@ -112,19 +106,21 @@
                     <div class="homepagePostReplyPublisher">
                       <% if reply.try(:user).try(:realname) == ' ' %>
                           <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                          <% else %>
+                      <% else %>
                           <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_date(reply.created_on) %>
-
-                      <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
                     <% if reply.details.any? %>
                         <% details_to_strings(reply.details).each do |string| %>
-                            <div class="homepagePostReplyContent break_word"><%= string %></div>
+                            <div class="homepagePostReplyContent break_word">
+                              <%= string %>
+                            </div>
                         <% end %>
                     <% else %>
-                        <div class="homepagePostReplyContent break_word"><%= reply.notes.html_safe %></div>
+                        <div class="homepagePostReplyContent break_word">
+                          <%= reply.notes.html_safe %>
+                        </div>
                     <% end %>
                   </div>
                   <div class="cl"></div>

app/views/users/_project_message.html.erb

@@ -1,4 +1,4 @@
-<div class="resources mt10">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -26,64 +26,56 @@
       <div class="homepagePostDate">
         时间：<%= format_date(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">帖子描述：
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">帖子描述：
         <% if activity.parent_id.nil? %>
             <%= activity.content.to_s.html_safe%>
         <% else %>
             <%= activity.parent.content.to_s.html_safe%>
         <% end %>
       </div>
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
     </div>
     <div class="cl"></div>
   </div>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner"><% count=0 %>
+    <div class="homepagePostReplyBanner">
+      <% count = 0 %>
       <div class="homepagePostReplyBannerCount">回复(
-        <% if activity.parent_id.nil? %>
-            <% count=activity.replies_count%>
-            <%=count %>
+        <% if activity.parent %>
+            <% count=activity.parent.children.count%>
         <% else %>
-            <% count=activity.parent.replies_count%>
-            <%=count %>
+            <% count=activity.children.count%>
         <% end %>
+        <%=count %>
         )</div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count>2 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity.id%>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
       <% end %>
-      <!--<div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" nhname='reply_ex_btn' class="replyGrey">点击展开更多回复</a>
-      </div>-->
-    </div>
-    <!--<div class="homepagePostReplyInputContainer">
-      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
     </div>
+
     <div class="homepagePostReplyInputContainer">
-      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
-      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
-      </div>
-      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
+      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+        <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+            <input type="hidden" name="quote[quote]" value="">
+            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+            <p nhname='contentmsg_<%= user_activity_id%>'></p>
+            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
+            <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
+            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:6px;">发送</a>
+        <% end%>
       </div>
       <div class="cl"></div>
-    </div>-->
+    </div>
+
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
     <% replies_all_i = 0 %>
-    <% unless activity.children.empty? %>
-        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity.id %>">
+    <% if count > 0 %>
+        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
           <ul>
             <% activity.children.reorder("created_on desc").each do |reply| %>
                 <% replies_all_i=replies_all_i+1 %>
-                <li nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
                   </div>
@@ -95,15 +87,6 @@
                           <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_date(reply.created_on) %>
-                      <%#= link_to(
-                                  l(:button_delete),
-                                  {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
-                                  :method => :post,
-                                  :data => {:confirm => l(:text_are_you_sure)},
-                                  :title => l(:button_delete),
-                                  :class => 'replyGrey fr ml10'
-                          ) if reply.course_destroyable_by?(User.current) %>
-                      <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
                     <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
                   </div>

app/views/users/_resource_share_for_project_popup.html.erb

@@ -34,7 +34,7 @@
           <li class="fl">
             <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
           </li>
-          <li class="sendCourseName fl"><%= truncate( project.name,:length=>18)%></li>
+          <li class="sendCourseName fl"><%= project.name%></li>
         </ul>
         <% end %>
     </div>

app/views/users/_resource_share_popup.html.erb

@@ -34,7 +34,7 @@
               <li class="fl">
                 <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
               </li>
-              <li class="sendCourseName fl"><%= truncate(course.name,:length=>18)%></li>
+              <li class="sendCourseName fl"><%= course.name%></li>
             </ul>
             <% end %>
           </div>

app/views/users/_resources_list.html.erb

@@ -1,22 +1,25 @@
 
 <% if attachments.nil? || attachments.empty? %>
+    <!--<p class="nodata">-->
+    <!--<%#= l(:label_no_data) %>-->
+    <!--</p>-->
 <% else %>
     <% attachments.each do |attach| %>
-    <ul class="resourcesList">
-      <li class="resourcesListCheckbox fl">
-        <input name="checkbox1[]" type="checkbox" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
-      </li>
-    <li class="resourcesListName fl">
-      <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
-      <%= link_to truncate(attach.filename,:length=>18), 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="resourcesListType fl"><%= get_resource_type(attach.container_type)%></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 style="display: none"><%= attach.author_id %></li>
-    <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
-    <li style="display: none"><%= attach.id %></li>
-    </ul>
-   <% end %>
+        <ul class="resourcesList">
+          <li class="resourcesListCheckbox fl">
+            <input name="checkbox1[]" type="checkbox" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
+          </li>
+          <li class="resourcesListName fl">
+            <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
+            <%= link_to truncate(attach.filename,:length=>18), 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="resourcesListType fl"><%= get_resource_type(attach.container_type)%></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 style="display: none"><%= attach.author_id %></li>
+          <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
+          <li style="display: none"><%= attach.id %></li>
+        </ul>
+    <% end %>
 <% end %>

app/views/users/_show_user_resource.html.erb

@@ -1,26 +1,67 @@
-<div class="coursesChoosePopup" id="coursesChoosePopup">
+<script>
+//    $(document).ready(function(){
+////        var popupHeight = $(".referenceResourcesPopup").outerHeight(true);
+////        $(".referenceResourcesPopup").css("marginTop",-popupHeight/2);
+//
+//
+//        $(".resourcePopupClose").click(function(){
+//            $(".referenceResourcesPopup").css("display","none");
+//        });
+//    });
+
+    $(document).ready(function(){
+        $(".referenceTypeBlock").click(function(){
+            var activeBlock = $(".referenceResourceType").children(".referenceTypeActive");
+            activeBlock.removeClass("referenceTypeActive");
+            $(this).addClass("referenceTypeActive");
+        });
+    });
+</script>
+<!--<div class="referenceResourcesPopup">-->
   <div>
-    <div class="sendText">资源库</div>
+    <div class="referenceText">引用资源库资源</div>
+  </div>
+  <div>
+    <div class="referenceResourceType fl">
+      <a href="<%= user_resource_type_user_path(user)%>" class="referenceTypeBlock referenceTypeActive" data-remote="true" >资源库</a>
+      <a href="<%= user_resource_type_user_path(user,:type=>'2')%>" class="referenceTypeBlock"  data-remote="true">课程资源</a>
+      <a href="<%= user_resource_type_user_path(user,:type=>'3')%>" class="referenceTypeBlock"  data-remote="true">项目资源</a>
+      <a href="<%= user_resource_type_user_path(user,:type=>'5')%>" class="referenceTypeBlock"  data-remote="true">用户资源</a>
+      <a href="<%= user_resource_type_user_path(user,:type=>'4')%>" class="referenceTypeBlock"  data-remote="true">附件</a> </div>
+    <div class="fr">
+      <!--<form class="referenceSearchBox">-->
+      <%=  form_tag(user_ref_resource_search_user_path(user),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%>
+        <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchReferencePopup" />
+        <a href="javascript:void(0);" onclick="$(this).parent().submit();" class="referenceSearchIcon"></a>
+      <% end %>
+      <!--</form>-->
+    </div>
+    <div class="cl"></div>
+  </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_tag(import_resources_to_homework_user_path(user),:method => 'post',:remote=>'true') do %>
+    <input type="hidden" name="homework_id" value="<%= homework_id%>"/>
+  <div style="height: 300px" id="user_ref_resources">
+    <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
   </div>
-
   <div >
-    <form class="coursesSearchBox">
-      <input type="text" name="homework_name" placeholder="输入资源名称进行搜索" class="searchCoursesPopup" id="search_homework_name"/>
-      <a href="javascript:void(0);" class="searchIconPopup" onclick="search_homework_by_name('<%= user_search_homeworks_user_path(User.current.id)%>');"></a>
-    </form>
+    <ul class="wlist" id="resource_ref_pages" style="margin-top: 5px;">
+      <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+    </ul>
+  </div>
+  <div>
+    <div class="courseSendSubmit"><a href="javascript:void(0);" onclick="$(this).parent().parent().parent().submit();" class="sendSourceText">确定</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a></div>
   </div>
-  <%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %>
-      <div class="homeworkListForm mb10 " id="homework_list_form_show">
-        <%= render :partial => 'users/show_user_homework_form', :locals => {:user_homeworks => @user_homeworks}%>
-      </div>
-      <div>
-        <div class="courseSendSubmit">
-          <a href="javascript:void(0);" class="sendSourceText" onclick="$('#select_homework_form').submit();">确定</a>
-        </div>
-        <div class="courseSendCancel">
-          <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal('#coursesChoosePopup')">取消</a>
-        </div>
-      </div>
-  <% end%>
   <div class="cl"></div>
-</div>
+  <% end %>
+<!--</div>-->

app/views/users/_user_activities.html.erb

@@ -1,51 +1,21 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %>
+<style type="text/css">
+    /*回复框*/
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
+    .ke-inline-block{display: none;}
+</style>
 <% user_activities.each do |user_activity|
-  unless user_activities.nil? %>
+  if user_activities %>
         <script>
-            //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
-            //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
-            /*$(function(){
-                function nh_show_btn(){
-                    if($("#activity_message_<%#= user_activity.id%>").is(':hidden')){
-                        if($("#activity_description_<%#= user_activity.id%>").height()>120){
-                            $("#activity_description_<%#= user_activity.id%>").toggleClass("activity_description_maxHeight");
-                            $("#activity_message_<%#= user_activity.id%>").show();
-                        }
-                    }
-                }
-                var div = $("#activity_description_<%#= user_activity.id%>");
-                var imgs = $('img',div);
-                var lens = imgs.length;
-                function nh_load_img_end(){
-                    nh_show_btn();
-                }
-                if(lens > 0){
-                    $('img',div).load(function(){
-                        nh_load_img_end();
-                    });
-                }
-                nh_show_btn();
-            });*/
-            /*function show_more_reply(contentid, id2, id3) {
-                $(contentid).toggleClass("activity_description_maxHeight");
-                $(contentid).toggleClass("course_description_none");
-                var information = $(id2);
-                var arrow = $(id3);
-                var val = information.attr("value");
-                if (val == "show_more") {
-                    $(id2).text("[收起]");
-                    information.attr("value", "hide_more");
-                    arrow.attr("src", "/images/jiantouup.jpg")
-                }
-                else {
-                    $(id2).text("[展开]");
-                    information.attr("value", "show_more");
-                    arrow.attr("src", "/images/jiantou.jpg")
-                }
-            }*/
             function expand_reply(container,btnid){
                 var target = $(container);
                 var btn = $(btnid);
-                //var jumpobj = $("#reply_div_<%#= activity.id %>");
                 if(btn.data('init')=='0'){
                     btn.data('init',1);
                     btn.html('收起回复('+btn.data('count')+')');
@@ -58,6 +28,10 @@
                     target.eq(1).show();
                 }
             }
+
+            $(function() {
+                init_KindEditor_data(<%= user_activity.id%>);
+            });
         </script>
         <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>
         <% case user_activity.container_type.to_s %>
@@ -65,41 +39,26 @@
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'HomeworkCommon' %>
-                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'News' %>
-                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Message'%>
-                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity =>user_activity} %>
-                    <%# when 'Course'%>
-                    <%#= render :partial => 'course_create', :locals => {:activity => act,:user_activity =>user_activity} %>
-                    <%# when 'Attachment' %>
-                    <%#= render :partial => 'course_attachment', :locals => {:activity => act, :user_activity => user_activity} %>
-                    <%# when 'JournalsForMessage' %>
-                    <%#= render :partial => 'course_journalsformessage', :locals => {:activity => act, :user_activity => user_activity} %>
+                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Poll' %>
-                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity => user_activity} %>
+                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
                 <% end %>
             <% end %>
         <% when 'Project' %>
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'Issue' %>
-                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Message' %>
-                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity =>user_activity} %>
-                    <%# when 'Journal' %>
-                    <%#= render :partial => 'project_journal', :locals => {:activity => act,:user_activity =>user_activity} %>
-                    <%# when 'News' %>
-                    <%#= render :partial => 'project_news', :locals => {:activity => act,:user_activity =>user_activity} %>
-                    <%# when 'Document' %>
-                    <%#= render :partial => 'project_document', :locals => {:activity => act,:user_activity =>user_activity} %>
-                    <%# when 'Attachment' %>
-                    <%#= render :partial => 'project_attachment', :locals => {:activity => act,:user_activity =>user_activity} %>
-                    <%# when 'ProjectCreateInfo' %>
-                    <%#= render :partial => 'project_create', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% end %>
             <% end %>
         <% end %>
     <% end %>
 <% end %>
-<input type="hidden" value="<%= page%>" id="show_more_activities" />
+<input type="hidden" value="<%= page%>"/>
+<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>

app/views/users/_user_homework_attachment.html.erb

@@ -46,8 +46,9 @@
 <div class="cl"></div>
 
 <div class="mt5 fl">
+   <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
   <a href="javascript:void(0);" class="AnnexBtn fl mt3" onclick="$('#_file').click();">上传附件</a>
-  <%#= link_to "资源库", user_import_resource_user_path(User.current.id),:class => "FilesBtn fl mr15 mt3",:remote => true%>
+  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mr15 mt3",:remote => true%>
 </div>
 
 <% content_for :header_tags do %>

app/views/users/_user_homework_form.html.erb

@@ -1,7 +1,11 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<% content_for :header_tags do %>
+    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+    <%= javascript_include_tag 'homework','baiduTemplate' %>
+<% end %>
+
 <div class="HomeWorkCon">
   <div>
-    <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  W700" maxlength="255" onkeyup="regex_homework_name();" placeholder="请输入作业标题" value="<%= homework.name%>" >
+    <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  w712" maxlength="255" onfocus="$('#homework_editor').show()" onkeyup="regex_homework_name();" placeholder="请输入作业标题" value="<%= homework.name%>" >
     <p id="homework_name_span" class="c_red mt5"></p>
   </div>
   <div class="cl"></div>
@@ -9,36 +13,75 @@
   <div class=" mt10">
     <%= link_to "导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true%>
     <div class="calendar_div fl">
-      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time || (Time.now  + 3600 * 24).strftime('%Y-%m-%d')%>" >
+      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly"  >
       <%= calendar_for('homework_end_time')%>
     </div>
   </div>
   <div class="cl"></div>
+  <div id="homework_editor" style="display: none">
+    <div class="mt10">
+      <% if edit_mode %>
+          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON %>
+      <% else %>
+          <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>
+          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px" %>
+      <% end %>
+    </div>
+    <div class="cl"></div>
 
-  <div class="mt10">
-    <% if edit_mode %>
-        <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:height => "150px",:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-    <% else %>
-        <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-        <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:height => "150px" %>
-    <% end %>
-  </div>
-  <div class="cl"></div>
 
-  <div class="mt10">
-    <!--<input type="text" class="InputBox  W700 SearchIcon" placeholder="发送到课程" />-->
-    <%= select_tag :course_id,options_for_select(get_as_teacher_courses(User.current),homework.course_id), {:class => "InputBox  w708"}  %>
-  </div>
-  <div class="cl"></div>
+    <div class="mt10">
+      <!--<input type="text" class="InputBox  W700 SearchIcon" placeholder="发送到课程" />-->
+      <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox  w720",:value => "请选择发布作业的课程"} %>
+    </div>
+    <div class="cl"></div>
+
+    <div id="homework_attachments">
+      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework} %>
+    </div>
 
-  <div id="homework_attachments">
-    <%= render :partial => 'users/user_homework_attachment', :locals => { :container => homework } %>
-  </div>
 
-  <div class="mt5 fr">
-    <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_homework('new_homework_common');">发送</a>
-    <span class="fr mr10 mt3">或</span>
-    <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
+    <div class="mt5">
+      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_comm_homework('new_homework_common');">发送</a>
+      <span class="fr mr10 mt3">或</span>
+      <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
+      <div class="cl"></div>
+    </div>
+
+
+
+    <div class="mt10">
+      <a href="javascript:void(0);" class=" fl DropBtn">编程选项</a>
+      <div class="DropLine"></div>
+      <div class="cl"></div>
+    </div>
+
+    <div class="advanced_option" style="display:none;">
+      <div class="mt10">
+        <select class="InputBox W120" name="program[language]">
+          <option value="1" selected>C语言</option>
+          <option value="2">C++</option>
+        </select>
+      </div>
+
+      <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>
+        <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
+        <div class="cl"></div>
+      </div>
+    </div>
+
+    <input type="hidden" name="homework_type" value="1">
+
   </div>
 </div>
-<div class="cl"></div>
+<div class="cl"></div>
+
+<script id="t:test-answer-list" type="text/html">
+  <div class="mt10">
+    <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required name="program[input][]"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required 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>
+  </div>
+</script>

app/views/users/_user_homework_list.html.erb

@@ -53,4 +53,5 @@
     </div><!----HomeWork end-->
 <% end%>
 
-<input type="hidden" value="<%= page%>" id="user_show_more_homework" />
+<input type="hidden" value="<%= page%>" />
+<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>

app/views/users/add_exist_file_to_course.js.erb

@@ -1,4 +1,9 @@
 <% if @flag == true%>
+$("#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})%>');
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
+$("#res_all_count").html(<%= @atta_count%>);
 closePopUp();
 <% else%>
 <% end %>

app/views/users/add_exist_file_to_project.js.erb

@@ -1,4 +1,9 @@
 <% if @flag == true%>
+$("#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})%>');
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
+$("#res_all_count").html(<%= @atta_count%>);
 closePopUp();
 <% else%>
 <% end %>

app/views/users/import_resources_to_homework.js.erb

@@ -0,0 +1,16 @@
+<% unless @attachments.empty?%>
+    <% @attachments.each_with_index do |attachment, i| %>
+    $("#attachments_fields").append(
+    '<span id="attachments_p<%= i %>">'+
+    '<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+
+    '<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+
+        '<span class="ispublic-label"><%= l(:field_is_public)%>:</span>'+
+    '<%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+
+    '<%= link_to("&nbsp;".html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => "js"), :method => "delete", :remote => true, :class => "remove-upload") unless attachment.id.nil? %>'+
+    '<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>'+
+    '</span>'+
+    '<div class="cl"></div>')
+
+    <% end %>
+    hideModal();
+<% end %>

app/views/users/new_user_commit_homework.html.erb

@@ -0,0 +1,117 @@
+<% content_for :header_tags do %>
+  <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+  <%= javascript_include_tag 'homework','baiduTemplate' %>
+<% end %>
+
+<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<script id="t:result-list" type="text/html">
+    <div class="ProResultTop">
+      <p class="c_blue fl">第<!=index!>次测试</p><span class="fr c_grey"><!= time !></span>
+      <div class="cl"></div>
+    </div>
+
+    <! if(status == -2){!>
+      <div class="ProResultCon "><!= error_msg !></div>
+    <!}else{!>
+      <div class="ProResultTable " >
+        <ul class="ProResultUl " >
+          <! for(var i =0; i <results.length; ++i){ !>
+            <li ><span class="w60 T_C">测试<!=i+1!></span>
+            <! if(results[i]["status"]!=0){ !>
+              <span class="w150 c_red">测试错误！</span>
+              <span class="w60">您的输出：</span>
+              <span class="W200"><!=results[i]["result"]!></span>
+              <span class="w60">正确输出：</span>
+              <span  class="W200"><!=results[i]["output"]!></span>
+              <div class="cl"></div>
+            </li>
+            <!}else{!>
+              <span class="w150 c_green">测试正确！</span>
+              <div class="cl"></div>
+            </li>
+            <!}!>
+          <!}!>
+       </ul>
+      </div>
+    <! } !>
+
+</script>
+<!-- 模板1结束 -->
+
+ <div class="homepageRight">
+      <div class="HomeWork">
+        <div class="RightBanner">
+          <div class="NewsBannerName">提交作品</div>
+        </div>
+        <div class="HomeWorkBox">
+          <div class="">
+              <div class="homepagePostTitle fl"><%= @homework.name %></div><span class="fr c_grey">截止时间：<%= @homework.end_time %></span>
+                <div class="cl"></div>
+                <a href="javascript:void(0);" class="c_blue"><%= @homework.user.show_name %></a>
+                <p class="HomeWorkP"><%= @homework.description %> <br />
+输入  2 1 1 4 4 2 3 6 5 <br />
+输出  15<br />
+                 </p>
+            </div>
+            <p class="c_grey mt15">注：迟交扣<span class="c_red">2</span>分，缺评一个作品扣<span class="c_red">2</span>分</p>
+        </div><!---HomeWorkBox end  -->
+        <div class="HomeWorkCon">
+        <%= form_for(@student_work,
+                   :html => { :multipart => true },
+                   :url => {:controller => 'users',
+                            :action => 'user_commit_homework',
+                            :student_work_id => @student_work.id,
+                            :homework => @homework.id
+                   },
+                   :method => :post) do |f|%>
+
+          <div class="mt15">
+            <span>请使用 <%= @homework.language_name %> 语言编写</span>
+            </div>
+          <div class="mt10">
+              <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能" %>
+            </div>
+            <div class="mt10">
+            <%= f.text_area :description, id: 'program-src', class:"  W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
+            </div>
+            <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>
+                <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
+                <div class="cl"></div>
+            </div>
+        <% end %>
+        </div><!----HomeWorkCon end-->
+      </div><!----HomeWork end-->
+      <div class="ProResult mt10">
+        <% @student_work.student_work_tests.each_with_index do |test, index| %>
+          <div class="ProResultTop">
+             <p class="c_blue fl">第<%= @student_work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
+               <div class="cl"></div>
+          </div>
+          <% if test.status.to_i == -2 %>
+            <div class="ProResultCon "><%= test.results.first %></div>
+          <% else %>
+            <div class="ProResultTable " >
+              <ul class="ProResultUl " >
+                <% test.results.each_with_index do |x, i| %>
+                  <li ><span class="w60 T_C">测试<%=i+1%></span>
+                  <% if x["status"].to_i != 0 %>
+                    <span class="w150 c_red">测试错误！</span>
+                    <span class="w60">您的输出：</span>
+                    <span class="W200"><%=x["result"]%></span>
+                    <span class="w60">正确输出：</span>
+                    <span  class="W200"><%=x["output"]%></span>
+                    <div class="cl"></div>
+                  </li>
+                  <% else %>
+                    <span class="w150 c_green">测试正确！</span>
+                    <div class="cl"></div>
+                  </li>
+                  <% end %>
+                <% end %>
+             </ul>
+            </div>
+          <% end %>
+        <% end %>
+      </div><!----ProResult end-->
+    </div><!--homepageRight end-->

app/views/users/show.html.erb

@@ -1,19 +1,3 @@
-<script type="text/javascript">
-    var scrollHandler = function () {
-        if ($(window).scrollTop() == $(document).height() - $(window).height()) {
-            $.get(
-                    '<%= user_activities_path(@user.id)%>',
-                    { page: $("#show_more_activities").val(),
-                        type: $("#user_activities_type").val()},
-                    function (data) {
-
-                    }
-            );
-        }
-    };
-    $(window).scroll(scrollHandler);
-</script>
-
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="resources">
   <div class="homepageRightBanner">
@@ -55,4 +39,4 @@
   </div>
 </div>
 
-<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0} %>
+<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %>

app/views/users/show.js.erb

@@ -1,4 +1,4 @@
-$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page} )%>");
+$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>");
 <% if @user_activities.count < 10%>
-$(window).off("scroll", scrollHandler);
+$("#show_more_activities").hide();
 <% end%>

app/views/users/user_commit_homework.html.erb

@@ -0,0 +1,114 @@
+
+
+<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<script id="t:result-list" type="text/html">
+    <div class="ProResultTop">
+      <p class="c_blue fl">第<!=index!>次测试</p><span class="fr c_grey"><!= time !></span>
+      <div class="cl"></div>
+    </div>
+
+    <! if(status == -2){!>
+      <div class="ProResultCon "><!= error_msg !></div>
+    <!}else{!>
+      <div class="ProResultTable " >
+        <ul class="ProResultUl " >
+          <! for(var i =0; i <results.length; ++i){ !>
+            <li ><span class="w60 T_C">测试<!=i+1!></span>
+            <! if(results[i]["status"]!=0){ !>
+              <span class="w150 c_red">测试错误！</span>
+              <span class="w60">您的输出：</span>
+              <span class="W200"><!=results[i]["result"]!></span>
+              <span class="w60">正确输出：</span>
+              <span  class="W200"><!=results[i]["output"]!></span>
+              <div class="cl"></div>
+            </li>
+            <!}else{!>
+              <span class="w150 c_green">测试正确！</span>
+              <div class="cl"></div>
+            </li>
+            <!}!>
+          <!}!>
+       </ul>
+      </div>
+    <! } !>
+
+</script>
+<!-- 模板1结束 -->
+
+ <div class="homepageRight">
+      <div class="HomeWork">
+        <div class="RightBanner">
+          <div class="NewsBannerName">提交作品</div>
+        </div>
+        <div class="HomeWorkBox">
+          <div class="">
+              <div class="homepagePostTitle fl"><%= @homework.name %></div><span class="fr c_grey">截止时间：<%= @homework.end_time %></span>
+                <div class="cl"></div>
+                <a href="javascript:void(0);" class="c_blue"><%= @homework.user.show_name %></a>
+                <p class="HomeWorkP"><%= @homework.description %> <br />
+输入  2 1 1 4 4 2 3 6 5 <br />
+输出  15<br />
+                 </p>
+            </div>
+            <p class="c_grey mt15">注：迟交扣<span class="c_red">2</span>分，缺评一个作品扣<span class="c_red">2</span>分</p>
+        </div><!---HomeWorkBox end  -->
+        <div class="HomeWorkCon">
+        <%= form_for(@student_work,
+                   :html => { :multipart => true },
+                   :url => {:controller => 'student_work',
+                            :action => 'create',
+                            :student_work_id => @student_work.id,
+                            :homework => @homework.id
+                   },
+                   :method => :post) do |f|%>
+
+          <div class="mt15">
+            <span>请使用 <%= @homework.language_name %> 语言编写</span>
+            </div>
+          <div class="mt10">
+              <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能" %>
+            </div>
+            <div class="mt10">
+            <%= f.text_area :description, id: 'program-src', class:"  W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
+            </div>
+            <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>
+                <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
+                <div class="cl"></div>
+            </div>
+        <% end %>
+        </div><!----HomeWorkCon end-->
+      </div><!----HomeWork end-->
+      <div class="ProResult mt10">
+        <% @student_work.student_work_tests.each_with_index do |test, index| %>
+          <div class="ProResultTop">
+             <p class="c_blue fl">第<%= @student_work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
+               <div class="cl"></div>
+          </div>
+          <% if test.status.to_i == -2 %>
+            <div class="ProResultCon "><%= test.results.first %></div>
+          <% else %>
+            <div class="ProResultTable " >
+              <ul class="ProResultUl " >
+                <% test.results.each_with_index do |x, i| %>
+                  <li ><span class="w60 T_C">测试<%=i+1%></span>
+                  <% if x["status"].to_i != 0 %>
+                    <span class="w150 c_red">测试错误！</span>
+                    <span class="w60">您的输出：</span>
+                    <span class="W200"><%=x["result"]%></span>
+                    <span class="w60">正确输出：</span>
+                    <span  class="W200"><%=x["output"]%></span>
+                    <div class="cl"></div>
+                  </li>
+                  <% else %>
+                    <span class="w150 c_green">测试正确！</span>
+                    <div class="cl"></div>
+                  </li>
+                  <% end %>
+                <% end %>
+             </ul>
+            </div>
+          <% end %>
+        <% end %>
+      </div><!----ProResult end-->
+    </div><!--homepageRight end-->

app/views/users/user_homeworks.html.erb

@@ -1,35 +1,26 @@
 <script type="text/javascript">
-  var scrollHandler = function(){
-      if ($(window).scrollTop() == $(document).height() - $(window).height()) {
-          $.get(
-                  '<%= user_homeworks_user_path(User.current.id)%>',
-                  { page : $("#user_show_more_homework").val()},
-                  function (data) {
-
-                  }
-          );
-      }
-  };
-  $(window).scroll(scrollHandler);
-
   function reset_homework(){
       $("#homework_name").val("");
-      $("#homework_end_time").val("<%= (Time.now  + 3600 * 24).strftime('%Y-%m-%d')%>");
-      $("#course_id").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 })%>");
       homework_description_editor.html("");
+      $("#homework_editor").toggle();
+  }
+
+  function checkAllBox(doc){
+
   }
 </script>
+<div class="resources mb10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">作业</div>
+  </div>
+</div>
+<div class="cl"></div>
 
 <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
     <!-- 老师身份才可以发布作业 -->
-    <div class="resources mb10">
-      <div class="homepageRightBanner">
-        <div class="NewsBannerName">发布作业</div>
-      </div>
-    </div>
-    <div class="cl"></div>
-
     <div class="HomeWork mb10">
       <% homework = HomeworkCommon.new %>
       <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
@@ -38,14 +29,6 @@
           </div>
       <% end%>
     </div><!----HomeWork end-->
-
-<%else%>
-    <div class="resources mb10">
-      <div class="homepageRightBanner">
-        <div class="NewsBannerName">作业</div>
-      </div>
-    </div>
-    <div class="cl"></div>
 <% end%>
 
 <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0} %>

app/views/users/user_import_resource.js.erb

@@ -1,7 +1,8 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_homeworks') %>');
-showModal('ajax-modal', '580px');
-$('#ajax-modal').css('height','300px').css("width","580px");
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id}) %>');
+showModal('ajax-modal', '730px');
+$('#ajax-modal').css('height','500px').css("width","730px");
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
-"<a href='javascript:void(0)' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed");
+$('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" +
+"<a href='javascript:void(0)' class='resourceClose' onclick='hideModal();'></a></div>");
+$('#ajax-modal').parent().css("top","").css("left","").css("position","fixed").css("padding-left","16px").css("padding-bottom","16px").css("padding-right","16px");
+$('#ajax-modal').parent().addClass("popbox").addClass("referenceResourcesPopup");

app/views/users/user_newfeedback.html.erb

@@ -1,11 +1,6 @@
-<!--<div class="top_new">-->
-  <!--<span class="<%#= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>-->
-  <!--<%# if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>-->
-      <!--<a href="<%#= url_for(:controller => 'courses', :action => 'new',) %>" class="green_n_btn fr mt2" target="_blank">新建课程</a>-->
-  <!--<%# end %>-->
-  <!--<div class="cl"></div>-->
-<!--</div>-->
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor","user" %>
 <style type="text/css">
+    /*回复框*/
     div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
     span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
@@ -13,17 +8,7 @@
     span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
     div.ke-toolbar .ke-outline{border:none;}
-
-    div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
-    div.recall_con{width:570px;}
-    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
-    .fr.cr{ clear: right}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>
-<!--<div id="RSide" class="fl">-->
-  <!--<div class="users_r_top">-->
-    <!--<h2 class="users_r_h2">用户留言</h2>-->
-  <!--</div>-->
 <div >
   <div class="resources mb10">
     <div class="homepageRightBanner">
@@ -38,8 +23,8 @@
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea' name="new_form[user_message]"></textarea>
           <p nhname='contentmsg'></p>
           <div nhname='toolbar_container' style="float:left;padding-top:3px;"></div>
-          <a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:3px;">取消</a>
-          <a id="new_message_submit_btn" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:3px;">留言</a>
+          <a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
+          <a id="new_message_submit_btn" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:6px;">留言</a>
       <% end%>
     </div>
     <div class="cl"></div>

app/views/users/user_ref_resource_search.js.erb

@@ -0,0 +1,2 @@
+$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'resources_list',:locals=>{:attachments => @attachments})%>');
+$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');

app/views/users/user_resource.html.erb

@@ -4,9 +4,9 @@
 <%= stylesheet_link_tag 'leftside' %>
 <%= javascript_include_tag 'attachments'%>
 <!--<script type="text/css">-->
-    <!--html,body{ overflow-y:scroll;}-->
-    <!--html,body{ overflow:scroll; min-height:101%;}-->
-    <!--html{ overflow:-moz-scrollbars-vertical;}-->
+<!--html,body{ overflow-y:scroll;}-->
+<!--html,body{ overflow:scroll; min-height:101%;}-->
+<!--html{ overflow:-moz-scrollbars-vertical;}-->
 <!--</script>-->
 <script>
     function remote_get_resources(user_id,type){
@@ -67,7 +67,7 @@
       </li>
     </ul>
   </div>
-  </div>
+</div>
 <div class="resources mt10" id="users_setting">
   <div class="resourcesSearchBanner mt10">
     <div class="resourcesUploadBox">
@@ -93,24 +93,24 @@
     </ul>
   </div>
   <form id="resources_list_form">
-  <div id="resources_list">
+    <div id="resources_list">
 
-     <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
+      <%= 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 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>
-  </div>
   </form>
   <div class="cl"></div>
   <div>
@@ -122,7 +122,7 @@
 
 <div class="cl"></div>
 <!--<div id="upload_box" style="display: none">-->
-   <!--<%#= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>-->
+<!--<%#= 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>
@@ -133,73 +133,74 @@
 </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  发送到项目 2
-  var lastSendType;  //保存上次发送的发送类型
-$(".resourcesList").mousedown(function(e) {
-             //如果是右键的话
-            if (3 == e.which) {
-                 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) {
-         //在列表上的任何单击事件都要恢复原来的样子
-         //隐藏右键菜单
+    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  发送到项目 2
+    var lastSendType;  //保存上次发送的发送类型
+    $("#resources_list").mousedown(function(e) {
+        //如果是右键的话
+        if (3 == e.which) {
+            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();
-		document.oncontextmenu = function() {return true;}
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
         //如果当前行为空，那么要将当前行的拿到
-         var ele;
-         if(line == null){
-             ele = document.elementFromPoint(e.clientX, e.clientY);
+        var ele;
+        if(line == null){
+            ele = document.elementFromPoint(e.clientX, e.clientY);
             line = $(ele).parent();
             //如果是在li上点击事件，那么要获得父组件
             if(line.get(0).tagName === 'LI'){
@@ -208,322 +209,322 @@ $(document.body).click(function(e) {
 
         }
         //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
-        if( contains($(".resourcesList").get(0),line.get(0))){
+        if( contains($("#resources_list").get(0),line.get(0))){
             line.children().css("background-color", 'white');
         }
 
         //当前行恢复编辑状态到链接状态
-       if(ele && ele.nodeName != 'INPUT') {
-           restore();
-       }
+        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);
+    });
+    //只要有一个选中了就是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(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 === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
+            });
+        }
+    }
+
+    function batch_send(){
+        if($("#resources_list_form").serialize() == ""){
+            alert('暂时不支持多页选择，您当前页没有选择任何资源');
+            return ;
+        }
+        if (lastSendType === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
+            });
+        }
+    }
+
+    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('<%= form_tag(url_for(:controller => 'users',:action => 'rename_resource',:method => 'post',:remote=>true,:id=>@user.id),:id=>"res_name_form" ) do%>' +
+                    '<input name="res_name" id="res_name" ' +
+                    'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
+                    'value="'+res_name+
+                    '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>'+
+                    '<% end %>');
+            $("#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)){
+                    $.post(
+                            '<%=rename_resource_user_path(@user) %>',
+                                    "res_name="+$('#res_name').val()+"&res_id="+$("#res_id").val(),
+                            function (data){
+                                if(data != 'fail'){//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                    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置空
+                                }
+                            },
+                            'text'
+                    );
+                }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(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('您无法删除此资源！')
+        }
+    }
+
+    //id 发送的id
+    //发送的id数组
+    function chooseSendType(res_id,res_ids){
+
+        sendType = $(".resourcesSendType").val();
+        if (sendType === lastSendType) {
+            return;
+        } else if (lastSendType != null) { //不是第一次点击的时候
+            if(res_ids == "") {//如果是单个发送
+                if (sendType === '1') {
+                    $.ajax({
+                        type: 'get',
+                        url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
+                    });
+                } else {
+                    $.ajax({
+                        type: 'get',
+                        url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
+                    });
+                }
+            }else{//如果是多个发送
+                if (sendType === '1'){
+                    $.ajax({
+                        type: 'get',
+                        url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
+                    });
+                }else{
+                    $.ajax({
+                        type: 'get',
+                        url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
+                    });
+                }
+            }
+        }
+
+        lastSendType = sendType;
     }
-    $("#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(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 === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-          $.ajax({
-              type: 'get',
-              url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
-          });
-      }else{
-          $.ajax({
-              type: 'get',
-              url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
-          });
-      }
-  }
-
-  function batch_send(){
-      if($("#resources_list_form").serialize() == ""){
-          alert('暂时不支持多页选择，您当前页没有选择任何资源');
-          return ;
-      }
-      if (lastSendType === '1'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-          $.ajax({
-              type: 'get',
-              url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
-          });
-      }else{
-          $.ajax({
-              type: 'get',
-              url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
-          });
-      }
-  }
-
-  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('<%= form_tag(url_for(:controller => 'users',:action => 'rename_resource',:method => 'post',:remote=>true,:id=>@user.id),:id=>"res_name_form" ) do%>' +
-                  '<input name="res_name" id="res_name" ' +
-                  'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
-                  'value="'+res_name+
-                  '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>'+
-                  '<% end %>');
-          $("#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)){
-                  $.post(
-                          '<%=rename_resource_user_path(@user) %>',
-                          "res_name="+$('#res_name').val()+"&res_id="+$("#res_id").val(),
-                          function (data){
-                              if(data != 'fail'){//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
-                                  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置空
-                              }
-                          },
-                          'text'
-                  );
-              }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(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('您无法删除此资源！')
-      }
-  }
-
-  //id 发送的id
-  //发送的id数组
-  function chooseSendType(res_id,res_ids){
-
-          sendType = $(".resourcesSendType").val();
-          if (sendType === lastSendType) {
-              return;
-          } else if (lastSendType != null) { //不是第一次点击的时候
-              if(res_ids == "") {//如果是单个发送
-                  if (sendType === '1') {
-                      $.ajax({
-                          type: 'get',
-                          url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
-                      });
-                  } else {
-                      $.ajax({
-                          type: 'get',
-                          url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
-                      });
-                  }
-              }else{//如果是多个发送
-                  if (sendType === '1'){
-                      $.ajax({
-                          type: 'get',
-                          url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
-                      });
-                  }else{
-                      $.ajax({
-                          type: 'get',
-                          url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
-                      });
-                  }
-              }
-          }
-
-      lastSendType = sendType;
-  }
-//  var iWidth = document.documentElement.clientWidth;
-//  var iHeight = document.documentElement.clientHeight;
-//  var moveX = 0;
-//  var moveY = 0;
-//  var moveTop = 0;
-//  var moveLeft = 0;
-//  var moveable = false;
-//  var docMouseMoveEvent = document.onmousemove;
-//  var docMouseUpEvent = document.onmouseup;
-//  $("#upload_box").mousedown(function() {
-//      var evt = getEvent();
-//      moveable = true;
-//      moveX = evt.clientX;
-//      moveY = evt.clientY;
-//
-//      moveTop = parseInt($("#upload_box").css('top'));
-//      moveLeft = parseInt($("#upload_box").css('left'));
-//
-//      $(document).mousemove( function() {
-//          if (moveable) {
-//              var evt = getEvent();
-//              var x = moveLeft + evt.clientX - moveX;
-//              var y = moveTop + evt.clientY - moveY;
-//              if ( x > 0 &&( x + 322 < iWidth) && y > 0 && (y + 257 < iHeight) ) {
-//                  $("#upload_box").css('left',  x + "px");
-//                  $("#upload_box").css('top', y + "px");
-//                  console.log( moveX)
-//                  console.log( moveY)
-//              }
-//          }
-//      });
-//      $(document).mouseup (function () {
-//          if (moveable) {
-//              document.onmousemove = docMouseMoveEvent;
-//              document.onmouseup = docMouseUpEvent;
-//              moveable = false;
-//              moveX = 0;
-//              moveY = 0;
-//              moveTop = 0;
-//              moveLeft = 0;
-//          }
-//      });
-//  });
-//
-//  // 获得事件Event对象，用于兼容IE和FireFox
-//  function getEvent() {
-//      return window.event || arguments.callee.caller.arguments[0];
-//  }
+    //  var iWidth = document.documentElement.clientWidth;
+    //  var iHeight = document.documentElement.clientHeight;
+    //  var moveX = 0;
+    //  var moveY = 0;
+    //  var moveTop = 0;
+    //  var moveLeft = 0;
+    //  var moveable = false;
+    //  var docMouseMoveEvent = document.onmousemove;
+    //  var docMouseUpEvent = document.onmouseup;
+    //  $("#upload_box").mousedown(function() {
+    //      var evt = getEvent();
+    //      moveable = true;
+    //      moveX = evt.clientX;
+    //      moveY = evt.clientY;
+    //
+    //      moveTop = parseInt($("#upload_box").css('top'));
+    //      moveLeft = parseInt($("#upload_box").css('left'));
+    //
+    //      $(document).mousemove( function() {
+    //          if (moveable) {
+    //              var evt = getEvent();
+    //              var x = moveLeft + evt.clientX - moveX;
+    //              var y = moveTop + evt.clientY - moveY;
+    //              if ( x > 0 &&( x + 322 < iWidth) && y > 0 && (y + 257 < iHeight) ) {
+    //                  $("#upload_box").css('left',  x + "px");
+    //                  $("#upload_box").css('top', y + "px");
+    //                  console.log( moveX)
+    //                  console.log( moveY)
+    //              }
+    //          }
+    //      });
+    //      $(document).mouseup (function () {
+    //          if (moveable) {
+    //              document.onmousemove = docMouseMoveEvent;
+    //              document.onmouseup = docMouseUpEvent;
+    //              moveable = false;
+    //              moveX = 0;
+    //              moveY = 0;
+    //              moveTop = 0;
+    //              moveLeft = 0;
+    //          }
+    //      });
+    //  });
+    //
+    //  // 获得事件Event对象，用于兼容IE和FireFox
+    //  function getEvent() {
+    //      return window.event || arguments.callee.caller.arguments[0];
+    //  }
 
 </script>
 

app/views/users/user_resource_type.js.erb

@@ -0,0 +1,2 @@
+$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'resources_list',:locals=>{:attachments => @attachments})%>');
+$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');

app/views/users/user_select_homework.js.erb

@@ -5,3 +5,4 @@ $("#homework_end_time").val("<%= @homework.end_time%>");
 $("#course_id").val("<%= @homework.course_id%>");
 $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework })%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
+$("#homework_editor").show();

config/configuration.yml

@@ -199,9 +199,12 @@ default:
 
   repository_root_path: '/tmp/htdocs'
 
+  judge_server: 'http://judge.trustie.net/'
+
 # specific configuration options for production environment
 # that overrides the default ones
 production:
+  judge_server: 'http://192.168.80.21:8080/'
   repository_root_path: '/home/pdl/redmine-2.3.2-0/apache2/htdocs'
   cookie_domain: ".trustie.net"
   rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf

config/locales/zh.yml

@@ -2075,7 +2075,8 @@ zh:
   label_contact_us: 联系我们
   label_recruitment_information: 招聘信息
   label_surpport_group: 帮助中心
-  label_forums: 论坛反馈
+  #label_forums: 论坛反馈
+  label_forums: 贴吧交流
   label_language: 语言
   label_license: 湘ICP备09019772
 

config/routes.rb

@@ -120,6 +120,7 @@ RedmineApp::Application.routes.draw do
       get 'absence_penalty_list'
       get 'evaluation_list'
       post 'set_program_score'
+      post 'program_test'
     end
   end
 
@@ -171,7 +172,7 @@ RedmineApp::Application.routes.draw do
   resources :contests, only: [:index] do
     resources :contestnotifications do
       # get 'preview', on: :collection
-      resources :notificationcomments 
+      resources :notificationcomments
     end
 
     collection do
@@ -232,7 +233,7 @@ RedmineApp::Application.routes.draw do
       end
     end
   end
-  
+
 
   resources :shares
 
@@ -263,6 +264,7 @@ RedmineApp::Application.routes.draw do
   match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
   match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
   match 'agreement',:to => 'account#agreement',:as => 'agreement',:via=>[:get]
+  match 'about_us',:to=>'account#about_us',:as=>'about_us',:via=>[:get]
   match 'account/register', :via => [:get, :post], :as => 'register'
   match 'account/lost_password',  :via => [:get, :post], :as => 'lost_password'
   match 'account/activate',  :via => :get
@@ -309,8 +311,11 @@ RedmineApp::Application.routes.draw do
     collection do
       match "tag_saveEx" , :via =>  [:get, :post]
       post "user_new_homework"
+      get  'new_user_commit_homework'
+      post "user_commit_homework"
       post 'user_select_homework'
     end
+
     member do
       match 'user_projects_index', :to => 'users#user_projects_index', :via => :get
       match 'user_projects', :to => 'users#user_projects',  :via => :get
@@ -365,7 +370,10 @@ RedmineApp::Application.routes.draw do
       get 'resource_preview'
       post 'rename_resource'
       get 'search_user_project'
-    # end
+      get 'user_resource_type'
+      get 'user_ref_resource_search'
+      post 'import_resources_to_homework'
+      # end
     end
   end
   match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "feedback"
@@ -479,7 +487,7 @@ RedmineApp::Application.routes.draw do
       collection do
         match "getattachtype" , :via =>  [:get, :post]
         match "search_project",:via => [:post,:get]
-      #match 'getattachtype/:attachtype', :to => 'files#getattachtype', :via =>  [:get, :post]
+        #match 'getattachtype/:attachtype', :to => 'files#getattachtype', :via =>  [:get, :post]
       end
     end
 
@@ -509,7 +517,7 @@ RedmineApp::Application.routes.draw do
     resources :repositories, :except => [:index, :show] do
       member do
         get 'newrepo', :via => [:get, :post]
-      # get 'create', :via=>[:get, :post]
+        # get 'create', :via=>[:get, :post]
       end
     end
     match 'wiki/index',  :via => :get
@@ -540,6 +548,9 @@ RedmineApp::Application.routes.draw do
       match 'bulk_edit', :via => [:get, :post]
       post 'bulk_update'
     end
+    member do
+      post 'add_journal'
+    end
     resources :time_entries, :controller => 'timelog' do
       collection do
         get 'report'
@@ -596,8 +607,8 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-        :action => /(browse|show|entry|raw|annotate|diff)/,
-        :rev    => /[a-z0-9\.\-_]+/
+          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :rev    => /[a-z0-9\.\-_]+/
       }
 
   get 'projects/:id/repository/statistics', :to => 'repositories#stats'
@@ -614,8 +625,8 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-        :action => /(browse|show|entry|raw|annotate|diff)/,
-        :rev    => /[a-z0-9\.\-_]+/
+          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :rev    => /[a-z0-9\.\-_]+/
       }
   get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
       :controller => 'repositories',
@@ -718,7 +729,7 @@ RedmineApp::Application.routes.draw do
       get 'test_connection', :as => 'try_connection'
     end
     collection do
-        get 'autocomplete_for_new_user'
+      get 'autocomplete_for_new_user'
     end
   end
 
@@ -780,7 +791,7 @@ RedmineApp::Application.routes.draw do
       collection do
         match 'chang_read_flag', :via => :get
       end
-     end
+    end
 
   end   # end of resources :courses
   match 'courses/:id/feedback', :to => 'courses#feedback',  :via => :get, :as => 'course_feedback'

db/migrate/20150828011415_change_student_work_tests.rb

@@ -0,0 +1,13 @@
+class ChangeStudentWorkTests < ActiveRecord::Migration
+
+  def change
+    change_table :student_work_tests do |t|
+        t.remove :error_msg
+        t.remove :result
+        t.remove :homework_test_id
+        t.integer :status, default: 9
+        t.text :results
+    end
+  end
+
+end

db/migrate/20150828155329_add_src_to_student_work_tests.rb

@@ -0,0 +1,5 @@
+class AddSrcToStudentWorkTests < ActiveRecord::Migration
+  def change
+    add_column :student_work_tests, :src, :text
+  end
+end

public/javascripts/application.js

@@ -99,13 +99,13 @@ function initFilters(){
   $('#filters-table td.field input[type=checkbox]').each(function(){
     toggleFilter($(this).val());
   });
-  $('#filters-table td.field input[type=checkbox]').live('click',function(){
+  $('#filters-table td.field input[type=checkbox]').on('click',function(){
     toggleFilter($(this).val());
   });
-  $('#filters-table .toggle-multiselect').live('click',function(){
+  $('#filters-table .toggle-multiselect').on('click',function(){
     toggleMultiSelect($(this).siblings('select'));
   });
-  $('#filters-table input[type=text]').live('keypress', function(e){
+  $('#filters-table input[type=text]').on('keypress', function(e){
     if (e.keyCode == 13) submit_query_form("query_form");
   });
 }

public/javascripts/baiduTemplate.js

@@ -0,0 +1,216 @@
+/**
+ * baiduTemplate简单好用的Javascript模板引擎 1.0.6 版本
+ * http://baidufe.github.com/BaiduTemplate
+ * 开源协议：BSD License
+ * 浏览器环境占用命名空间 baidu.template ，nodejs环境直接安装 npm install baidutemplate
+ * @param str{String} dom结点ID，或者模板string
+ * @param data{Object} 需要渲染的json对象，可以为空。当data为{}时，仍然返回html。
+ * @return 如果无data，直接返回编译后的函数；如果有data，返回html。
+ * @author wangxiao 
+ * @email 1988wangxiao@gmail.com
+*/
+
+;(function(window){
+
+    //取得浏览器环境的baidu命名空间，非浏览器环境符合commonjs规范exports出去
+    //修正在nodejs环境下，采用baidu.template变量名
+    var baidu = typeof module === 'undefined' ? (window.baidu = window.baidu || {}) : module.exports;
+
+    //模板函数（放置于baidu.template命名空间下）
+    baidu.template = function(str, data){
+
+        //检查是否有该id的元素存在，如果有元素则获取元素的innerHTML/value，否则认为字符串为模板
+        var fn = (function(){
+
+            //判断如果没有document，则为非浏览器环境
+            if(!window.document){
+                return bt._compile(str);
+            };
+
+            //HTML5规定ID可以由任何不包含空格字符的字符串组成
+            var element = document.getElementById(str);
+            if (element) {
+                    
+                //取到对应id的dom，缓存其编译后的HTML模板函数
+                if (bt.cache[str]) {
+                    return bt.cache[str];
+                };
+
+                //textarea或input则取value，其它情况取innerHTML
+                var html = /^(textarea|input)$/i.test(element.nodeName) ? element.value : element.innerHTML;
+                return bt._compile(html);
+
+            }else{
+
+                //是模板字符串，则生成一个函数
+                //如果直接传入字符串作为模板，则可能变化过多，因此不考虑缓存
+                return bt._compile(str);
+            };
+
+        })();
+
+        //有数据则返回HTML字符串，没有数据则返回函数 支持data={}的情况
+        var result = bt._isObject(data) ? fn( data ) : fn;
+        fn = null;
+
+        return result;
+    };
+
+    //取得命名空间 baidu.template
+    var bt = baidu.template;
+
+    //标记当前版本
+    bt.versions = bt.versions || [];
+    bt.versions.push('1.0.6');
+
+    //缓存  将对应id模板生成的函数缓存下来。
+    bt.cache = {};
+    
+    //自定义分隔符，可以含有正则中的字符，可以是HTML注释开头 <! !>
+    bt.LEFT_DELIMITER = bt.LEFT_DELIMITER||'<%';
+    bt.RIGHT_DELIMITER = bt.RIGHT_DELIMITER||'%>';
+
+    //自定义默认是否转义，默认为默认自动转义
+    bt.ESCAPE = true;
+
+    //HTML转义
+    bt._encodeHTML = function (source) {
+        return String(source)
+            .replace(/&/g,'&amp;')
+            .replace(/</g,'&lt;')
+            .replace(/>/g,'&gt;')
+            .replace(/\\/g,'&#92;')
+            .replace(/"/g,'&quot;')
+            .replace(/'/g,'&#39;');
+    };
+
+    //转义影响正则的字符
+    bt._encodeReg = function (source) {
+        return String(source).replace(/([.*+?^=!:${}()|[\]/\\])/g,'\\$1');
+    };
+
+    //转义UI UI变量使用在HTML页面标签onclick等事件函数参数中
+    bt._encodeEventHTML = function (source) {
+        return String(source)
+            .replace(/&/g,'&amp;')
+            .replace(/</g,'&lt;')
+            .replace(/>/g,'&gt;')
+            .replace(/"/g,'&quot;')
+            .replace(/'/g,'&#39;')
+            .replace(/\\\\/g,'\\')
+            .replace(/\\\//g,'\/')
+            .replace(/\\n/g,'\n')
+            .replace(/\\r/g,'\r');
+    };
+
+    //将字符串拼接生成函数，即编译过程(compile)
+    bt._compile = function(str){
+        var funBody = "var _template_fun_array=[];\nvar fn=(function(__data__){\nvar _template_varName='';\nfor(name in __data__){\n_template_varName+=('var '+name+'=__data__[\"'+name+'\"];');\n};\neval(_template_varName);\n_template_fun_array.push('"+bt._analysisStr(str)+"');\n_template_varName=null;\n})(_template_object);\nfn = null;\nreturn _template_fun_array.join('');\n";
+        return new Function("_template_object",funBody);
+    };
+
+    //判断是否是Object类型
+    bt._isObject = function (source) {
+        return 'function' === typeof source || !!(source && 'object' === typeof source);
+    };
+
+    //解析模板字符串
+    bt._analysisStr = function(str){
+
+        //取得分隔符
+        var _left_ = bt.LEFT_DELIMITER;
+        var _right_ = bt.RIGHT_DELIMITER;
+
+        //对分隔符进行转义，支持正则中的元字符，可以是HTML注释 <!  !>
+        var _left = bt._encodeReg(_left_);
+        var _right = bt._encodeReg(_right_);
+
+        str = String(str)
+            
+            //去掉分隔符中js注释
+            .replace(new RegExp("("+_left+"[^"+_right+"]*)//.*\n","g"), "$1")
+
+            //去掉注释内容  <%* 这里可以任意的注释 *%>
+            //默认支持HTML注释，将HTML注释匹配掉的原因是用户有可能用 <! !>来做分割符
+            .replace(new RegExp("<!--.*?-->", "g"),"")
+            .replace(new RegExp(_left+"\\*.*?\\*"+_right, "g"),"")
+
+            //把所有换行去掉  \r回车符 \t制表符 \n换行符
+            .replace(new RegExp("[\\r\\t\\n]","g"), "")
+
+            //用来处理非分隔符内部的内容中含有 斜杠 \ 单引号 ‘ ，处理办法为HTML转义
+            .replace(new RegExp(_left+"(?:(?!"+_right+")[\\s\\S])*"+_right+"|((?:(?!"+_left+")[\\s\\S])+)","g"),function (item, $1) {
+                var str = '';
+                if($1){
+
+                    //将 斜杠 单引 HTML转义
+                    str = $1.replace(/\\/g,"&#92;").replace(/'/g,'&#39;');
+                    while(/<[^<]*?&#39;[^<]*?>/g.test(str)){
+
+                        //将标签内的单引号转义为\r  结合最后一步，替换为\'
+                        str = str.replace(/(<[^<]*?)&#39;([^<]*?>)/g,'$1\r$2')
+                    };
+                }else{
+                    str = item;
+                }
+                return str ;
+            });
+
+
+        str = str 
+            //定义变量，如果没有分号，需要容错  <%var val='test'%>
+            .replace(new RegExp("("+_left+"[\\s]*?var[\\s]*?.*?[\\s]*?[^;])[\\s]*?"+_right,"g"),"$1;"+_right_)
+
+            //对变量后面的分号做容错(包括转义模式 如<%:h=value%>)  <%=value;%> 排除掉函数的情况 <%fun1();%> 排除定义变量情况  <%var val='test';%>
+            .replace(new RegExp("("+_left+":?[hvu]?[\\s]*?=[\\s]*?[^;|"+_right+"]*?);[\\s]*?"+_right,"g"),"$1"+_right_)
+
+            //按照 <% 分割为一个个数组，再用 \t 和在一起，相当于将 <% 替换为 \t
+            //将模板按照<%分为一段一段的，再在每段的结尾加入 \t,即用 \t 将每个模板片段前面分隔开
+            .split(_left_).join("\t");
+
+        //支持用户配置默认是否自动转义
+        if(bt.ESCAPE){
+            str = str
+
+                //找到 \t=任意一个字符%> 替换为 ‘，任意字符,'
+                //即替换简单变量  \t=data%> 替换为 ',data,'
+                //默认HTML转义  也支持HTML转义写法<%:h=value%>  
+                .replace(new RegExp("\\t=(.*?)"+_right,"g"),"',typeof($1) === 'undefined'?'':baidu.template._encodeHTML($1),'");
+        }else{
+            str = str
+                
+                //默认不转义HTML转义
+                .replace(new RegExp("\\t=(.*?)"+_right,"g"),"',typeof($1) === 'undefined'?'':$1,'");
+        };
+
+        str = str
+
+            //支持HTML转义写法<%:h=value%>  
+            .replace(new RegExp("\\t:h=(.*?)"+_right,"g"),"',typeof($1) === 'undefined'?'':baidu.template._encodeHTML($1),'")
+
+            //支持不转义写法 <%:=value%>和<%-value%>
+            .replace(new RegExp("\\t(?::=|-)(.*?)"+_right,"g"),"',typeof($1)==='undefined'?'':$1,'")
+
+            //支持url转义 <%:u=value%>
+            .replace(new RegExp("\\t:u=(.*?)"+_right,"g"),"',typeof($1)==='undefined'?'':encodeURIComponent($1),'")
+
+            //支持UI 变量使用在HTML页面标签onclick等事件函数参数中  <%:v=value%>
+            .replace(new RegExp("\\t:v=(.*?)"+_right,"g"),"',typeof($1)==='undefined'?'':baidu.template._encodeEventHTML($1),'")
+
+            //将字符串按照 \t 分成为数组，在用'); 将其合并，即替换掉结尾的 \t 为 ');
+            //在if，for等语句前面加上 '); ，形成 ');if  ');for  的形式
+            .split("\t").join("');")
+
+            //将 %> 替换为_template_fun_array.push('
+            //即去掉结尾符，生成函数中的push方法
+            //如：if(list.length=5){%><h2>',list[4],'</h2>');}
+            //会被替换为 if(list.length=5){_template_fun_array.push('<h2>',list[4],'</h2>');}
+            .split(_right_).join("_template_fun_array.push('")
+
+            //将 \r 替换为 \
+            .split("\r").join("\\'");
+
+        return str;
+    };
+
+})(window);

public/javascripts/homework.js

@@ -0,0 +1,133 @@
+$(function(){
+//提交作业
+    
+    var bt=baidu.template;
+    bt.LEFT_DELIMITER='<!';
+    bt.RIGHT_DELIMITER='!>';
+
+    var tested = false;
+    var valid_form = function() {
+        var src = $('#program-src').val();
+        var title = $('#program-title').val();
+
+        if (!src) {
+            alert('请输入正确的代码');
+            return false;
+        }
+        if (!title) {
+            alert('请输入标题');
+            return false;
+        }
+        return true;
+    }
+
+    var test_program = function(cb){
+        var homework_id = $('#test-program-btn').attr('data-homework-id');
+        var student_work_id = $('#test-program-btn').attr('data-student-work-id');
+        var src = $('#program-src').val();
+        var title = $('#program-title').val();
+
+        if(!valid_form()){
+            return;
+        }
+
+        $.post(
+            '/student_work/program_test',
+            {homework: homework_id, student_work_id: student_work_id, src: src, title: title},
+            function(data,status){
+                tested = true;
+                console.log(data);
+
+                if (typeof cb == 'function') {cb(); return;}
+
+                
+                var html=bt('t:result-list',data);
+                $('.ProResult').prepend(html);
+
+                if (data.status==0) {
+                    var r=confirm("答题正确，是否立刻提交?");
+                    if (r) {
+                        $(".HomeWorkCon form").submit();
+                    }
+                }
+            }
+        );
+    };
+
+    $('#test-program-btn').on('click', test_program);
+
+
+    $('#commit-program-work-btn').on('click', function(){
+        if(!valid_form()){
+            return;
+        }
+        if($('.ProResult .ProResultTop').length<=0){
+            var r=confirm("测试后才能提交，是否立刻测试?");
+            if (r) {
+                test_program();
+            }
+            return;
+        }
+
+        if (!tested) {
+            test_program(function(){
+                $(".HomeWorkCon form").submit();                
+            });
+            return;
+        }
+
+        $(".HomeWorkCon form").submit();
+    });
+
+    $('form.edit_student_work').on('keydown', '#program-src', function(){
+        tested = false;
+    });
+
+
+//发布作业
+    var isProgramHomework = function(){
+        return !$(".advanced_option").is(":hidden");
+    }
+
+    var submit_comm_homework = function(id){
+        var valid = true;
+        if (isProgramHomework()) {
+            $.each($('.advanced_option textarea.InputBox'), function(i, val){
+                if ($(val).val().length<=0) {
+                    $(val).focus();
+                    valid = false;
+                    return false;
+                }
+            });
+            if (valid) {
+                $('input[name=homework_type]').val(2);
+            };
+        }
+        if (valid) {
+            submit_homework(id);    
+        }
+    }
+    window.submit_comm_homework = submit_comm_homework;
+
+    var datepickerOptions={dateFormat:'yy-mm-dd',firstDay:0,showWeek:true,showOtherMonths:true,selectOtherMonths:true};
+
+    $('input.date-input').datepicker(datepickerOptions);
+
+    $('a.pic_date').on('click', function(){
+        $(this).parent().prev().first().focus();
+    })
+    
+
+    $('a.DropBtn').on('click', function(){
+        $(".advanced_option").toggle();
+    });
+
+    $(".HomeWork").on('click', 'a.icon_add', function(){
+        var html = bt('t:test-answer-list', null);
+        $(this).parent('.mt10').after(html);
+
+    });
+    $(".HomeWork").on('click', 'a.icon_remove', function(){
+        $(this).parent('.mt10').remove();
+    });
+});

public/javascripts/init_KindEditor.js

@@ -0,0 +1,100 @@
+function init_editor(params){
+    var editor = params.kindutil.create(params.textarea, {
+        resizeType : 1,minWidth:"1px",width:"100%",height:"80px",
+        items:['emoticons'],
+        afterChange:function(){//按键事件
+            nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+        },
+        afterCreate:function(){
+            var toolbar = $("div[class='ke-toolbar']",params.div_form);
+            $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+            params.toolbar_container.append(toolbar);
+        }
+    }).loadPlugin('paste');
+    return editor;
+}
+
+function nh_check_field(params){
+    var result=true;
+    if(params.content!=undefined){
+        if(params.content.isEmpty()){
+            result=false;
+        }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            params.textarea.html(params.content.html());
+            params.content.sync();
+            if(params.content.isEmpty()){
+                params.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
+    }
+    return result;
+}
+function init_form(params){
+    params.form.submit(function(){
+        var flag = false;
+        if(params.form.attr('data-remote') != undefined ){
+            flag = true
+        }
+        var is_checked = nh_check_field({
+            issubmit:true,
+            content:params.editor,
+            contentmsg:params.contentmsg,
+            textarea:params.textarea
+        });
+        if(is_checked){
+            if(flag){
+                return true;
+            }else{
+                $(this)[0].submit();
+                return false;
+            }
+        }
+        return false;
+    });
+}
+function nh_reset_form(params){
+    params.form[0].reset();
+    params.textarea.empty();
+    if(params.editor != undefined){
+        params.editor.html(params.textarea.html());
+    }
+    params.contentmsg.hide();
+}
+
+function init_KindEditor_data(id){
+    KindEditor.ready(function (K) {
+        $("div[nhname='new_message_" + id + "']").each(function () {
+            var params = {};
+            params.kindutil = K;
+            params.div_form = $(this);
+            params.form = $("form", params.div_form);
+            if (params.form == undefined || params.form.length == 0) {
+                return;
+            }
+            params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
+            params.contentmsg = $("p[nhname='contentmsg_" + id + "']", params.div_form);
+            params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
+            params.cancel_btn = $("#new_message_cancel_btn_" + id);
+            params.submit_btn = $("#new_message_submit_btn_" + id);
+
+            if (params.textarea.data('init') == undefined) {
+                params.editor = init_editor(params);
+                init_form(params);
+                params.cancel_btn.click(function () {
+                    nh_reset_form(params);
+                });
+                params.submit_btn.click(function () {
+                    params.form.submit();
+                });
+                params.textarea.data('init', 1);
+                $(this).show();
+            }
+        });
+    });
+}

public/javascripts/jQuery.autoMail.js

@@ -131,13 +131,13 @@
             });
             //鼠标经过列表项事件
             //鼠标经过
-            $(".mailHover").live("mouseover", function(){
+            $(".mailHover").on("mouseover", function(){
                 index = Number($(this).attr("id").split("_")[1]);
                 liveValue = $("#mailList_"+index).text();
                 x.children("." + cf).removeClass(cf).addClass(cl);
                 $(this).addClass(cf).removeClass(cl);
             });
-            $(".mailHover").live("click", function(){
+            $(".mailHover").on("click", function(){
                 $("#mail").val($(this).html());
             });
 

public/javascripts/new_user.js

@@ -4,10 +4,10 @@ $(function(){
     $("#users_setting").css("min-height",$("#LSide").height()-100);
 
     //头像相关
-    $("#homepage_portrait_image").live("mouseover",function(){
+    $("#homepage_portrait_image").on("mouseover",function(){
         $("#edit_user_file_btn").show();
         $("#watch_user_btn").show();
-    }).live("mouseout",function(){
+    }).on("mouseout",function(){
         $("#edit_user_file_btn").hide();
         $("#watch_user_btn").hide();
     });

public/javascripts/project.js

@@ -460,7 +460,7 @@ $(function(){
         cookiesave(personalized_expand_key,JSON.stringify(personalized_map));
         target.toggle(timeout);
     }
-    $("*[nhtype='toggle4cookie']").live('click',function(){
+    $("*[nhtype='toggle4cookie']").on('click',function(){
         personalized_click($(this),500);
     });
 

public/javascripts/user.js

@@ -1,76 +1,7 @@
 //个人动态
 $(function(){
-    function init_editor(params){
-        var editor = params.kindutil.create(params.textarea, {
-            resizeType : 1,minWidth:"1px",width:"100%",height:"80px",
-            items:['emoticons'],
-            afterChange:function(){//按键事件
-                nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-            },
-            afterCreate:function(){
-                var toolbar = $("div[class='ke-toolbar']",params.div_form);
-                $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
-                params.toolbar_container.append(toolbar);
-            }
-        }).loadPlugin('paste');
-        return editor;
-    }
-
-    function nh_check_field(params){
-        var result=true;
-        if(params.content!=undefined){
-            if(params.content.isEmpty()){
-                result=false;
-            }
-            if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-                params.textarea.html(params.content.html());
-                params.content.sync();
-                if(params.content.isEmpty()){
-                    params.contentmsg.html('内容不能为空');
-                    params.contentmsg.css({color:'#ff0000'});
-                }else{
-                    params.contentmsg.html('填写正确');
-                    params.contentmsg.css({color:'#008000'});
-                }
-                params.contentmsg.show();
-            }
-        }
-        return result;
-    }
-    function init_form(params){
-        params.form.submit(function(){
-            var flag = false;
-            if(params.form.attr('data-remote') != undefined ){
-                flag = true
-            }
-            var is_checked = nh_check_field({
-                issubmit:true,
-                content:params.editor,
-                contentmsg:params.contentmsg,
-                textarea:params.textarea
-            });
-            if(is_checked){
-                if(flag){
-                    return true;
-                }else{
-                    $(this)[0].submit();
-                    return false;
-                }
-            }
-            return false;
-        });
-    }
-    function nh_reset_form(params){
-        params.form[0].reset();
-        params.textarea.empty();
-        if(params.editor != undefined){
-            params.editor.html(params.textarea.html());
-        }
-        params.contentmsg.hide();
-    }
-
     KindEditor.ready(function(K){
-        $("a[nhname='reply_btn']").live('click',function(){
+        $("a[nhname='reply_btn']").on('click',function(){
             var params = {};
             params.kindutil = K;
             params.container = $(this).parent().parent('div');
@@ -104,7 +35,7 @@ $(function(){
             },300);
         });
 
-        $("a[nhname='sub_reply_btn']").live('click',function(){
+        $("a[nhname='sub_reply_btn']").on('click',function(){
             var params = {};
             params.kindutil = K;
             params.container = $(this).parent().parent('div');
@@ -167,110 +98,4 @@ $(function(){
         });
     });
 });
-function init_list_more_div(params){
-    var p=params;
-    p.exbtn.click(function(){
-        var isclose = p.container.data('isclose');
-        var hasmore = p.container.data('hasmore');
-        if(isclose == '1'){
-            $("div[nhname='rec']",p.container).show();
-            p.container.data('isclose','0');
-            change_status_4_list_more_div(params);
-            return;
-        }
-        if(hasmore == '0'){
-            change_status_4_list_more_div(params,'get');
-            return;
-        }
-        var url = p.container.data('url');
-        if($("div[nhname='rec']",p.container).length > 0){
-            var lastid = $("div[nhname='rec']",p.container).filter(':last').data('id');
-            url += "?lastid="+lastid;
-            var lasttime = $("div[nhname='rec']",p.container).filter(':last').data('time');
-            if(lasttime != undefined){
-                url += "&lasttime="+lasttime;
-            }
-        }
-        $.ajax( {url:url,dataType:'text',success:function(data){
-            var html = $("<div>"+data+"</div>");
-            var lens = $("div[nhname='rec']",html).length;
-            if(lens < p.size){
-                p.container.data('hasmore','0');
-            }
-            if(lens>0){
-                var currpage = parseInt(p.container.data('currpage'))+1;
-                p.container.data('currpage',currpage);
-                p.container.append(html.html())
-            }
-            change_status_4_list_more_div(params,'get');
-            p.div.show();
-        }} );
-    });
-    p.clbtn.click(function(){
-        var i=0;
-        $("div[nhname='rec']",p.container).each(function(){
-            i++;
-            if(i> p.size){
-                $(this).hide();
-            }
-        });
-        p.container.data('isclose','1');
-        change_status_4_list_more_div(params);
-    });
-    p.exbtn.click();
-}
-function change_status_4_list_more_div(params,opt){
-    var p=params;
-    if($("div[nhname='rec']",p.container).length == 0 && opt != 'get'){
-        p.exbtn.click();
-        return;
-    }
-    var show_lens = $("div[nhname='rec']",p.container).length - $("div[nhname='rec']",p.container).filter(':hidden').length;
-    if( show_lens > p.size ){
-        p.clbtn.show();
-    }else{
-        p.clbtn.hide();
-    }
-    if($("div[nhname='rec']",p.container).length == 0){
-        p.exbtn.html(p.nodatamsg);
-    }else if( p.container.data('hasmore') == '1' || p.container.data('isclose')=='1' ){
-        p.exbtn.html('点击展开更多');
-    }else{
-        p.exbtn.html('没有更多了');
-    }
-}
-function init_list_more_div_params(div){
-    var params = {};
-    params.div = div;
-    params.container = $("div[nhname='container']",div);
-    params.exbtn = $("a[nhname='expand']",div);
-    params.clbtn = $("a[nhname='close']",div);
-    params.size = params.container.data('pagesize');
-    params.nodatamsg = params.container.data('nodatamsg');
-    if( params.size == undefined ){
-        params.size = 13;
-    }
-    return params;
-}
-$(function(){
-    $("div[nhname='list_more_div']").each(function(){
-        var params = init_list_more_div_params($(this));
-        init_list_more_div(params)
-    });
-});
-
-$(function(){
-    $(".newsType").mouseover(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
-    });
-    $(".newsType").mouseout(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
-    });
-    $(".resourcesSelected").mouseover(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
-    });
-    $(".resourcesSelected").mouseout(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
-    });
-});
 //个人动态 end

public/stylesheets/courses.css

@@ -1,3 +1,5 @@
+a.linkBlue {color:#269ac9;}
+a.linkBlue:hover {color:#297fb8;}
 
 /*右侧内容--动态*/
 .project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;}
@@ -78,8 +80,8 @@ a:hover.talk_btn{ background:#2a9dc1;}
 /****讨论区内页***/
 .mt0{ margin-top:0px;}
 .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;}
-a.talk_edit{ color:#426e9a; margin-right:5px;}
-a:hover.talk_edit{ color:#ff5722;}
+a.talk_edit{ color:#269ac9; margin-right:5px;}
+a:hover.talk_edit{ color:#297fb8;}
 .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;}
 .talkpage_text{  border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px; background:#fff;}
 /****新建讨论***/
@@ -126,7 +128,7 @@ a.re_de{ color:#6883b6; margin-left:15px;}
 /* 作业列表 */
 .ttl{ }
 .ctt{clear:both; }
-#contentbox{float:right;clear:both;width:730px;/*滑动门的宽度*/}
+#contentbox{float:right;clear:both;width:670px;/*滑动门的宽度*/}
 /* TAB 切换效果 */
 .tb_{ background-color: #eaeaea; height:40px; }
 .tb_ ul{height:40px; }
@@ -161,7 +163,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
 .dis ul li.wping{margin-left:12px; }
 .dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:22px; background:#15bccf; color:#fff; text-align:center; padding-top:4px;}
 .dis ul li.wping a:hover{ background-color:#03a1b3;}
-.code_list{ float:right; font-size:12px; color:#484848; padding:5px 3px;  border-bottom:2px solid #15bccf; width:725px; margin-bottom:10px;}
+.code_list{ float:right; font-size:12px; color:#484848; padding:5px 3px;  border-bottom:2px solid #15bccf; width:665px; margin-bottom:10px;}
 .code_list a{ color:#787878;}
 .fr{ float:right;}
 .c_grey{ color:#999; font-weight:normal;}
@@ -355,7 +357,7 @@ a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-lef
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
 
-blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;word-break: break-all;word-wrap: break-word;}
+blockquote {background: #e8e8e8;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;}
 .respond-form{display: none;margin: auto;clear: both;}
 
 .reply_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #ccc; color:#999;  border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;}
@@ -494,8 +496,9 @@ blockquote {
     margin-right: 0.4em;
     border-radius: 4px;
     font-family: "Microsoft YaHei";
-    background: url('../images/requirements/reference.jpg');
+    /*background: url('../images/requirements/reference.jpg');*/
     background-size: 100% 100%;
+    margin-top:5px;
 }
 a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;}
 .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;}
@@ -576,7 +579,7 @@ a:hover.icon_add{background:url(../stylesheets/images/icons.png) -20px -310px no
 .talkmain_pic{}
 a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
 a:hover.talkmain_pic{border:1px solid #64bdd9;}
-.talkmain_txt{ width:610px; margin-left:10px; color:#333;}
+.talkmain_txt{ width:610px; margin-left:10px; color:#888;}
 a.talkmain_name{ color:#ff5722;}
 a:hover.talkmain_name{ color:#d33503;}
 .talkmain_tit{ color:#0781b4; width:450px; display:block; }
@@ -634,7 +637,7 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
 .w80{ width:80px;}
 .t_c{ text-align:center;}
 
-.hwork_tit{ width:230px; float:left; }
+.hwork_tit{ width:210px; float:left; }
 .hwork_tit a{ width:205px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .hwork_tit_une{ width:270px; float:left; }
 .hwork_tit_une a{ width:265px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
@@ -642,10 +645,10 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
 .hwork_code02{ width:60px; text-align:center;  }
 .hwork_tit_e{ width:420px; float:left; }
 .hwork_tit_e a{ width:405px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.hwork_num{ width:110px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_num{ width:95px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
 .mr18{ margin-right:18px;}
 a.hwork_center{ display:block; width:60px;  margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
-.hwork_name{ display:block;width:100px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_name{ display:block;width:85px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
 .absence_penalty{ display:block;width:45px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
 .border_ce {border: 1px solid #e4e4e4;}
 .show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
@@ -719,3 +722,51 @@ a:hover.about_me{ color:#0781b4;}
 
 
 
+/*20150820课程作业 LB*/
+.HomeWork {width:708px; background-color:#ffffff; padding:10px 20px 20px 20px; border:1px solid #dddddd;}
+.RightBanner {width:708px; height:34px;  border-bottom:1px solid #e9e9e9;}
+select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
+a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #15bccf; color:#15bccf;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.BlueCirBtn{ background:#15bccf; color:#fff;}
+.W440{ width:440px;}
+.W120{ width:110px;}
+.W700{ width:700px;max-width: 700px;min-width: 700px;}
+.w708{width: 708px;}
+a.AnnexBtn{  background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#15bccf;}
+a.FilesBtn{  background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#15bccf;}
+a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #15bccf; color:#15bccf;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.BlueCirBtnMini{ background:#15bccf; color:#fff;}
+a.DropBtn{background: url(../images/homepage_icon2.png) -125px -339px no-repeat; width:85px; height:20px; display:block;  color:#888888; font-size:14px;}
+a:hover.DropBtn{background: url(../images/homepage_icon2.png) -125px -370px no-repeat;}
+.DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;}
+/*20150820编程作业 LB*/
+.W320{ width:320px;}
+.icon_add{ background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
+a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
+.icon_remove{background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
+a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
+/*20150820提交作业 LB*/
+.HomeWorkBox{ background:#f6f6f6; padding:10px; margin:10px 0;}
+.c_grey{ color:#888888;}
+.c_dark_grey{color:#a9a9a9 !important;}
+.HomeWorkP{ width:690px; font-size:14px;}
+.H150{ height:150px;}
+.ProResult{width:748px; background-color:#fff;  border:1px solid #dddddd;border-bottom:none; }
+.ProResultTop{ height:38px; line-height:38px; border-bottom:1px solid #dddddd; background:#f2f2f2; padding:0 10px;}
+.ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
+.W50{ width:50px;}
+.W200{ width:200px;}
+.ProResultTable{ color:#888888;}
+.T_C{ text-align:center;}
+.SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; }
+.SearchIcon:hover{background:url(../images/homepage_icon2.png) 676px -419px no-repeat; }
+a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
+a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
+a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
+a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
+.ProResultUl span { display:block; float:left;}
+.ProResultUl li{  line-height:35px;  border-bottom:1px solid #dddddd; }
+.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}

public/stylesheets/header.css

@@ -49,7 +49,7 @@ a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#b3e0ee;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
-.homepageMenuSetting {display:inline-block; margin-left:155px;}
+.homepageMenuSetting {display:inline-block; margin-right: 17px; margin-top: 18px;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}

public/stylesheets/new_user.css

@@ -31,7 +31,7 @@ table{ background:#fff;}
 .min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
 .db {display:block;}
 /* font & color */
-h2{ font-size:18px; color:#15bccf;}
+h2{ font-size:18px; color:#269ac9;}
 h3{ font-size:14px; color:#e8770d;}
 h4{ font-size:14px; color:#3b3b3b;}
 .f12{font-size:12px; font-weight:normal;}
@@ -88,6 +88,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mr30{ margin-right:30px !important;}
 .mr40{ margin-right:40px !important;}
 .mw20{ margin: 0 20px;}
+.mt-20 {margin-top:-20px;}
 .mt-4 {margin-top: -4px;}
 .mt3{ margin-top:3px;}
 .mt5{ margin-top:5px;}
@@ -136,7 +137,7 @@ a.c_lorange{color:#ff9900;}
 a:hover.c_lorange{color:#fff;}
 a.c_blue{ color:#269ac9;}
 a.c_dblue{ color:#09658c;}
-a:hover.c_dblue{ color:#15bccf;}
+a:hover.c_dblue{ color:#297fb8;}
 a.c_white{ color:#fff;}
 input.c_white { color:#fff}
 a.c_dorange{ color:#fd6e2a;}
@@ -160,7 +161,7 @@ a.c_green{ color:#28be6c;}
 .c_dark{ color:#2d2d2d;}
 .c_lorange{ color:#ff9900;}
 .c_purple{color: #6883b6;}
-.c_blue{ color:#15bccf;}
+.c_blue{ color:#269ac9;}
 .c_red{ color:#F00;}
 .c_green{ color:#28be6c;}
 .c_dblue{ color:#09658c;}
@@ -247,36 +248,6 @@ a:hover.bgreen_n_btn{background:#08a384;}
 /*框架主类容*/
 #Container{ width:1000px; margin:0 auto; }
 
-/*头部导航*/
-#Header{ margin:10px 0; background:#269ac9; height:40px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; position: relative;}
-.logo{ margin:5px 10px; }
-#TopNav{}
-#TopNav ul li{ margin-top:8px;}
-.topnav_a a{ font-size:14px; font-weight:bold; color:#fff; margin-right:10px;}
-.topnav_a a:hover{color: #a1ebff;}
-#userInfo {float:right; display:inline-block; width:130px; padding-top:5px;}
-.userInfoRow2 {margin-top:-5px;}
-.myPractice {display:inline-block;}
-a.parent {background: url(../images/arrowList.png) -30px 3px no-repeat; width:95px; padding-right:50px;}
-a.parent:hover {background: url(../images/arrowList.png) -30px -14px no-repeat; width:95px; padding-right:50px; color:#fe7d68;}
-a.linkToOrange:hover {color:#fe7d68;}
-#userInfo ul li {positon: relative;}
-#userInfo ul li ul {display:none;}
-#userInfo ul li:hover ul {display:block; position:absolute;}
-#userInfo ul li:hover ul li ul {display:none;}
-#userInfo ul li:hover ul li:hover ul {display:block; position:absolute; left:110px; top:6px; width:148px; border:1px solid #15bccf; background-color:#ffffff; padding:5px 0px;}
-#userInfo ul li:hover ul li:hover ul li {max-width:148px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block; padding: 0 10px; line-height:1.5; color:#15bccf;}
-#TopUser{}
-#TopUser ul li{ margin-top:8px;}
-.topuser_a a{ font-size:14px; font-weight:bold; color:#fff; margin-right:10px;}
-.topuser_a  a:hover{color: #a1ebff;}
-#TopUser02{	}
-#TopUser02 li{	float: left;}
-#TopUser02 li a{ margin-right:10px;color: #FFF;text-align: center;}
-#TopUser02 li a:hover{color: #a1ebff;}
-#TopUser02 div{	position: absolute;visibility: hidden;background:#fff;border: 1px solid #15bccf;}
-#TopUser02 div a{position: relative;display: block;white-space: nowrap;text-align: left; line-height:1.9; margin-left:5px;background: #fff;color:#15bccf; font-weight:normal;}
-#TopUser02 div a:hover{	color:#e8770d; font-weight: bold;}
 
 /*myctrip*/
 .userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
@@ -305,9 +276,9 @@ a.topnav_login_box:hover {color:#a1ebff;}
 .search{ margin-top:8px; margin-left:71px;}
 .search_form{margin-top:8px;margin-left:72px;}
 .topbar_info{ width:350px; color:#5c5c5c; font-size:16px; margin-right:50px; line-height:1.3; padding-left:100px;}
-a.search_btn{ display:block; background:#15bccf; color:#fff; width:60px; height:24px; text-align:center; padding-top:3px;}
+a.search_btn{ display:block; background:#269ac9; color:#fff; width:60px; height:24px; text-align:center; padding-top:3px;}
 a:hover.search_btn{ background: #0fa9bb;}
-.search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; }
+.search_text{ border:1px solid #269ac9; background:#fff; width:220px; height:25px; padding-left:5px; }
 
 
 /*资源库*/
@@ -315,7 +286,7 @@ a:hover.search_btn{ background: #0fa9bb;}
 /*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/
 .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
 .bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
-.resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;}
+.resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;}
 .resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
 .resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
 .resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
@@ -405,7 +376,7 @@ a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-rep
 /*.resourcesUploadBox:hover {background-color:#0781b4;}*/
 /* 个人主页右边部分*/
 .homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;}
-input.homepageSearchIcon:hover {cursor: pointer;}
+input.homepageSearchIcon:hover {cursor: pointer;background:url(../images/nav_icon.png) -49px 3px no-repeat;}
 a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
 a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;}
 a.replyGrey {color:#888888; display:inline-block;}
@@ -528,20 +499,21 @@ a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
-.homepageMenuSetting {display:inline-block; margin-left:155px;}
+.homepageMenuSetting {display:inline-block; margin-left:155px;background:url(../images/homepage_icon.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
+.homepageMenuSetting:hover {background:url(../images/homepage_icon.png) -190px -407px no-repeat;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
-.homepageRightBanner {width:720px; height:30px; margin:0px auto;}
-.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left; margin-top:4px;}
+.homepageRightBanner {width:720px; margin:0px auto;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}
 .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
 .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
 .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
-.homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
-.homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;}
-.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageNewsType {width:110px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
+.homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;}
+.homepageNewsContent {width:365px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
@@ -558,6 +530,7 @@ a.menuGrey {color:#808080;}
 a.menuGrey:hover {color:#fe7d68;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
 #navSearchAlert {display:none;}
+.loadMore {font-size:14px;width:748px; text-align:center; display:block; border:1px solid #dddddd; background-color:#ffffff; float:right;padding:5px 0; letter-spacing: 1px;}
 
 /*个人主页右部分*/
 .homepagePostType {width:180px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-170px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
@@ -588,7 +561,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:20px;}
 .homepagePostReplyBannerTime{width:85px; display:inline-block;}
 .homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;}
-.homepagePostReplyInputContainer {width:670px; margin:0px auto;}
+.homepagePostReplyInputContainer {width:670px; margin: 10px auto 0 auto;}
 .homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;}
 .homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;}
 .homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#269ac9;}
@@ -600,7 +573,7 @@ a.postReplyCancel {color:#888888; display:block;}
 a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyInputContainer2 {width:595px; margin:0px auto;}
 .homepagePostReplyInput2 {width:588px; height:45px; max-width:588px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:0px auto 10px auto;}
-.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:670px; margin:0px auto; margin-top:15px; min-height:65px;}
+.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:65px;}
 .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
@@ -609,10 +582,10 @@ a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:45px;}
 .homepagePostReplyDes {float:left; width:595px; margin-left:15px;}
-.homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;}
+.homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
-.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9; height:30px; line-height:30px; vertical-align:middle;}
+.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
 .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
 .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
 .postAttSize {color:#888888; font-size:12px;}
@@ -678,21 +651,21 @@ ul.list_watch{
 .w450{width: 450px;}
 
 /*引用资源库弹窗*/
-.referenceResourcesPopup {width:710px; height:auto; border:3px solid #269ac9; padding-left:20px; padding-right:20px; padding-bottom:35px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
+.referenceResourcesPopup {width:710px; height:500px !important; border:3px solid #269ac9 !important; padding-left:20px; padding-right:20px; padding-bottom:35px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
 .referenceText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight:bold;}
 .referenceSearchBox {border:1px solid #e6e6e6; width:235px; height:32px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchReferencePopup {border:none; outline:none; background-color:#ffffff; width:190px; height:32px; padding-left:10px; display:inline-block; float:left;}
-.referenceSearchIcon{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon.png) -170px -135px no-repeat; display:inline-block; float:left;}
-.referenceSearchIcon:hover {background:url(../images/homepage_icon.png) -170px -190px no-repeat;}
-.referenceResourceType {font-size:14px; width:355px; height:34px; line-height:34px; vertical-align:middle; background-color:#f6f6f6; margin-top:15px;}
+.referenceSearchIcon{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon.png) -180px -270px no-repeat; display:inline-block; float:left;}
+.referenceSearchIcon:hover {background:url(../images/homepage_icon.png) -180px -311px no-repeat;}
+.referenceResourceType {font-size:14px; width:475px; height:34px; line-height:34px; vertical-align:middle; background-color:#f6f6f6; margin-top:15px;}
 .referenceTypeActive {background-color:#269ac9; color:#ffffff !important;}
 a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 
 
 /*20150826忘记密码 LB*/
-.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 20px auto}
+.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 10px auto 20px auto;}
 .BgBox_h2{ font-size:16px; color:#484848;  width:968px;border-bottom:1px solid #e3e3e3; padding-bottom:5px;}
-.NomalInput{width:308px; height:38px;  border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px;}
+.NomalInput{width:308px; height:38px;  border:1px solid #98a1a6 !important; outline:none; color:#888888; font-size:14px;}
 .BgBoxCon{ width:310px; margin:80px auto;}
 .BgBoxConP{ font-size:14px; color:#484848;}
 .LoginButton {width:315px; height:40px; background-color:#269ac9; font-size:14px; text-align:center; line-height:40px; vertical-align:middle;}
@@ -704,7 +677,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; }
+.footerAbout{ width:365px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; }
 .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
 .departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}
 .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
@@ -853,17 +826,17 @@ div.flash.warning, .conflict {
 
 /*弹出框*/
 .black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);}
-.white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
-.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
-.newhwork_content{ display:none;position:fixed;top:15%;left:30%;width:600px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
-.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;}
+.white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #269ac9;background-color:white;z-index:1002;overflow:auto;}
+.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #269ac9;background-color:white;z-index:1002;overflow:auto;}
+.newhwork_content{ display:none;position:fixed;top:15%;left:30%;width:600px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #269ac9;background-color:white;z-index:1002;overflow:auto;}
+.floatbox{ width:420px; border:3px solid #269ac9; background:#fff; padding:5px;}
 a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
 a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 
 /*个人主页头像*/
-.white_content_users{display:none;position:fixed;top:45%;left:45%;width:210px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
+.white_content_users{display:none;position:fixed;top:45%;left:45%;width:210px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #269ac9;background-color:white;z-index:1002;overflow:auto;}
 a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
-.box_h3{ color:#15bccf; font-size:16px;}
+.box_h3{ color:#269ac9; font-size:16px;}
 .uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666;  text-align:center;}
 .showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
 .mr15{ margin-right:15px;}
@@ -871,21 +844,23 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 .uppic_btn:hover {background-color: #329cbd;}
 
 /*20150820课程作业 LB*/
-.HomeWork {width:708px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;}
+.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;}
 .RightBanner {width:708px; height:34px;  border-bottom:1px solid #e9e9e9;}
 select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
-a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #15bccf; color:#15bccf;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
-a:hover.BlueCirBtn{ background:#15bccf; color:#fff;}
+a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.BlueCirBtn{ background:#269ac9; color:#fff;}
 .W440{ width:440px;}
 .W120{ width:110px;}
 .W700{ width:700px;max-width: 700px;min-width: 700px;}
 .w708{width: 708px;}
+.w712{width:712px;max-width:712px;min-width: 712px;}
+.w720{width:721px;}
 a.AnnexBtn{  background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
-a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#15bccf;}
+a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#269ac9;}
 a.FilesBtn{  background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
-a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#15bccf;}
-a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #15bccf; color:#15bccf;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
-a:hover.BlueCirBtnMini{ background:#15bccf; color:#fff;}
+a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#269ac9;}
+a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 a.DropBtn{background: url(../images/homepage_icon2.png) -125px -339px no-repeat; width:85px; height:20px; display:block;  color:#888888; font-size:14px;}
 a:hover.DropBtn{background: url(../images/homepage_icon2.png) -125px -370px no-repeat;}
 .DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;}
@@ -956,11 +931,28 @@ img.ui-datepicker-trigger {
 .is_public{display: none !important;}
 .ui-corner-left{background: #64bdd9;}
 
-
-
-
-
-
-
-
+div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
+div.recall_con{width:570px;}
+div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
+.fr.cr{ clear: right}
+
+blockquote {
+    /* font-style: italic; */
+    border-left: 1px solid #e0e0e0;
+    border-right: 1px solid #e0e0e0;
+    border-top: 1px solid #e0e0e0;
+    border-bottom: 1px solid #e0e0e0;
+    padding-left: 0.6em;
+    padding-top: 0.6em;
+    padding-right: 0.6em;
+    padding-bottom: 0.6em;
+    margin-left: 1.4em;
+    margin-right: 0.4em;
+    border-radius: 4px;
+    font-family: "Microsoft YaHei";
+    /*background: url('../images/requirements/reference.jpg');*/
+    background-size: 100% 100%;
+    margin-bottom:5px;
+    background-color: #e8e8e8;
+}