Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop

Gemfile

@@ -30,11 +30,21 @@ gem 'rails_kindeditor',path:'lib/rails_kindeditor'
 #gem "rmagick", ">= 2.0.0"
 gem 'binding_of_caller'
 gem 'chinese_pinyin'
+# gem 'sunspot_rails', '~> 1.3.3'
+# gem 'sunspot_solr'
+# gem 'sunspot'
+# gem 'progress_bar'
+gem  'ansi'
+
+gem 'kaminari'
+gem 'elasticsearch-model'
+gem 'elasticsearch-rails'
 
 group :development do
   gem 'grape-swagger'
   gem 'better_errors', '~> 1.1.0'
   gem 'rack-mini-profiler', '~> 0.9.3'
+  gem  'win32console'
 end
 
 group :development, :test do 

app/assets/javascripts/org_subfields.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/org_subfields.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the org_subfields controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/courses_controller.rb

@@ -374,6 +374,7 @@ class CoursesController < ApplicationController
 
   def settings
     if User.current.allowed_to?(:as_teacher,@course)
+      @select_tab = params[:tab]
       @issue_custom_fields = IssueCustomField.sorted.all
       @issue_category ||= IssueCategory.new
       @member ||= @course.members.new

app/controllers/exercise_controller.rb

@@ -1,18 +1,33 @@
 class ExerciseController < ApplicationController
   layout "base_courses"
 
-  before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit, :update, :show, :destroy, :commit_exercise, :commit_answer,:publish_exercise,:republish_exercise]
+  before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit, :update, :show, :destroy, :commit_exercise, :commit_answer,:publish_exercise,:republish_exercise,:show_student_result]
   before_filter :find_course, :only => [:index,:new,:create,:student_exercise_list]
   include ExerciseHelper
 
-  include ExerciseHelper
   def index
+    publish_exercises = Exercise.where("publish_time is not null and exercise_status = 1 and publish_time <=?",Time.now)
+    publish_exercises.each do |exercise|
+      exercise.update_column('exercise_status', 2)
+      course = exercise.course
+      course.members.each do |m|
+        exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
+      end
+    end
+    end_exercises = Exercise.where("end_time <=? and exercise_status = 2",Time.now)
+    end_exercises.each do |exercise|
+      exercise.update_column('exercise_status', 3)
+    end
+    if @course.is_public == 0 && !User.current.member_of_course?(@course)
+      render_403
+      return
+    end
     remove_invalid_exercise(@course)
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
     if @is_teacher
-      exercises = @course.exercises
+      exercises = @course.exercises.order("created_at asc")
     else
-      exercises = @course.exercises.where(:exercise_status => 2)
+      exercises = @course.exercises.where(:exercise_status => 2).order("created_at asc")
     end
     @exercises = paginateHelper exercises,20 #分页
     respond_to do |format|
@@ -21,6 +36,18 @@ class ExerciseController < ApplicationController
   end
 
   def show
+    publish_exercises = Exercise.where("publish_time is not null and exercise_status = 1 and publish_time <=?",Time.now)
+    publish_exercises.each do |exercise|
+      exercise.update_column('exercise_status', 2)
+      course = exercise.course
+      course.members.each do |m|
+        exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
+      end
+    end
+    end_exercises = Exercise.where("end_time <=? and exercise_status = 2",Time.now)
+    end_exercises.each do |exercise|
+      exercise.update_column('exercise_status', 3)
+    end
     unless User.current.member_of_course?(@course)
       render_403
       return
@@ -31,17 +58,24 @@ class ExerciseController < ApplicationController
       render_403
       return
     end
-    @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)) || User.current.admin?
+    exercise_end = @exercise.end_time > Time.now
+    if @exercise.time == -1
+      @can_edit_excercise = exercise_end
+    else
+      @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end) || User.current.admin?
+    end
     @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
       # 学生点击的时候即创建关联,自动保存
       #eu = ExerciseUser.create(:user_id => User.current, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
 
     # 已提交问卷的用户不能再访问该界面
+=begin
     if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?)
       respond_to do |format|
         format.html {render :layout => 'base_courses'}
       end
     else
+=end
       if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id)
         eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
         @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
@@ -49,10 +83,13 @@ class ExerciseController < ApplicationController
       # @percent = get_percent(@exercise,User.current)
       exercise_questions = @exercise.exercise_questions
       @exercise_questions = paginateHelper exercise_questions,5 #分页
+      score = calculate_student_score(@exercise, User.current)
+      eu = get_exercise_user(@exercise.id, User.current.id)
+      eu.update_attributes(:score => score)
       respond_to do |format|
         format.html {render :layout => 'base_courses'}
       end
-    end
+    #end
   end
 
   def new
@@ -65,7 +102,6 @@ class ExerciseController < ApplicationController
         :end_time => "",
         :publish_time => "",
         :exercise_description => "",
-        :show_result => "",
         :show_result => 1
     }
     @exercise = Exercise.create option
@@ -80,7 +116,7 @@ class ExerciseController < ApplicationController
       exercise ||= Exercise.new
       exercise.exercise_name = params[:exercise][:exercise_name]
       exercise.exercise_description = params[:exercise][:exercise_description]
-      exercise.end_time = params[:exercise][:end_time]
+      exercise.end_time = Time.at(params[:exercise][:end_time].to_time.to_i + 16*60*60 -1)
       exercise.publish_time = params[:exercise][:publish_time]
       exercise.user_id = User.current.id
       exercise.time = params[:exercise][:time]
@@ -104,10 +140,10 @@ class ExerciseController < ApplicationController
   def update
     @exercise.exercise_name = params[:exercise][:exercise_name]
     @exercise.exercise_description = params[:exercise][:exercise_description]
-    @exercise.time =  params[:exercise][:time]
+    @exercise.time =  params[:exercise][:time].blank? ? -1 : params[:exercise][:time]
-    @exercise.end_time = params[:exercise][:end_time]
+    @exercise.end_time = Time.at(params[:exercise][:end_time].to_time.to_i + 16*60*60 -1)
     @exercise.publish_time = params[:exercise][:publish_time]
-    @exercise.show_result = params[:exercise][:show_result]
+    @exercise.show_result = params[:exercise][:show_result].blank? ? 1 : params[:exercise][:show_result]
     if @exercise.save
       respond_to do |format|
         format.js
@@ -300,9 +336,13 @@ class ExerciseController < ApplicationController
   # 发布试卷
   def publish_exercise
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @index = params[:index]
     @exercise.exercise_status = 2
     @exercise.publish_time = Time.now
     if @exercise.save
+      @exercise.course.members.each do |m|
+         @exercise.course_messages << CourseMessage.create(:user_id =>m.user_id, :course_id => @exercise.course.id, :viewed => false,:status=>2)
+      end
       #redirect_to exercise_index_url(:course_id=> @course.id)
       respond_to do |format|
         format.js
@@ -314,11 +354,14 @@ class ExerciseController < ApplicationController
   # 重新发布的时候会删除所有的答题
   def republish_exercise
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @index = params[:index]
     @exercise.exercise_questions.each do |exercise_question|
       exercise_question.exercise_answers.destroy_all
     end
+    @exercise.course_messages.destroy_all
     @exercise.exercise_users.destroy_all
     @exercise.exercise_status = 1
+    @exercise.publish_time = nil
     @exercise.save
     respond_to do |format|
       format.js
@@ -328,12 +371,12 @@ class ExerciseController < ApplicationController
   def student_exercise_list
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     @exercise = Exercise.find params[:id]
-    @all_exercises = @course.exercises.order("created_at desc")
+    @all_exercises = @course.exercises.where("exercise_status > 1").order("created_at desc")
     @exercise_count = @exercise.exercise_users.where('score is not NULL').count
-    if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S"))
+    if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && @exercise.end_time <= Time.now)
       @exercise_users_list = @exercise.exercise_users.where('score is not NULL')
       @show_all = true;
-    elsif !@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") > Time.now.strftime("%Y-%m-%d-%H-%M-%S")
+    elsif !@exercise.exercise_users.where(:user_id => User.current.id).empty? && @exercise.end_time > Time.now
       @exercise_users_list = @exercise.exercise_users.where("user_id = ? and score is not NULL",User.current.id)
     else
       @exercise_users_list = []
@@ -346,8 +389,8 @@ class ExerciseController < ApplicationController
   # 学生提交答卷，选中答案的过程中提交
   def commit_answer
     eq = ExerciseQuestion.find(params[:exercise_question_id])
-    # 已提交过的则不允许答题
+    # 已提交过的且是限时的则不允许答题
-    if has_commit_exercise?(@exercise.id,User.current.id) && (!User.current.admin?)
+    if (has_commit_exercise?(@exercise.id,User.current.id) && (!User.current.admin?) && @exercise.time != -1) || @exercise.end_time < Time.now
       render :json => {:text => "failure"}
       return
     end
@@ -364,8 +407,14 @@ class ExerciseController < ApplicationController
       ea.exercise_choice_id = params[:exercise_choice_id]
       if ea.save
         # 保存成功返回成功信息及当前以答题百分比
+        uncomplete_question = get_uncomplete_question(@exercise, User.current)
+        if uncomplete_question.count < 1
+          complete = 1;
+        else
+          complete = 0;
+        end
         @percent = get_percent(@exercise,User.current)
-        render :json => {:text => "ok" ,:percent => format("%.2f" ,@percent)}
+        render :json => {:text => "ok" ,:complete => complete,:percent => format("%.2f" ,@percent)}
       else
         #返回失败信息
         render :json => {:text => "failure"}
@@ -380,8 +429,14 @@ class ExerciseController < ApplicationController
         ea.exercise_question_id = params[:exercise_question_id]
         ea.exercise_choice_id = params[:exercise_choice_id]
         if ea.save
+          uncomplete_question = get_uncomplete_question(@exercise, User.current)
+          if uncomplete_question.count < 1
+            complete = 1;
+          else
+            complete = 0;
+          end
           @percent = get_percent(@exercise,User.current)
-          render :json => {:text => "ok",:percent => format("%.2f" ,@percent)}
+          render :json => {:text => "ok",:complete => complete,:percent => format("%.2f" ,@percent)}
         else
           render :json => {:text => "failure"}
         end
@@ -410,8 +465,14 @@ class ExerciseController < ApplicationController
           ea.exercise_question_id = params[:exercise_question_id]
           ea.answer_text = params[:answer_text]
           if ea.save
+            uncomplete_question = get_uncomplete_question(@exercise, User.current)
+            if uncomplete_question.count < 1
+              complete = 1;
+            else
+              complete = 0;
+            end
             @percent = get_percent(@exercise,User.current)
-            render :json => {:text => ea.answer_text,:percent => format("%.2f",@percent)}
+            render :json => {:text => ea.answer_text,:complete => complete,:percent => format("%.2f",@percent)}
           else
             render :json => {:text => "failure"}
           end
@@ -447,6 +508,21 @@ class ExerciseController < ApplicationController
   def commit_exercise
     # 老师不需要提交
     if User.current.allowed_to?(:as_teacher,@course)
+      if @exercise.publish_time.nil?
+        @exercise.update_attributes(:show_result => params[:show_result])
+        @exercise.update_attributes(:exercise_status => 2)
+        @exercise.update_attributes(:publish_time => Time.now)
+        course = @exercise.course
+        course.members.each do |m|
+          @exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
+        end
+        redirect_to exercise_url(@exercise)
+        return
+      elsif @exercise.publish_time > Time.now
+        @exercise.update_attributes(:show_result => params[:show_result])
+        redirect_to exercise_url(@exercise)
+        return
+      end
       @exercise.update_attributes(:show_result => params[:show_result])
       redirect_to exercise_url(@exercise)
       # REDO: 提示提交成功
@@ -480,6 +556,20 @@ class ExerciseController < ApplicationController
     end
   end
 
+  #查看学生的答卷情况
+  def show_student_result
+    @user = User.find params[:user_id]
+    @can_edit_excercise = false
+    @exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", @user.id, @exercise.id).first
+    @exercise_questions = @exercise.exercise_questions
+    score = calculate_student_score(@exercise, @user)
+    eu = get_exercise_user(@exercise.id, @user.id)
+    eu.update_attributes(:score => score)
+    respond_to do |format|
+      format.html {render :layout => 'base_courses'}
+    end
+  end
+
   # 计算学生得分
   def calculate_student_score(exercise, user)
     score = 0
@@ -490,7 +580,7 @@ class ExerciseController < ApplicationController
     exercise_qustions.each do |question|
       answer = get_user_answer(question, user)
       standard_answer = get_user_standard_answer(question, user)
-      unless answer.nil?
+      unless answer.empty?
         # 问答题有多个答案
         if question.question_type == 3
           if standard_answer.include?(answer.first.answer_text)
@@ -532,19 +622,6 @@ class ExerciseController < ApplicationController
     eu
   end
 
-  #获取未完成的题目
-  def get_uncomplete_question exercise,user
-    all_questions = exercise.exercise_questions
-    uncomplete_question = []
-    all_questions.each do |question|
-      answers = get_user_answer(question, user)
-      if answers.nil?
-        uncomplete_question << question
-      end
-    end
-    uncomplete_question
-  end
-
   # 获取当前学生回答问题的答案
   def get_user_answer(question,user)
     # user_answer = ExerciseAnswer.where("user_id=? and exercise_question_id=?", user.id, question.id).first
@@ -563,7 +640,8 @@ class ExerciseController < ApplicationController
       standard_answer = question.exercise_standard_answers.first
     end
     standard_answer
-  end  # 是否完成了答题
+  end
+  # 是否完成了答题
   def get_complete_question(exercise,user)
     questions = exercise.exercise_questions
     complete_question = []

app/controllers/files_controller.rb

@@ -374,6 +374,9 @@ class FilesController < ApplicationController
        if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
          Mailer.run.attachments_added(attachments[:files])
        end
+       # 更新课程英雄榜得分
+       update_contributor_score(@course, attachments[:files].first)
+       # end
        if params[:course_attachment_type] && params[:course_attachment_type].is_a?(Array)
          params[:course_attachment_type].each do |type|
            tag_name = get_tag_name_by_type_number  type
@@ -423,6 +426,20 @@ class FilesController < ApplicationController
    end
   end
 
+  def update_contributor_score(course, file )
+    unless  file.author.allowed_to?(:as_teacher, course)
+      course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course.id,  file.author.id).first
+      if  course_contributor_score.nil?
+        CourseContributorScore.create(:course_id => course.id, :user_id => file.author.id, :message_num => 0, :message_reply_num => 0,
+                                      :news_reply_num => 0, :resource_num => 5, :journal_num => 0, :journal_reply_num => 0, :total_score => 5)
+      else
+        score = course_contributor_score.resource_num + 5
+        total_score = course_contributor_score.total_score + 5
+        course_contributor_score.update_attributes(:resource_num => score, :total_score => total_score)
+      end
+    end
+  end
+
   def get_tag_name_by_type_number type
     case type
       when "1"

app/controllers/homework_common_controller.rb

@@ -262,6 +262,7 @@ class HomeworkCommonController < ApplicationController
       @user_activity_id = -1
     end
     @is_in_course = params[:is_in_course]
+    @course_activity = params[:course_activity].to_i
   end
 
   private

app/controllers/memos_controller.rb

@@ -73,6 +73,7 @@ class MemosController < ApplicationController
           end
         end
         #end
+          format.js
           format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
           format.json { render json: @memo, status: :created, location: @memo }
       else
@@ -152,6 +153,7 @@ class MemosController < ApplicationController
   end
 
   def update
+    @flag = false
     respond_to do |format|
       if( #@memo.update_column(:subject, params[:memo][:subject]) &&
            @memo.update_column(:content, params[:memo][:content]) &&
@@ -159,10 +161,12 @@ class MemosController < ApplicationController
            @memo.update_column(:lock, params[:memo][:lock]) &&
            @memo.update_column(:subject,params[:memo][:subject]))
         @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
-        @memo.save
+        @flag = @memo.save
         # @memo.root.update_attribute(:updated_at, @memo.updated_at)
+        format.js
         format.html {redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}"}
       else
+        format.js
         format.html { render action: "edit" }
         format.json { render json: @person.errors, status: :unprocessable_entity }
       end

app/controllers/messages_controller.rb

@@ -169,6 +169,11 @@ class MessagesController < ApplicationController
       course_activity.updated_at = Time.now
       course_activity.save
     end
+    forge_activity = ForgeActivity.where("forge_act_type='Message' and forge_act_id=#{@topic.id}").first
+    if forge_activity
+      forge_activity.updated_at = Time.now
+      forge_activity.save
+    end
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
     if user_activity
       user_activity.updated_at = Time.now

app/controllers/org_courses_controller.rb

@@ -3,7 +3,9 @@ class OrgCoursesController < ApplicationController
     org_ids = params[:orgNames]
     @course = Course.find(params[:course_id])
     org_ids.each do |org_id|
-      OrgCourse.create(:organization_id => org_id.to_i, :course_id => params[:course_id].to_i, :created_at => Time.now)
+      if OrgCourse.where("organization_id =? and course_id =?", org_id.to_i, params[:course_id].to_i).count == 0
+        OrgCourse.create(:organization_id => org_id.to_i, :course_id => params[:course_id].to_i, :created_at => Time.now)
+      end
     end
     respond_to do |format|
       format.js

app/controllers/org_document_comments_controller.rb

@@ -13,7 +13,7 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment.content = params[:org_document_comment][:content]
     if @org_document_comment.save
       flash.keep[:notice] = l(:notice_successful_create)
-      OrgActivity
+      EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document_comment.id, :created_at => @org_document_comment.updated_at)
       redirect_to organization_org_document_comments_path(@organization)
     else
       redirect_to new_org_document_comment_path(:organization_id => @organization.id)
@@ -36,14 +36,26 @@ class OrgDocumentCommentsController < ApplicationController
     if @org_document.parent.nil?
       act  = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first
       act.update_attributes(:updated_at => @org_document.updated_at)
+      EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document.id, :created_at => Time.now)
     end
     respond_to do |format|
-      format.html {redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)}
+      format.html {
+        if params[:flag].to_i == 0
+          redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)
+        else
+          if params[:flag].to_i == 1
+            redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)
+          else
+            redirect_to organization_path(@org_document.organization.id)
+          end
+        end
+      }
     end
   end
 
   def edit
     @org_document = OrgDocumentComment.find(params[:id])
+    @flag = params[:flag]
     @organization = Organization.find(params[:organization_id])
   end
 
@@ -74,10 +86,10 @@ class OrgDocumentCommentsController < ApplicationController
   def destroy
     @org_document_comment = OrgDocumentComment.find(params[:id])
     org = @org_document_comment.organization
+    if @org_document_comment.id == org.home_id
+      org.update_attributes(:home_id => nil)
+    end
     if @org_document_comment.destroy
-      if @org_document_comment.id == org.id
-        org.home_id == nil
-      end
     end
     respond_to do |format|
       format.js

app/controllers/org_projects_controller.rb

@@ -3,7 +3,9 @@ class OrgProjectsController < ApplicationController
     org_ids = params[:orgNames]
     @project = Project.find(params[:project_id])
     org_ids.each do |org_id|
-      OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now)
+      if OrgProject.where("organization_id =? and project_id =?", org_id.to_i, @project.id).count == 0
+        OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now)
+      end
     end
     respond_to do |format|
       format.js

app/controllers/org_subfields_controller.rb

@@ -0,0 +1,20 @@
+class OrgSubfieldsController < ApplicationController
+  def create
+    @subfield = OrgSubfield.create(:name => params[:name])
+    @organization = Organization.find(params[:organization_id])
+    @organization.org_subfields << @subfield
+    @subfield.update_attributes(:priority => @subfield.id)
+  end
+
+  def destroy
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.destroy
+  end
+
+  def update
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.update_attributes(:name => params[:name])
+  end
+end

app/controllers/organizations_controller.rb

@@ -37,6 +37,19 @@ class OrganizationsController < ApplicationController
     @organization = Organization.new
     render :layout => 'new_base'
   end
+
+  def edit
+    @organization = Organization.find(params[:id])
+  end
+
+  def destroy
+    @organization = Organization.find(params[:id])
+    @organization.destroy
+    respond_to do |format|
+      format.html{ redirect_to admin_organization_path }
+    end
+  end
+
   def create
     @organization = Organization.new
     @organization.name = params[:organization][:name]
@@ -142,6 +155,12 @@ class OrganizationsController < ApplicationController
     # end
   end
 
+  def cancel_homepage
+    @org = Organization.find(params[:id])
+    @org.home_id = nil
+    @org.save
+  end
+
   def autocomplete_search
     @project = Project.find(params[:project_id])
     #@flag = params[:flag] || false
@@ -161,7 +180,7 @@ class OrganizationsController < ApplicationController
   def  more_org_projects
     @organization = Organization.find params[:id]
     @page = params[:page]
-    @org_projects = @organization.projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5)
+    @org_projects = @organization.projects.reorder('created_at').uniq.page((params[:page].to_i || 1) +1).per(5)
     respond_to do |format|
       format.js
     end
@@ -170,7 +189,88 @@ class OrganizationsController < ApplicationController
   def more_org_courses
     @organization = Organization.find(params[:id])
     @page = params[:page]
-    @org_courses = @organization.courses.reorder('created_at').page((params[:page].to_i || 1) + 1 ).per(5)
+    @org_courses = @organization.courses.reorder('created_at').uniq.page((params[:page].to_i || 1) + 1 ).per(5)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def join_course_menu
+    @organization = Organization.find(params[:id])
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def search_courses
+    @organization = Organization.find(params[:id])
+    condition = '%%'
+    if !params[:name].nil?
+      condition = "%#{params[:name].strip}%".gsub(" ","")
+    end
+    sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'"+
+        "and courses.id not in (select distinct org_courses.course_id from org_courses where org_courses.organization_id = #{@organization.id})"
+    #user_courses = Course.find_by_sql(sql)
+    @courses = Course.find_by_sql(sql)
+    # @added_course_ids = @organization.courses.map(&:id)
+    # @courses = []
+    # user_courses.each do |course|
+    #   if !@added_course_ids.include?(course.id)
+    #     @courses << course
+    #   end
+    # end
+  end
+
+  def join_courses
+    @organization = Organization.find(params[:id])
+    course_ids = params[:courseNames]
+    course_ids.each do |id|
+      OrgCourse.create(:organization_id => @organization.id, :course_id => id.to_i, :created_at => Time.now)
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def join_project_menu
+    @organization = Organization.find(params[:id])
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def logout
+    logout_user
+    respond_to do |format|
+      format.html {redirect_to organization_path(params[:id])}
+    end
+  end
+
+  def search_projects
+    @organization = Organization.find(params[:id])
+    condition = '%%'
+    if !params[:name].nil?
+      condition = "%#{params[:name].strip}%".gsub(" ","")
+    end
+    sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.name like '#{condition}'" +
+          " and projects.id not in (select org_projects.project_id from org_projects where organization_id = #{@organization.id})"
+    #user_projects = Course.find_by_sql(sql)
+    @projects = Course.find_by_sql(sql)
+    # @added_course_ids = @organization.projects.map(&:id)
+    # @projects = []
+    # user_projects.each do |project|
+    #   if !@added_course_ids.include?(project.id)
+    #     @projects << project
+    #   end
+    # end
+  end
+
+  def join_projects
+    @organization = Organization.find(params[:id])
+    project_ids = params[:projectNames]
+    project_ids.each do |id|
+      OrgProject.create(:organization_id => @organization.id, :project_id => id.to_i, :created_at => Time.now)
+    end
     respond_to do |format|
       format.js
     end

app/controllers/projects_controller.rb

@@ -320,9 +320,20 @@ class ProjectsController < ApplicationController
     @activity.scope_select {|t| !has["show_#{t}"].nil?}
 =end
 
+    @page = params[:page] ? params[:page].to_i + 1 : 0
     # 根据私密性，取出符合条件的所有数据
     if User.current.member_of?(@project) || User.current.admin?
-      @events_pages = ForgeActivity.where("project_id = ? and forge_act_type != ?",@project, "Document" ).order("created_at desc").page(params['page'|| 1]).per(20);
+      case params[:type]
+        when nil
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo')",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'issue'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'news'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'News'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'message'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Message'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+      end
+
       #events = @activity.events(@date_from, @date_to)
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public

app/controllers/repositories_controller.rb

@@ -31,10 +31,10 @@ class RepositoriesController < ApplicationController
   default_search_scope :changesets
 
   before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo]
-  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
+  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers, :forked]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -42,7 +42,7 @@ class RepositoriesController < ApplicationController
   include RepositoriesHelper
   helper :project_score
   #@root_path = RepositoriesHelper::ROOT_PATH
-
+  $g=Gitlab.client
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
@@ -63,6 +63,98 @@ class RepositoriesController < ApplicationController
 
   end
 
+  def forked
+    # 如果当前用户已经fork过该项目，不会新fork项目，则跳至已fork的项
+    unless has_forked?(@project, User.current)
+      project = project_from_current_project(@project.id, User.current.id)
+      redirect_to project_path(project)
+    else
+      # 自己不能fork自己的项目
+      if User.current.id == @project.user_id
+        flash[:notice] = l(:project_gitlab_fork_own)
+        redirect_to repository_url(@repository)
+      else
+        g = Gitlab.client
+        gproject = g.fork(@project.gpid, User.current.gid)
+        if gproject
+          copy_project(@project, gproject)
+          forked_count = @project.forked_count.to_i + 1
+          @project.update_attributes(:forked_count => forked_count)
+        end
+      end
+    end
+
+  end
+
+  # 判断用户是否已经fork过该项目
+  def has_forked?(project, user)
+    projects = Project.where("user_id =?", user)
+    projects.map(&:forked_from_project_id).detect{|s| s == @project.id}.nil? ? true : false
+  end
+
+  # 获取当前用户fork过的项目
+  def project_from_current_project(project, user)
+    project = Project.where("user_id =? and forked_from_project_id =?",user, project).first
+  end
+
+  # copy a project for fork
+  def copy_project(tproject, gproject)
+    project = Project.new
+    project.name = tproject.name
+    project.is_public = tproject.is_public
+    project.status = tproject.status
+    project.description = tproject.description
+    project.hidden_repo = tproject.hidden_repo
+    project.user_id = User.current.id
+    project.project_type = 0
+    project.project_new_type = tproject.project_new_type
+    project.gpid = gproject.id
+    project.forked_from_project_id = tproject.id
+    if project.save
+      r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
+      m = Member.new(:user => User.current, :roles => [r])
+      project_info = ProjectInfo.new(:user_id => User.current.id, :project_id => project.id)
+      user_grades =  UserGrade.create(:user_id => User.current.id, :project_id => project.id)
+      Rails.logger.debug "UserGrade created: #{user_grades.to_json}"
+      project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0, :project_type => @project.project_type,:grade => 0)
+      Rails.logger.debug "ProjectStatus created: #{project_status.to_json}"
+      project.members << m
+      project.project_infos << project_info
+      copy_repository(project, gproject)
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_successful_create)
+          if params[:continue]
+            attrs = {:parent_id => project.parent_id}.reject {|k,v| v.nil?}
+            redirect_to new_project_url(attrs, :course => '0')
+          else
+            redirect_to settings_project_url(project)
+          end
+        }
+        format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => project.id) }
+        format.js
+      end
+    else
+      respond_to do |format|
+        format.html { render :action => 'forked', :layout => 'base_projects'}
+        format.api  { render_validation_errors(@project) }
+      end
+    end
+  end
+
+  def copy_repository(project, gproject)
+    # 避免
+    # if is_sigle_identifier?(project.user_id, gproject.name)
+      repository = Repository.factory('Git')
+      repository.project_id = project.id
+      repository.type = 'Repository::Gitlab'
+      repository.url = gproject.name
+      repository.identifier = gproject.name
+      repository = repository.save
+    # else
+    #   flash[:notice] = l(:project_gitlab_create_double_message)
+    # end
+  end
 
   def newrepo
     scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
@@ -115,21 +207,27 @@ update
   }
 
   def create
-    attrs = pickup_extra_info
+    # 判断版本库创建者是否有同名版本库，避免版本库路径一致问题
-    @repository = Repository.factory('Git')
+    unless is_sigle_identifier?(@project.user_id, params[:repository].first[1])
-    @repository.safe_attributes = params[:repository]
+      flash[:notice] = l(:project_gitlab_create_double_message)
-    if attrs[:attrs_extra].keys.any?
-      @repository.merge_extra_info(attrs[:attrs_extra])
-    end
-    @repository.project = @project
-    @repository.type = 'Repository::Gitlab'
-    @repository.url = @repository.identifier
-    if request.post? && @repository.save
-      s = Trustie::Gitlab::Sync.new
-      s.create_project(@project, @repository)
       redirect_to settings_project_url(@project, :tab => 'repositories')
     else
-      redirect_to settings_project_url(@project, :tab => 'repositories',:repository_error_message=>@repository.errors.full_messages)
+      attrs = pickup_extra_info
+      @repository = Repository.factory('Git')
+      @repository.safe_attributes = params[:repository]
+      if attrs[:attrs_extra].keys.any?
+        @repository.merge_extra_info(attrs[:attrs_extra])
+      end
+      @repository.project = @project
+      @repository.type = 'Repository::Gitlab'
+      @repository.url = @repository.identifier
+      if request.post? && @repository.save
+        s = Trustie::Gitlab::Sync.new
+        s.create_project(@project, @repository)
+        redirect_to settings_project_url(@project, :tab => 'repositories')
+      else
+        redirect_to settings_project_url(@project, :tab => 'repositories',:repository_error_message=>@repository.errors.full_messages)
+      end
     end
   end
 
@@ -237,14 +335,34 @@ update
       #Modified by young
       #  (show_error_not_found; return) unless @entries
       g = Gitlab.client
-      count = 0
+
-      (0..100).each do |page|
+      # count = 0
-        if g.commits(@project.gpid,:page => page).count == 0
+      # (0..100).each do |page|
-          break
+      #   if g.commits(@project.gpid,:page => page).count == 0
-        else
+      #     break
-          count = count + g.commits(@project.gpid,:page => page).count
+      #   else
-        end
+      #     count = count + g.commits(@project.gpid,:page => page).count
+      #   end
+      # end
+
+
+      #add by hx
+      if g.commits(@project.gpid , :page=>25).count==0
+        count = count_commits(@project.gpid , 0 , 25)
+      elsif g.commits(@project.gpid , :page=>50).count ==0
+        count = count_commits(@project.gpid , 25 , 50)+ 25 * 20
+      elsif g.commits(@project.gpid , :page=>75).count ==0
+        count = count_commits(@project.gpid , 50 , 75)+ 50 * 20
+      elsif g.commits(@project.gpid , :page=>100).count== 0
+        count = count_commits(@project.gpid , 75 , 100) + 75 * 20
+      elsif g.commits(@project.gpid , :page=>125).count==0
+        count = count_commits(@project.gpid , 100 , 125) + 100 * 20
+      elsif g.commits(@project.gpid , :page=>150).count==0
+        count = count_commits(@project.gpid , 125 , 150) + 125 * 20
+      else
+        count = count_commits(@project.gpid , 150 ,200) + 150 * 20
       end
+
       @changesets = g.commits(@project.gpid)
       # @changesets = @repository.latest_changesets(@path, @rev)
       # @changesets_count = @repository.latest_changesets(@path, @rev).count
@@ -271,11 +389,30 @@ update
 
   alias_method :browse, :show
 
+  #add by hx
+  def count_commits(project_id , left , right)
+    count = 0
+    (left..right).each do |page|
+      if $g.commits(project_id,:page => page).count == 0
+        break
+      else
+        count = count + $g.commits(project_id,:page => page).count
+      end
+    end
+    return count
+  end
+
   def changes
     @entry = @repository.entry(@path, @rev)
     (show_error_not_found; return) unless @entry
     g = Gitlab.client
-    @commits = g.commits(@project.gpid, page:params[:pamge])
+    limit = 20
+    #每次页面的换回值从1开始,但是gitlab的页面查询是从0开始,所以先改变page的类型减一在改回来
+    @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)
+    #页面传递必须要str类型,但是Paginator的初始化必须要num类型,需要类型转化
+    @commits_count = params[:commit_count].to_i
+    @commits_pages = Redmine::Pagination::Paginator.new @commits_count,limit,params[:page]
+
     @commit = g.commit(@project.gpid,@rev)
     # @changesets = g.get ("/projects/#{@project.gpid}/repository/commits?#{@rev}")
     #@changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
@@ -284,6 +421,7 @@ update
     render :layout => 'base_projects'
   end
 
+
   def revisions
     @changeset_count = @repository.changesets.count
     @changeset_pages = Paginator.new @changeset_count,
@@ -467,8 +605,8 @@ update
   def find_repository
     @repository = Repository.find(params[:id])
     @project = @repository.project
-  rescue ActiveRecord::RecordNotFound
+    rescue ActiveRecord::RecordNotFound
-    render_404
+      render_404
   end
 
   REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i

app/controllers/student_work_controller.rb

@@ -3,8 +3,8 @@ class StudentWorkController < ApplicationController
   include StudentWorkHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work]
-  before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
+  before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work,:revise_attachment]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
   before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule, :forbidden_anonymous_comment]
@@ -76,7 +76,7 @@ class StudentWorkController < ApplicationController
     end
     ##################################################################################################################
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
-    @homework_commons = @course.homework_commons.order("created_at desc")
+    @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).order("created_at desc")
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     @is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
     @show_all = false
@@ -168,9 +168,15 @@ class StudentWorkController < ApplicationController
 
   def create
     # 提交作品前先判断是否已经提交
+    @has_commit = false;
     if hsd_committed_work?(User.current.id, @homework.id)
-      flash[:notice] = l(:notice_successful_create)
+      @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
-      redirect_to edit_student_work_url(params[:student_work])
+      @has_commit = true;
+      #flash[:notice] = l(:notice_successful_create)
+      #redirect_to edit_student_work_url(params[:student_work])
+      respond_to do |format|
+        format.js
+      end
       return
     end
     if params[:student_work]
@@ -216,7 +222,7 @@ class StudentWorkController < ApplicationController
 
   def edit
     @user = User.current
-    if !User.current.admin? && @homework.homework_type == 2   #编程作业不能修改作业
+    if (!User.current.admin? && @homework.homework_type == 2) || Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")   #编程作业不能修改作业|| 截止日期已到不能修改作业
       render_403
     else
       respond_to do |format|
@@ -278,6 +284,23 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  def delete_work
+    @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
+    if @work
+      @work.destroy
+    end
+    redirect_to user_homeworks_user_path(User.current.id)
+  end
+
+  def retry_work
+    if @work.destroy
+      @student_work = StudentWork.new
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   #添加评分，已评分则为修改评分
   def add_score
     @is_last = params[:is_last] == "true"
@@ -477,8 +500,9 @@ class StudentWorkController < ApplicationController
     if params[:student_path]
       redirect_to student_work_index_url(:homework => @homework.id)
     else
-      @user_activity_id = params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id].to_i
-      @is_in_course = params[:is_in_course]
+      @is_in_course = params[:is_in_course].to_i
+      @course_activity = params[:course_activity].to_i
       respond_to do |format|
         format.js
       end
@@ -504,6 +528,18 @@ class StudentWorkController < ApplicationController
     @course_activity = params[:course_activity].to_i
   end
 
+  def revise_attachment
+    Attachment.attach_filesex(@work, params[:attachments], params[:attachment_type])
+    revise_attachments = @work.attachments.where("attachtype = 7").reorder("created_on desc")
+    if revise_attachments.count == 2
+      revise_attachments.last.destroy
+    end
+    #@attachment = @work.attachments.where("attachtype = 7").order("created_on desc").first
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
   def hsd_committed_work?(user, homework)
     sw = StudentWork.where("user_id =? and homework_common_id =?", user, homework).first

app/controllers/users_controller.rb

@@ -92,7 +92,7 @@ class UsersController < ApplicationController
   end
 
   # 用户消息
-  # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复
+  # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复,exercise:课程测验
   # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
   def user_messages
     if !User.current.logged?
@@ -128,7 +128,7 @@ class UsersController < ApplicationController
 
       #课程相关消息
       when 'homework'
-        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','StudentWork') and user_id =?",  @user).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','StudentWork','Exercise') and user_id =?",  @user).order("created_at desc")
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
       when 'course_news'
@@ -1367,7 +1367,7 @@ class UsersController < ApplicationController
       end
     end
 
-    if(params[:type].blank? || params[:type] == "1") #全部
+    if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
         @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
@@ -1429,6 +1429,7 @@ class UsersController < ApplicationController
       @course = @user.courses
       .select { |course|  @user.allowed_to?(:as_teacher,course)}
     end
+    @search = params[:search]
     #这里仅仅是传递需要发送的资源id
     @send_id = params[:send_id]
     @send_ids = params[:checkbox1] || params[:send_ids]
@@ -1445,6 +1446,7 @@ class UsersController < ApplicationController
     else
       @projects = @user.projects
     end
+    @search = params[:search]
     #这里仅仅是传递需要发送的资源id
     @send_id = params[:send_id]
     @send_ids = params[:checkbox1] || params[:send_ids] #搜索的时候  和 直接 用表格提交的时候的send_ids
@@ -1856,7 +1858,7 @@ class UsersController < ApplicationController
   # 根据资源关键字进行搜索
   def resource_search
     search = params[:search].to_s.strip.downcase
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
         @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+

app/controllers/welcome_controller.rb

@@ -151,36 +151,104 @@ class WelcomeController < ApplicationController
   end
 
   def search
-    search_condition = params[:q] 
+    @name = params[:q]
-    search_type = params[:search_type].to_sym unless search_condition.blank?
+    @search_type = params[:search_type]
-    search_by = params[:search_by]
+    case params[:search_type]
+      when 'all'
+        @alls = Elasticsearch::Model.search({
+                                                         query: {
+                                                             multi_match: {
+                                                                 query: @name,
+                                                                 type:"most_fields",
+                                                                 operator: "or",
+                                                                 fields: ['login', 'firstname','lastname','name','description^0.5','filename']
+                                                             }
+                                                         },
+                                                         highlight: {
+                                                             pre_tags: ['<span class="c_red">'],
+                                                             post_tags: ['</span>'],
+                                                             fields: {
+                                                                 login: {},
+                                                                 firstname: {},
+                                                                 lastname: {},
+                                                                 name:{},
+                                                                 description:{},
+                                                                 filename:{}
+                                                             }
+                                                         }
+                                                     },[User,Course,Attachment,Project] ).page(params[:page] || 1).per(20).results
+      when 'user'
+              @users = User.search(@name).page(params[:page] || 1).per(20)
+      when 'project'
+             @projects = Project.search(@name).page(params[:page] || 1).per(20).results
+      when 'course'
+              @courses = Course.search(@name).page(params[:page] || 1).per(20).results
+      when 'attachment'
+              @attachments = Attachment.search(@name).page(params[:page] || 1).per(20).results
+      else
+              @alls = Elasticsearch::Model.search({
+                                                                     query: {
+                                                                         multi_match: {
+                                                                             query: @name,
+                                                                             type:"most_fields",
+                                                                             operator: "or",
+                                                                             fields: ['login', 'firstname','lastname','name','description^0.5','filename']
+                                                                         }
+                                                                     },
+                                                                     highlight: {
+                                                                         pre_tags: ['<span class="c_red">'],
+                                                                         post_tags: ['</span>'],
+                                                                         fields: {
+                                                                             login: {},
+                                                                             firstname: {},
+                                                                             lastname: {},
+                                                                             name:{},
+                                                                             description:{},
+                                                                             filename:{}
+                                                                         }
+                                                                     }
+                                                                 },[User,Course,Attachment,Project] ).page(params[:page] || 1).per(20).results
 
-    if search_type.nil? && params[:contests_search] && params[:name] != ""
-      search_type  = :contests
-      search_condition = params[:name]
     end
 
+    @users_count = User.search(@name).results.total
+
+    @course_count = Course.search(@name).results.total
+    @attach_count = Attachment.search(@name).results.total
+    @project_count = Project.search(@name).results.total
+    @total_count = Elasticsearch::Model.search({
+                                                   query: {
+                                                       multi_match: {
+                                                           query: @name,
+                                                           type:"most_fields",
+                                                           operator: "or",
+                                                           fields: ['login', 'firstname','lastname','name','description^0.5','filename']
+                                                       }
+                                                   },
+                                                   highlight: {
+                                                       pre_tags: ['<span class="c_red">'],
+                                                       post_tags: ['</span>'],
+                                                       fields: {
+                                                           login: {},
+                                                           firstname: {},
+                                                           lastname: {},
+                                                           name:{},
+                                                           description:{},
+                                                           filename:{}
+                                                       }
+                                                   }
+                                               },[User,Course,Attachment,Project] ).results.total
+    # search_type = params[:search_type].to_sym unless search_condition.blank?
+    # search_by = params[:search_by]
+    #
+    # if search_type.nil? && params[:contests_search] && params[:name] != ""
+    #   search_type  = :contests
+    #   search_condition = params[:name]
+    # end
+
     respond_to do |format|
-      format.html{
+      format.js
-        case search_type
+      format.html{ render :layout=>'users_base'}
-        when :projects
-          redirect_to projects_search_url(:name => search_condition,
-                                            :project_type => Project::ProjectType_project)
-        when :courses
-          redirect_to courses_search_url(:name => search_condition)
-        when :contests
-          redirect_to contests_url(:name => search_condition)
-        when :users
-          redirect_to users_search_url(:name => search_condition,:search_by => search_by)
-        when :users_teacher
-          redirect_to users_search_url(:name => search_condition, :search_by => search_by, :role => :teacher)
-        when :users_student
-          redirect_to users_search_url(:name => search_condition, :search_by => search_by, :role => :student)
-        else
-          #redirect_to home_path, :alert => l(:label_sumbit_empty)
-        (redirect_to signin_path, :notice => l(:label_sumbit_empty);return) #if params[:name].blank?
-        end
-      }
     end
   end
 

app/controllers/words_controller.rb

@@ -3,6 +3,8 @@
 class WordsController < ApplicationController
   include ApplicationHelper
   before_filter :find_user, :only => [:new, :create, :destroy, :more, :back]
+  before_filter :require_login, :only => [:create_reply]
+
   def create
     if params[:new_form][:user_message].size>0 && User.current.logged?
       unless params[:user_id].nil?
@@ -102,6 +104,15 @@ class WordsController < ApplicationController
         @user = User.find(@journal_destroyed.jour_id)
         @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
         @is_user = true
+      elsif @journal_destroyed.jour_type == 'HomeworkCommon'
+        @homework = HomeworkCommon.find @journal_destroyed.jour_id
+        if params[:user_activity_id]
+          @user_activity_id = params[:user_activity_id]
+        else
+          @user_activity_id = -1
+        end
+        @is_in_course = params[:is_in_course].to_i
+        @course_activity = params[:course_activity].to_i
       end
       respond_to do |format|
         format.js

app/helpers/application_helper.rb

@@ -75,6 +75,50 @@ module ApplicationHelper
     end
   end
 
+  # 更新课程英雄榜得分
+  # user传过来必须是学生
+  def course_member_score(course_id,user_id,type)
+    course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course_id, user_id).first
+    case type
+      when "JournalForMessage"
+        if  course_contributor_score.nil?
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
+                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0, :total_score => 1)
+        else
+          score = course_contributor_score.journal_num + 1
+          total_score = course_contributor_score.total_score + 1
+          course_contributor_score.update_attributes(:journal_num => score, :total_score => total_score)
+        end
+      when  "Message"
+        if  course_contributor_score.nil?
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 2, :message_reply_num => 0,
+                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 2)
+        else
+          score = course_contributor_score.message_num + 2
+          total_score = course_contributor_score.total_score + 2
+          course_contributor_score.update_attributes(:message_num => score, :total_score => total_score)
+        end
+      when "MessageReply"
+        if  course_contributor_score.nil?
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 1,
+                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1)
+        else
+          score = course_contributor_score.message_reply_num + 1
+          total_score = course_contributor_score.total_score + 1
+          course_contributor_score.update_attributes(:message_reply_num => score, :total_score => total_score)
+        end
+      when "NewReply"
+        if  course_contributor_score.nil?
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
+                                            :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1)
+        else
+          score = course_contributor_score.news_reply_num + 1
+          total_score = course_contributor_score.total_score + 1
+          course_contributor_score.update_attributes(:news_reply_num => score, :total_score => total_score)
+        end
+    end
+  end
+
   # Added by young
   # Define the course menu's link class
   # 不是数组的转化成数组，然后判断当前menu_item是否在给定的列表
@@ -1825,6 +1869,23 @@ module ApplicationHelper
     s
   end
 
+  def get_user_identity identity
+    s = ""
+    case identity
+      when 0
+        s = '教师'
+      when 1
+        s = '学生'
+      when 2
+        s = '组织'
+      when 3
+        s= '开发者'
+      else
+        s = '学生'
+    end
+    s
+  end
+
   def get_memo
     @new_memo = Memo.new
     @public_forum = Forum.find(1) rescue ActiveRecord::RecordNotFound
@@ -2382,7 +2443,7 @@ module ApplicationHelper
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
-            link_to "匿评结束", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
+            link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
             link_to "修改作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue'
           elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")

app/helpers/courses_helper.rb

@@ -25,6 +25,10 @@ module CoursesHelper
     # searchTeacherAndAssistant(project).count
   end
 
+  def show_nav?(count)
+    count == 0 ? true : false
+  end
+
   #课程模块需要展示的模块
   def course_model
     @nav_dispaly_course_all_label = 1
@@ -733,4 +737,26 @@ module CoursesHelper
     end
     desc.html_safe
   end
+
+  # 学生按作业总分排序，取前8个
+  def hero_homework_score(course, score_sort_by)
+    sql_select = "SELECT members.*,(
+          SELECT SUM(student_works.final_score)
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{course.id}
+          AND student_works.user_id = members.user_id
+        ) AS score
+        FROM members
+        JOIN students_for_courses
+        ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
+        WHERE members.course_id = #{course.id} ORDER BY score #{score_sort_by} limit 9"
+    homework_scores = Member.find_by_sql(sql_select)
+  end
+
+  def contributor_course_scor(course_id)
+    ccs = CourseContributorScore.where("course_id =?", course_id).order("total_score desc") .limit(9)
+  end
+
 end
+

app/helpers/exercise_helper.rb

@@ -107,6 +107,19 @@ module ExerciseHelper
     end
   end
 
+  #获取未完成的题目
+  def get_uncomplete_question exercise,user
+    all_questions = exercise.exercise_questions
+    uncomplete_question = []
+    all_questions.each do |question|
+      answers = get_user_answer(question, user)
+      if answers.empty?
+        uncomplete_question << question
+      end
+    end
+    uncomplete_question
+  end
+
   #获取文本题答案
   def get_anwser_vote_text(question_id,user_id)
     pv = ExerciseAnswer.find_by_exercise_question_id_and_user_id(question_id,user_id)

app/helpers/org_subfields_helper.rb

@@ -0,0 +1,2 @@
+module OrgSubfieldsHelper
+end

app/helpers/repositories_helper.rb

@@ -27,6 +27,20 @@ module RepositoriesHelper
   REPO_IP_ADDRESS = Setting.host_repository
   REPO_GITLAB_ADDRESS = "git.trustie.net"
 
+  # 某个成员不能拥有同名版本库，不同的成员可以创建同名版本库
+  def is_sigle_identifier?(user_id, iden)
+    projects = Project.where("user_id =?",user_id)
+    identifiers = []
+    projects.each do |project|
+      # 只针对gitlab类型的，git类型的后期清掉
+      repository = Repository.where("project_id =? and type =?", project.id, "Repository::Gitlab").first
+      if repository
+        identifiers << repository.identifier
+      end
+    end
+    identifiers.include?(iden) ? false :true
+  end
+
   def format_revision(revision)
     if revision.respond_to? :format_identifier
       revision.format_identifier
@@ -47,7 +61,7 @@ module RepositoriesHelper
 
   def user_commit_rep(mail)
     user = User.find_by_mail(mail)
-    user.nil? ? User.find(2) :  User.find_by_mail(mail)
+    #user.nil? ? User.find(2) :  User.find_by_mail(mail)
   end
 
   def render_properties(properties)

app/helpers/student_work_helper.rb

@@ -126,4 +126,15 @@ module StudentWorkHelper
     end
     type
   end
+
+  def revise_attachment_status homework, attach
+    date = Time.parse(format_time(attach.created_on.to_s)).strftime("%Y-%m-%d")
+    status = ""
+    if homework.homework_detail_manual && ((homework.anonymous_comment == 0 &&homework.homework_detail_manual.evaluation_start.to_s <= date) || (homework.anonymous_comment == 1 && homework.end_time < date))
+      status = "此时其他同学作品已公开"
+    else
+      status = "此时其他同学作品尚未公开"
+    end
+    return status
+  end
 end

app/models/attachment.rb

@@ -17,7 +17,7 @@
 
 require "digest/md5"
 require "fileutils"
-
+require 'elasticsearch/model'
 class Attachment < ActiveRecord::Base
   belongs_to :container, :polymorphic => true
   belongs_to :project, foreign_key: 'container_id', conditions: "attachments.container_type = 'Project'"
@@ -38,6 +38,18 @@ class Attachment < ActiveRecord::Base
   validates :description, length: {maximum: 254}
   validate :validate_max_file_size
 
+  #elasticsearch
+  include Elasticsearch::Model
+  #elasticsearch kaminari init
+  Kaminari::Hooks.init
+  Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
+  settings index: { number_of_shards: 5 } do
+    mappings dynamic: 'false' do
+      indexes :filename, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :downloads, analyzer: 'smartcn',index_options: 'offsets'
+    end
+  end
+
 
   acts_as_taggable
   acts_as_event :title => :filename,
@@ -74,9 +86,9 @@ class Attachment < ActiveRecord::Base
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
   before_save :files_to_final_location,:act_as_course_activity
-  after_create :office_conver, :be_user_score,:act_as_forge_activity
+  after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index
-  after_update :office_conver, :be_user_score
+  after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index
-  after_destroy :delete_from_disk,:down_user_score
+  after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index
 
   # add by nwb
   # 获取所有可公开的资源文件列表
@@ -92,7 +104,35 @@ class Attachment < ActiveRecord::Base
               " LEFT JOIN #{News.table_name} ON #{Attachment.table_name}.container_type='News' AND (#{News.table_name}.project_id in "+self.public_project_id + " OR #{News.table_name}.course_id in " + self.public_course_id + ")" +
               " LEFT JOIN #{HomeworkAttach.table_name} ON #{Attachment.table_name}.container_type='HomeworkAttach' AND #{HomeworkAttach.table_name}.bid_id in "+self.public_bid_id)
   }
-
+  scope :indexable,lambda { where('is_public = 1 and ((container_type in ("Principal")) ' +
+                                      'or (container_type = "Course" and container_id in( SELECT `courses`.id FROM `courses` WHERE (courses.status <> 9 AND courses.is_public = 1)) )'+
+                                      'or (container_type = "Project" and container_id in(SELECT `projects`.id FROM `projects` WHERE (projects.status <> 9 AND projects.is_public = 1) ))' +')')} #用于elastic建索引的scope
+  def self.search(query)
+    __elasticsearch__.search(
+        {
+            query: {
+                multi_match: {
+                    query: query,
+                    type:"most_fields",
+                    operator: "or",
+                    fields: ['filename']
+                }
+            },
+            sort:{
+                _score:{order:"desc"},
+                downloads: {order:"desc"}
+
+            },
+            highlight: {
+                pre_tags: ['<span class="c_red">'],
+                post_tags: ['</span>'],
+                fields: {
+                    filename: {}
+                }
+            }
+        }
+    )
+  end
   # add by nwb
   # 公开的项目id列表
   def self.public_project_id
@@ -560,4 +600,47 @@ class Attachment < ActiveRecord::Base
       self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id)
     end
   end
+
+  def create_attachment_ealasticsearch_index
+    if self.is_public == 1 && ( (self.container_type == 'Project' &&  Project.find(self.container_id).is_public == 1) ||
+        ( self.container_type == 'Course' && Course.find(self.container_id).is_public == 1) ||
+        self.container_type == 'Principal')
+         self.__elasticsearch__.index_document
+    end
+  end
+  def update_attachment_ealasticsearch_index
+    if self.is_public == 1 && ( (self.container_type == 'Project' &&  Project.find(self.container_id).is_public == 1) ||
+        ( self.container_type == 'Course' && Course.find(self.container_id).is_public == 1) ||
+        self.container_type == 'Principal')
+       begin
+        self.__elasticsearch__.update_document
+       rescue => e
+       end
+    else
+      begin
+      self.__elasticsearch__.delete_document
+      rescue => e
+      end
+    end
+  end
+  def delete_attachment_ealasticsearch_index
+    begin
+      self.__elasticsearch__.delete_document
+    rescue => e
+    end
+  end
 end
+
+# Delete the previous articles index in Elasticsearch
+# Attachment.__elasticsearch__.client.indices.delete index: Attachment.index_name rescue nil
+#
+# # Create the new index with the new mapping
+# Attachment.__elasticsearch__.client.indices.create \
+#   index: Attachment.index_name,
+#   body: { settings: Attachment.settings.to_hash, mappings: Attachment.mappings.to_hash }
+
+# Index all article records from the DB to Elasticsearch
+#暂时只做公开课程/项目里的公开资源 和其他的公开资源
+#Attachment.where('is_public = 1 and ((container_type in ("Principal")) ' +
+#   'or (container_type = "Course" and container_id in( SELECT `courses`.id FROM `courses` WHERE (courses.status <> 9 AND courses.is_public = 1)) )'+
+#    'or (container_type = "Project" and container_id in(SELECT `projects`.id FROM `projects` WHERE (projects.status <> 9 AND projects.is_public = 1) ))' +')').import :force=>true

app/models/board.rb

@@ -17,8 +17,8 @@
 
 class Board < ActiveRecord::Base
   include Redmine::SafeAttributes
-  belongs_to :project
+  belongs_to :project,:touch => true
-  belongs_to :course
+  belongs_to :course,:touch=>true
   has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
   has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
   belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id

app/models/comment.rb

@@ -31,11 +31,11 @@ class Comment < ActiveRecord::Base
                 :title=>Proc.new {|o| "RE: #{o.commented.title}" },
                 :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.commented.id} }
 
-  belongs_to :commented, :polymorphic => true, :counter_cache => true
+  belongs_to :commented, :polymorphic => true, :counter_cache => true,:touch => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   validates_presence_of :commented, :author, :comments
   safe_attributes 'comments'
-  after_create :send_mail, :act_as_system_message
+  after_create :send_mail, :act_as_system_message, :act_as_student_score
 
   def act_as_system_message
     if self.commented.course
@@ -66,13 +66,26 @@ class Comment < ActiveRecord::Base
   def set_notify_id(notify_id)
     @notify_id= notify_id
   end
+
   def get_notify_id()
     return @notify_id
   end
+
   def set_notify_is_read(notify_is_read)
     @notify_is_read = notify_is_read
   end
+
   def get_notify_is_read()
     return @notify_is_read
   end
+
+  # 课程成员得分（英雄榜）
+  def act_as_student_score
+    if self.commented.course
+      unless self.author.allowed_to?(:as_teacher, self.commented.course)
+        course_member_score(self.commented.course.id, self.author_id, "NewReply")
+      end
+    end
+  end
+
 end

app/models/course.rb

@@ -1,10 +1,24 @@
-
+require 'elasticsearch/model'
 class Course < ActiveRecord::Base
   include Redmine::SafeAttributes
 
   STATUS_ACTIVE     = 1
   STATUS_CLOSED     = 5
   STATUS_ARCHIVED   = 9
+
+  #elasticsearch
+  include Elasticsearch::Model
+
+  #elasticsearch kaminari init
+  Kaminari::Hooks.init
+  Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
+  settings index: { number_of_shards: 5 } do
+    mappings dynamic: 'false' do
+      indexes :name, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :description, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :updated_at, analyzer: 'smartcn',index_options: 'offsets',type:"date"
+    end
+  end
   
   attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name
   #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
@@ -18,7 +32,7 @@ class Course < ActiveRecord::Base
            :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"
   has_many :principals, :through => :member_principals, :source => :principal
   has_many :users, :through => :members
-  has_many :org_courses
+  has_many :org_courses, :dependent => :destroy
   has_many :organizations, :through => :org_courses
   # has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
@@ -40,8 +54,10 @@ class Course < ActiveRecord::Base
 
   has_many :course_activities
   # 课程消息
-  has_many :course_messages,  :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
   has_many :exercises, :dependent => :destroy
+  # 课程贡献榜
+  has_many :course_contributor_scores, :dependent => :destroy
 
   acts_as_taggable
   acts_as_nested_set :order => 'name', :dependent => :destroy
@@ -54,9 +70,9 @@ class Course < ActiveRecord::Base
   validates_length_of :description, :maximum => 10000
   before_save :self_validate
   # 公开课程变成私有课程，所有资源都变成私有
-  after_update :update_files_public
+  after_update :update_files_public,:update_course_ealasticsearch_index
-  after_create :create_board_sync, :act_as_course_activity, :act_as_course_message
+  after_create :create_board_sync, :act_as_course_activity, :act_as_course_message,:create_course_ealasticsearch_index
-  before_destroy :delete_all_members
+  before_destroy :delete_all_members,:delete_course_ealasticsearch_index
 
   safe_attributes 'extra',
   'time',
@@ -98,6 +114,34 @@ class Course < ActiveRecord::Base
       where(" LOWER(name) LIKE :p ", :p => pattern)
     end
   }
+  scope :indexable,lambda { where('is_public = 1') }
+  def self.search(query)
+    __elasticsearch__.search(
+        {
+            query: {
+                multi_match: {
+                    query: query,
+                    type:"most_fields",
+                    operator: "or",
+                    fields: ['name', 'description^0.5']
+                }
+            },
+            sort: {
+                _score:{order: "desc" },
+                updated_at:{order:"desc"}
+
+            },
+            highlight: {
+                pre_tags: ['<span class="c_red">'],
+                post_tags: ['</span>'],
+                fields: {
+                    name: {},
+                    description: {}
+                }
+            }
+        }
+    )
+  end
 
   def visible?(user=User.current)
     user.allowed_to?(:view_course, self)
@@ -342,6 +386,57 @@ class Course < ActiveRecord::Base
   #def name
   #  read_attribute('name') || Project.find_by_identifier(self.extra).try(:name)
   #end
+
+  # after_commit on: [:create] do
+  #   __elasticsearch__.index_document
+  # end
+  #
+  # after_commit on: [:update] do
+  #   __elasticsearch__.update_document
+  # end
+  #
+  # after_commit on: [:destroy] do
+  #   __elasticsearch__.delete_document
+  # end
+  def create_course_ealasticsearch_index
+    if self.is_public == 1
+      self.__elasticsearch__.index_document
+    end
+  end
+  def update_course_ealasticsearch_index
+    if self.is_public == 1 #如果是初次更新成为公开的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
+      begin
+        self.__elasticsearch__.update_document
+      rescue => e
+        self.__elasticsearch__.index_document
+      end
+    else #如果是更新成为私有的，那么索引就要被删除
+      begin
+       self.__elasticsearch__.delete_document
+      rescue => e
+
+      end
+    end
+  end
+
+  def delete_course_ealasticsearch_index
+    begin
+        self.__elasticsearch__.delete_document
+    rescue => e
+
+    end
+  end
 end
 
+# Delete the previous articles index in Elasticsearch
+# Course.__elasticsearch__.client.indices.delete index: Course.index_name rescue nil
+#
+# # Create the new index with the new mapping
+# Course.__elasticsearch__.client.indices.create \
+#   index: Course.index_name,
+#   body: { settings: Course.settings.to_hash, mappings: Course.mappings.to_hash }
+
+# Index all article records from the DB to Elasticsearch
+#Course.where('is_public = 1').import :force=>true
+
 

app/models/course_contributor_score.rb

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

app/models/document.rb

@@ -17,7 +17,7 @@
 
 class Document < ActiveRecord::Base
   include Redmine::SafeAttributes
-  belongs_to :project
+  belongs_to :project,:touch=>true
   belongs_to :user
   belongs_to :category, :class_name => "DocumentCategory", :foreign_key => "category_id"
   include UserScoreHelper

app/models/editor_of_document.rb

@@ -0,0 +1,4 @@
+class EditorOfDocument < ActiveRecord::Base
+  belongs_to :user, :class_name => 'User', :foreign_key => 'editor_id'
+  belongs_to :org_document_comment
+end

app/models/exercise.rb

@@ -2,7 +2,22 @@ class Exercise < ActiveRecord::Base
   #exercise_status: 1,新建；2，发布；3，关闭
   include Redmine::SafeAttributes
   belongs_to :user
+  belongs_to :course ,:touch => true
   has_many :exercise_questions, :dependent => :destroy,:order => "#{ExerciseQuestion.table_name}.question_number"
   has_many :exercise_users, :dependent => :destroy
   has_many :users, :through => :exercise_users #该测试被哪些用户提交答案过
+  # 课程消息
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  after_create :acts_as_course_message
+  def acts_as_course_message
+    if self.course
+      if self.exercise_status == 2 #未发布
+        #self.course.members.each do |m|
+          self.course_messages << CourseMessage.create(:user_id => User.current.id, :course_id => self.course_id, :viewed => false,:status=>2)
+        #end
+      # else
+      #   self.course_messages.destroy_all 这里的destory_all值得商榷。因为我这里是通过status来控制不同的status的
+      end
+    end
+  end
 end

app/models/forge_activity.rb

@@ -46,18 +46,24 @@ class ForgeActivity < ActiveRecord::Base
   end
 
   def add_org_activity
-    if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
+    org_activity = OrgActivity.where("org_act_type = '#{self.forge_act_type.to_s}' and org_act_id = #{self.forge_act_id}").first
-      org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first
+    if org_activity
       org_activity.created_at = self.created_at
       org_activity.save
     else
-      OrgActivity.create(:user_id => self.user_id,
+      if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
-                       :org_act_id => self.forge_act_id,
+        org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first
-                       :org_act_type => self.forge_act_type,
+        org_activity.created_at = self.created_at
-                       :container_id => self.project_id,
+        org_activity.save
-                       :container_type => 'Project',
+      else
-                       :created_at => self.created_at,
+        OrgActivity.create(:user_id => self.user_id,
-                       :updated_at => self.updated_at)
+                           :org_act_id => self.forge_act_id,
+                           :org_act_type => self.forge_act_type,
+                           :container_id => self.project_id,
+                           :container_type => 'Project',
+                           :created_at => self.created_at,
+                           :updated_at => self.updated_at)
+      end
     end
   end
 

app/models/issue.rb

@@ -19,7 +19,7 @@ class Issue < ActiveRecord::Base
   include Redmine::SafeAttributes
   include Redmine::Utils::DateCalculation
   include UserScoreHelper
-  belongs_to :project
+  belongs_to :project,:touch=> true
   belongs_to :tracker
   belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'

app/models/journals_for_message.rb

@@ -21,9 +21,10 @@ class JournalsForMessage < ActiveRecord::Base
   after_destroy :delete_kindeditor_assets
   belongs_to :project,
              :foreign_key => 'jour_id',
-             :conditions => "#{self.table_name}.jour_type = 'Project' "
+             :conditions => "#{self.table_name}.jour_type = 'Project' ",:touch => true
+
   belongs_to :course,
-             :foreign_key => 'jour_id'
+             :foreign_key => 'jour_id',:touch=>true
 
 
   belongs_to :jour, :polymorphic => true
@@ -64,7 +65,7 @@ class JournalsForMessage < ActiveRecord::Base
   has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity
+  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
   after_create :reset_counters!
   after_destroy :reset_counters!
   after_save :be_user_score
@@ -263,4 +264,12 @@ class JournalsForMessage < ActiveRecord::Base
 
     end
   end
+
+  # 课程成员得分（英雄榜）
+  def act_as_student_score
+    unless self.user.allowed_to?(:as_teacher, self.jour)
+      course_member_score(self.jour_id, self.user_id, "JournalForMessage")
+    end
+  end
+
 end

app/models/message.rb

@@ -20,7 +20,7 @@ class Message < ActiveRecord::Base
   include UserScoreHelper
   include ApplicationHelper
   has_many_kindeditor_assets :assets, :dependent => :destroy
-  belongs_to :board
+  belongs_to :board,:touch => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
 
@@ -74,7 +74,7 @@ class Message < ActiveRecord::Base
   after_update :update_messages_board
   after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets
   
-  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail
+  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -186,7 +186,7 @@ class Message < ActiveRecord::Base
   # Description 
   def act_as_forge_activity
     # 如果project为空，那么就是课程相关的消息
-    if !self.board.project.nil?
+    if !self.board.project.nil? && self.parent_id.nil?
       self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
                                              :project_id => self.board.project.id)
     end
@@ -285,4 +285,18 @@ class Message < ActiveRecord::Base
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE
   end
 
+  # 课程成员得分（英雄榜）
+  def act_as_student_score
+    if self.course
+      unless  self.author.allowed_to?(:as_teacher, self.course)
+        if self.parent_id.nil?
+          # 发帖
+          course_member_score(self.course.id, self.author_id, "Message")
+        else
+          # 回帖
+          course_member_score(self.course.id, self.author_id, "MessageReply")
+        end
+      end
+    end
+  end
 end

app/models/news.rb

@@ -17,11 +17,11 @@
 
 class News < ActiveRecord::Base
   include Redmine::SafeAttributes
-  belongs_to :project
+  belongs_to :project,:touch => true
   include ApplicationHelper
   has_many_kindeditor_assets :assets, :dependent => :destroy
   #added by nwb
-  belongs_to :course
+  belongs_to :course,:touch => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   has_many :comments, :as => :commented, :dependent => :destroy, :order => "created_on"
   # fq

app/models/org_document_comment.rb

@@ -3,7 +3,7 @@ class OrgDocumentComment < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :organization
   belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
-
+  has_many :editor_of_documents, :dependent => :destroy
   acts_as_tree :order => "#{OrgDocumentComment.table_name}.sticky asc, #{OrgDocumentComment.table_name}.created_at desc"
   has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy
   after_create :document_save_as_org_activity

app/models/org_subfield.rb

@@ -0,0 +1,3 @@
+class OrgSubfield < ActiveRecord::Base
+  belongs_to :organization, :foreign_key => :organization_id
+end

app/models/organization.rb

@@ -5,7 +5,8 @@ class Organization < ActiveRecord::Base
   has_many :projects,:through => :org_projects
   has_many :courses, :through => :org_courses
   has_many :org_document_comments, :dependent => :destroy
-  has_many :org_courses
+  has_many :org_courses, :dependent => :destroy
+  has_many :org_subfields, :dependent => :destroy
   has_many :users, :through => :org_members
   validates_uniqueness_of :name
   after_create :save_as_org_activity

app/models/project.rb

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+require 'elasticsearch/model'
 class Project < ActiveRecord::Base
   include Redmine::SafeAttributes
   ProjectType_project = 0
@@ -30,6 +30,19 @@ class Project < ActiveRecord::Base
 
   # Specific overidden Activities
 
+  #elasticsearch
+  include Elasticsearch::Model
+  #elasticsearch kaminari init
+  Kaminari::Hooks.init
+  Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
+  settings index: { number_of_shards: 5 } do
+    mappings dynamic: 'false' do
+      indexes :name, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :description, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :updated_on, analyzer: 'smartcn',index_options: 'offsets', type:'date'
+    end
+  end
+
   has_many :student_works
   has_many :time_entry_activities
   has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
@@ -138,8 +151,9 @@ class Project < ActiveRecord::Base
   #ActiveModel::Dirty 这里有一个changed方法。对任何对象都可以用
   after_save :update_inherited_members, :if => Proc.new {|project| project.inherit_members_changed?}
   # 创建project之后默认创建一个board，之后的board去掉了board的概念
-  after_create :create_board_sync,:acts_as_forge_activities
+  after_create :create_board_sync,:acts_as_forge_activities,:create_project_ealasticsearch_index
-  before_destroy :delete_all_members
+  before_destroy :delete_all_members,:delete_project_ealasticsearch_index
+  after_update :update_project_ealasticsearch_index
   def remove_references_before_destroy
     return if self.id.nil?
     Watcher.delete_all ['watchable_id = ?', id]
@@ -172,7 +186,33 @@ class Project < ActiveRecord::Base
   }
   scope :project_entities, -> { where(project_type: ProjectType_project) }
   scope :course_entities, -> { where(project_type: ProjectType_course) }
-  
+  scope :indexable,lambda { where('is_public = 1')} #用于elastic建索引的scope
+  def self.search(query)
+    __elasticsearch__.search(
+        {
+            query: {
+                multi_match: {
+                    query: query,
+                    type:"most_fields",
+                    operator: "or",
+                    fields: ['name','description^0.5']
+                }
+            },
+            sort: {
+                _score:{order: "desc" },
+                updated_on:{order: "desc" }
+            },
+            highlight: {
+                pre_tags: ['<span class="c_red">'],
+                post_tags: ['</span>'],
+                fields: {
+                    name: {},
+                    description: {}
+                }
+            }
+        }
+    )
+  end
   def new_course
     self.where('project_type = ?', 1)
   end
@@ -1176,5 +1216,36 @@ class Project < ActiveRecord::Base
  end
 
 
+  def create_project_ealasticsearch_index
+    if self.is_public
+    self.__elasticsearch__.index_document
+    end
+  end
+  def update_project_ealasticsearch_index
+    if self.is_public #如果是初次更新成为公开的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
+      begin
+        self.__elasticsearch__.update_document
+      rescue => e
+        self.__elasticsearch__.index_document
+      end
+    else #如果是更新成为私有的，那么索引就要被删除
+      begin
+        self.__elasticsearch__.delete_document
+      rescue => e
+
+      end
+    end
+  end
+  def delete_project_ealasticsearch_index
+    begin
+      self.__elasticsearch__.delete_document
+    rescue => e
+
+    end
+  end
+
+
 end
 
+#Project.where('is_public = 1').import  :force=>true
+

app/models/project_tags.rb

@@ -2,7 +2,7 @@
 class ProjectTags < ActiveRecord::Base
   attr_accessible :description, :project_id, :tag_id, :user_id
 ####################################################################################################添加代码 
-  belongs_to :project
+  belongs_to :project,:touch => true
   belongs_to :tag
   belongs_to :user
 

app/models/repository.rb

@@ -40,7 +40,8 @@ class Repository < ActiveRecord::Base
   validates_length_of :identifier, :maximum => IDENTIFIER_MAX_LENGTH, :allow_blank => true
   validates_presence_of :identifier#, :unless => Proc.new { |r| r.is_default? || r.set_as_default? }
   #validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true
-  validates_uniqueness_of :identifier, :allow_blank => true
+  # 改成同一用户不能有两个相同名字的版本库
+  # validates_uniqueness_of :identifier, :allow_blank => true
   validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph)
   # donwcase letters, digits, dashes, underscores but not digits only
   validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true
@@ -52,7 +53,8 @@ class Repository < ActiveRecord::Base
     'password',
     'path_encoding',
     'log_encoding',
-    'is_default'
+    'is_default',
+    'type'
 
   safe_attributes 'url',
     :if => lambda {|repository, user| repository.new_record?}
@@ -63,6 +65,10 @@ class Repository < ActiveRecord::Base
   end
 
   def repo_create_validation
+    # 之所以可以这样改，是因为Fork的时候不需要从Trustie创建版本库，只需从Gitlab关联即可
+    if self.class.name.demodulize == "Repository"
+      return
+    end
     unless Setting.enabled_scm.include?(self.class.name.demodulize)
       errors.add(:type, :invalid)
     end

app/models/student_work.rb

@@ -10,6 +10,7 @@ class StudentWork < ActiveRecord::Base
   has_many :student_work_tests, order: 'id desc'
   # course's message
   has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :attachments, :dependent => :destroy
 
   before_destroy :delete_praise
   before_save :set_program_score, :set_src

app/models/user.rb

@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require "digest/sha1"
-
+require 'elasticsearch/model'
 class User < Principal
   TEACHER = 0
   STUDENT = 1
@@ -25,6 +25,20 @@ class User < Principal
   
   include Redmine::SafeAttributes
   seems_rateable_rater
+  #elasticsearch
+  include Elasticsearch::Model
+  #elasticsearch kaminari init
+  Kaminari::Hooks.init
+  Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
+  settings index: { number_of_shards: 5 } do
+    mappings dynamic: 'false' do
+      indexes :login, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :firstname, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :lastname, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :last_login_on, analyzer: 'smartcn',index_options: 'offsets',type: 'date'
+    end
+  end
+
   # Different ways of displaying/sorting users
   USER_FORMATS = {
     :firstname_lastname => {
@@ -64,6 +78,7 @@ class User < Principal
       },
   }
 
+
   #每日一报、一事一报、不报
   MAIL_NOTIFICATION_OPTIONS = [
     #['week', :label_user_mail_option_week],
@@ -153,6 +168,8 @@ class User < Principal
   # 邮件邀请状态
   has_many :invite_lists,  :dependent => :destroy
   # end
+  # 课程贡献榜
+  has_many :course_contributor_scores, :dependent => :destroy
 
 ######added by nie
   has_many :project_infos, :dependent => :destroy
@@ -160,6 +177,7 @@ class User < Principal
   #####
   has_many :shares ,:dependent => :destroy
 
+
   # add by zjc
   has_one :level, :class_name => 'UserLevels', :dependent => :destroy
   has_many :memos , :foreign_key => 'author_id'
@@ -220,12 +238,12 @@ class User < Principal
   # validates_email_realness_of :mail
   before_create :set_mail_notification
   before_save   :update_hashed_password
-  before_destroy :remove_references_before_destroy
+  before_destroy :remove_references_before_destroy,:delete_user_ealasticsearch_index
   # added by fq
-  after_create :act_as_activity, :add_onclick_time, :act_as_principal_activity
+  after_create :act_as_activity, :add_onclick_time, :act_as_principal_activity,:create_user_ealasticsearch_index
   # end
   # 更新邮箱用户或用户名的同事，同步更新邀请信息
-  after_update :update_invite_list
+  after_update :update_invite_list,:update_user_ealasticsearch_index
 
   include  Trustie::Gitlab::ManageUser
 
@@ -238,7 +256,7 @@ class User < Principal
     where("#{User.table_name}.id NOT IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
   }
   scope :sorted, lambda { order(*User.fields_for_order_statement)}
-  
+  scope :indexable,lambda { where('id not in (2,4)')} #用于elastic建索引的scope,id为2是匿名用户，4是管理员，不能被索引
   scope :like, lambda {|arg, type|
     if arg.blank?
       where(nil)
@@ -256,7 +274,33 @@ class User < Principal
       end
     end
   }
-
+  def self.search(query)
+    __elasticsearch__.search(
+        {
+            query: {
+                multi_match: {
+                    query: query,
+                    type:"most_fields",
+                    operator: "or",
+                    fields: ['login', 'firstname','lastname']
+                }
+            },
+            sort:{
+                _score:{order:"desc"},
+                last_login_on: {order:"desc"}
+            },
+            highlight: {
+                pre_tags: ['<span class="c_red">'],
+                post_tags: ['</span>'],
+                fields: {
+                    login: {},
+                    firstname: {},
+                    lastname: {}
+                }
+            }
+        }
+    )
+  end
 
   # ======================================================================
 
@@ -433,7 +477,7 @@ class User < Principal
     end
     if user
       # user is already in local database
-      #return nil unless user.active?
+      return nil if user.locked?
       return nil unless user.check_password?(password)
     else
       # user is not yet registered, try to authenticate with available sources
@@ -1117,6 +1161,23 @@ class User < Principal
     end
   end
 
+
+  def create_user_ealasticsearch_index
+    if self.id != 2 && self.id != 4
+      self.__elasticsearch__.index_document
+    end
+  end
+  def update_user_ealasticsearch_index
+    if self.id != 2 && self.id != 4
+      self.__elasticsearch__.update_document
+    end
+  end
+  def delete_user_ealasticsearch_index
+    if self.id != 2 && self.id != 4
+      self.__elasticsearch__.delete_document
+    end
+  end
+
 end
 
 class AnonymousUser < User
@@ -1151,4 +1212,17 @@ class AnonymousUser < User
   def destroy
     false
   end
+
 end
+
+# Delete the previous articles index in Elasticsearch
+# User.__elasticsearch__.client.indices.delete index: User.index_name rescue nil
+#
+# # Create the new index with the new mapping
+# User.__elasticsearch__.client.indices.create \
+#   index: User.index_name,
+#   body: { settings: User.settings.to_hash, mappings: User.mappings.to_hash }
+
+# Index all article records from the DB to Elasticsearch
+# 匿名用户 角色 和 管理员角色不能被索引
+#User.where('id not in (2,4)').import :force=>true

app/views/attachments/destroy.js.erb

@@ -1,5 +1,9 @@
 <% if @is_destroy%>
     $("#attachment_<%= @attachment.id%>").remove();
+    if(document.getElementById("uploadReviseBox")) {
+        $("#uploadReviseBox").removeClass('disable_link');
+        $("#choose_revise_attach").attr("onclick","_file.click();");
+    }
 <%else%>
     var attachment_html_obj = $('#attachments_<%= j params[:attachment_id] %>');
     //modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  start
@@ -26,5 +30,10 @@
             $('#upload_file_count'+containerid).html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
         }
     }
+
+    if(document.getElementById("uploadReviseBox")) {
+        $("#uploadReviseBox").removeClass('disable_link');
+        $("#choose_revise_attach").attr("onclick","_file.click();");
+    }
     //modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  end
 <% end%>

app/views/comments/create.js.erb

@@ -1,3 +1,6 @@
+<% if @course %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
-
+<% else %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+<% end %>
 init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");

app/views/courses/_tool_expand.html.erb

@@ -0,0 +1,47 @@
+<% course_file_num = visable_attachemnts_incourse(@course).count%>
+<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
+<% if show_nav?(@course.homework_commons.count) %>
+    <div class="subNav">
+      <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02 ml10"%>
+      <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
+    </div>
+<% end %>
+<% if show_nav?(@course.news.count) %>
+    <div class="subNav">
+      <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02 ml10" %>
+      <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
+    </div>
+<% end %>
+<% if show_nav?(course_file_num) %>
+    <div class="subNav">
+      <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02 ml10" %>
+      <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
+          <!--link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white')-->
+          <a class="courseMenuSetting" title="上传资源" href="javascript:void(0);" onclick="course_files_upload();"> </a>
+      <% end %>
+    </div>
+<% end %>
+<% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
+    <div class="subNav">
+      <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02 ml10" %>
+      <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
+    </div>
+<% end %>
+<% if show_nav?(course_feedback_count) %>
+    <div class="subNav">
+      <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02 ml10" %>
+      <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
+    </div>
+<% end %>
+<% if show_nav?(course_poll_count) %>
+    <div class="subNav">
+      <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02 ml10"%>
+      <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
+    </div>
+<% end %>
+<% if show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
+    <div class="subNav">
+      <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02 ml10"%>
+      <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
+    </div>
+<% end %>

app/views/courses/member.html.erb

@@ -1,9 +1,14 @@
-<div class="project_r_h">
+<div class="project_r_h">
-  <h2 class="project_h2"><%= @subPage_title%></h2>
+  <h2 class="project_h2 fl"><%= @subPage_title%></h2>
-</div>
+  <% if User.current.allowed_to?(:as_teacher,@course) %>
-<% if @subPage_title == l(:label_student_list)%>
+    <span class="fr f14 fontGrey2" style="height: 40px; line-height: 40px; margin-right: 15px;">
-    <%= render :partial => 'course_student', :locals => {:members => @members} %>
+      <%=link_to "修改角色", :controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member' %>
-<% else%>
+    </span>
-    <%= render :partial => 'course_teacher', :locals => {:members => @members} %>
+  <% end %>
-<% end%>
+</div>
-
+<% if @subPage_title == l(:label_student_list)%>
+    <%= render :partial => 'course_student', :locals => {:members => @members} %>
+<% else%>
+    <%= render :partial => 'course_teacher', :locals => {:members => @members} %>
+<% end%>
+

app/views/courses/settings.html.erb

@@ -1,6 +1,13 @@
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_course_modify_settings)%></h2>
 </div>
+<script>
+  $(function(){
+      <% if @select_tab == 'member'%>
+      $("#tb_2").click();
+      <% end %>
+  })
+</script>
 <div class="hwork_new">
   <div id="tb_" class="hwork_tb_">
     <ul>
@@ -118,4 +125,4 @@
   }
   $("#time_selected").click(select);
   $("#term_selected").click(select);
-</script>
+</script>

app/views/courses/settings/_join_org.html.erb

@@ -68,8 +68,7 @@
         });
     });
     function cancel_join_orgs() {
-        $("#search_orgs_result_list").html("");
+        $("#join_orgs_for_course input:checked").attr("checked", false);
-        $("#paginator").css("display", "none")
     }
     function course_join_org(courseId) {
         $.ajax({

app/views/exercise/_commit_alert.html.erb

@@ -1,12 +1,21 @@
 <div id="popbox" style="text-align: center;margin-top: 25px">
-  <% if status == 0 %>
+  <% if status == 0 && exercise.time != -1%>
       <h3 style="font-weight: normal;color: green">提交成功!您的分数是：<%=@score %>分。</h3>
       <%= link_to "确定", exercise_path(),:class => 'commit'%>
-  <% elsif status == 1 %>
+  <% elsif status == 0 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S") %>
-      <h3 style="font-weight: normal;color: red">您还有尚未作答的题目请完成后再提交!</h3>
+      <h3 style="font-weight: normal;color: green">提交成功!</h3>
-      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
+      <%= link_to "确定", exercise_index_path(:course_id => @course.id),:class => 'commit'%>
-  <% else %>
+  <% elsif status == 1 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S")%>
+      <h3 style="font-weight: normal;color: red">保存成功!</h3>
+      <%= link_to "确定",exercise_index_path(:course_id => @course.id),:class => 'commit'%>
+  <% elsif status == 1 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") <= Time.now.strftime("%Y-%m-%d %H:%M:%S")%>
+      <h3 style="font-weight: normal;color: red">时间已到!</h3>
+      <%= link_to "确定", exercise_path(),:class => 'commit'%>
+  <% elsif status == 2 %>
       <h3 style="font-weight: normal;color: red">发生未知错误，请检查您的网络。</h3>
       <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
+  <% else %>
+      <h3 style="font-weight: normal;color: green">时间已到!您的分数是：<%=@score %>分。</h3>
+      <%= link_to "确定", exercise_path(),:class => 'commit'%>
   <% end %>
 </div>

app/views/exercise/_edit_MC.html.erb

@@ -1,63 +1,63 @@
-<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
-    <!--编辑单选start-->
+    <!--编辑单选start-->
-    <script type="text/javascript">
+    <script type="text/javascript">
-        function resetQuestion<%=exercise_question.id%>()
+        function resetQuestion<%=exercise_question.id%>()
-        {
+        {
-            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
+            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
-            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
+            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
-            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
+            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
-            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
+            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
-                    "<li class='ur_item'>" +
+                    "<li class='ur_item'>" +
-                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
-                    "<input maxlength='200' type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
+                    "<input maxlength='200' type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
-                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
-                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
-                    "</li>" +
+                    "</li>" +
-                    "<div class='cl'></div>" +
+                    "<div class='cl'></div>" +
-                    "<% end%>");
+                    "<% end%>");
-        }
+        }
-    </script>
+    </script>
-
+
-    <div class="questionContainer" style="width: 680px;">
+    <div class="questionContainer" style="width: 680px;">
-      <div class="ur_editor_title">
+      <div class="ur_editor_title">
-        <label>问题：&nbsp;&nbsp;</label>
+        <label>问题：&nbsp;&nbsp;</label>
-        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
+        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
-        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入单选题题目" type="text" value="<%=exercise_question.question_title %>">
+        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入单选题题目" type="text" value="<%=exercise_question.question_title %>">
-      </div>
+      </div>
-      <div class="ur_editor_content">
+      <div class="ur_editor_content">
-        <ul>
+        <ul>
-          <li class="ur_item">
+          <li class="ur_item">
-            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
+            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
-          </li>
+          </li>
-          <div class="cl"></div>
+          <div class="cl"></div>
-          <div id="poll_answers_<%=exercise_question.id%>">
+          <div id="poll_answers_<%=exercise_question.id%>">
-              <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+              <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
-                  <li class="ur_item">
+                  <li class="ur_item">
-                    <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                    <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-                    <input maxlength="200" type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
+                    <input maxlength="200" type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
-                    <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+                    <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-                    <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+                    <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-                  </li>
+                  </li>
-                  <div class="cl"></div>
+                  <div class="cl"></div>
-              <% end %>
+              <% end %>
-          </div>
+          </div>
-          <li class="ur_item">
+          <li class="ur_item">
-            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
+            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
-          </li>
+          </li>
-          <div class="cl"></div>
+          <div class="cl"></div>
-        </ul>
+        </ul>
-      </div>
+      </div>
-      <div class="ur_editor_footer">
+      <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,1);">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,1);">
-          保存
+          保存
-        </a>
+        </a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
-          <%= l(:button_cancel)%>
+          <%= l(:button_cancel)%>
-        </a>
+        </a>
-      </div>
+      </div>
-      <div class="cl"></div>
+      <div class="cl"></div>
-    </div>
+    </div>
-    <!--编辑单选 end-->
+    <!--编辑单选 end-->
 <% end%>

app/views/exercise/_edit_MCQ.html.erb

@@ -1,63 +1,63 @@
-<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
-    <!--编辑单选start-->
+    <!--编辑单选start-->
-    <script type="text/javascript">
+    <script type="text/javascript">
-        function resetQuestion<%=exercise_question.id%>()
+        function resetQuestion<%=exercise_question.id%>()
-        {
+        {
-            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
+            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
-            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
+            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
-            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
+            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
-            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
+            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
-                    "<li class='ur_item'>" +
+                    "<li class='ur_item'>" +
-                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
-                    "<input maxlength='200' type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
+                    "<input maxlength='200' type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
-                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
-                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
-                    "</li>" +
+                    "</li>" +
-                    "<div class='cl'></div>" +
+                    "<div class='cl'></div>" +
-                    "<% end%>");
+                    "<% end%>");
-        }
+        }
-    </script>
+    </script>
-
+
-    <div class="questionContainer" style="width: 680px;">
+    <div class="questionContainer" style="width: 680px;">
-      <div class="ur_editor_title">
+      <div class="ur_editor_title">
-        <label>问题：&nbsp;&nbsp;</label>
+        <label>问题：&nbsp;&nbsp;</label>
-        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
+        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
-        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入多选题题目" type="text" value="<%=exercise_question.question_title %>">
+        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入多选题题目" type="text" value="<%=exercise_question.question_title %>">
-      </div>
+      </div>
-      <div class="ur_editor_content">
+      <div class="ur_editor_content">
-        <ul>
+        <ul>
-          <li class="ur_item">
+          <li class="ur_item">
-            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
+            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
-          </li>
+          </li>
-          <div class="cl"></div>
+          <div class="cl"></div>
-          <div id="poll_answers_<%=exercise_question.id%>">
+          <div id="poll_answers_<%=exercise_question.id%>">
-            <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+            <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
-                <li class="ur_item">
+                <li class="ur_item">
-                  <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                  <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-                  <input maxlength="200" type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
+                  <input maxlength="200" type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
-                  <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+                  <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-                  <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+                  <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-                </li>
+                </li>
-                <div class="cl"></div>
+                <div class="cl"></div>
-            <% end %>
+            <% end %>
-          </div>
+          </div>
-          <li class="ur_item">
+          <li class="ur_item">
-            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
+            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
-          </li>
+          </li>
-          <div class="cl"></div>
+          <div class="cl"></div>
-        </ul>
+        </ul>
-      </div>
+      </div>
-      <div class="ur_editor_footer">
+      <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,2);">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,2);">
-          保存
+          保存
-        </a>
+        </a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
-          <%= l(:button_cancel)%>
+          <%= l(:button_cancel)%>
-        </a>
+        </a>
-      </div>
+      </div>
-      <div class="cl"></div>
+      <div class="cl"></div>
-    </div>
+    </div>
-    <!--编辑单选 end-->
+    <!--编辑单选 end-->
 <% end%>

app/views/exercise/_edit_head.html.erb

@@ -3,21 +3,17 @@
       <div>
         <input name="exercise[exercise_name]" maxlength="100" id="exercise_name" class="testTitle mb10" type="text" placeholder="测验标题" value="<%=@exercise.exercise_name%>" />
       </div>
-      <%# if edit_mode %>
+      <label class="fl c_grey f14" style="margin-top: 4px;">截止时间：</label>
-      <!--<label class="fl c_grey f14" style="margin-top: 4px;">发布日期(可选)：</label>-->
-      <%# end %>
-      <div class="calendar_div fl mr10">
-        <input  type="text" name="exercise[publish_time]" id="exercise_publish_time" placeholder="发布时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if exercise.publish_time %>"  >
-        <%= calendar_for('exercise_publish_time')%>
-      </div>
-      <%# if edit_mode %>
-      <!--<label class="fl c_grey f14" style="margin-top: 4px;">截止日期：</label>-->
-      <%# end %>
       <div class="calendar_div fl">
-        <input  type="text" name="exercise[end_time]" id="exercise_end_time" placeholder="截止时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>"  >
+        <input  type="text" name="exercise[end_time]" id="exercise_end_time" placeholder="截止时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>"/>
         <%= calendar_for('exercise_end_time')%>
       </div>
-      <div class="fl ml10 f14 fontGrey2"><span class="mr5">测验时长:</span><input name="exercise[time]" id="exercise_time" type="text" class="examTime mr5" value="<%=exercise.time %>" />分钟</div>
+      <div class="fl ml15 f14 fontGrey2"><span class="mr5">测验时长:</span><input name="exercise[time]" id="exercise_time" type="text" class="examTime mr5" placeholder="不填即不限时" value="<%=exercise.time if exercise.time!= -1 %>" />分钟</div>
+      <label class="fl c_grey ml15 f14" style="margin-top: 4px;">发布时间(可选)：</label>
+      <div class="calendar_div fl">
+        <input  type="text" name="exercise[publish_time]" id="exercise_publish_time" placeholder="发布时间(可选)" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if !exercise.publish_time.nil? %>"/>
+        <%= calendar_for('exercise_publish_time')%>
+      </div>
       <div class="cl"></div>
       <textarea class="testDes mt10" name="exercise[exercise_description]" id="exercise_description" placeholder="发布须知：试题类型有选择和填空两种，其中选择题包括单选题和多选题。您可以在此处填写测验相关说明。" ><%=exercise.exercise_description %></textarea>
       <div class="ur_editor_footer" style="padding-top: 10px;">
@@ -30,4 +26,14 @@
       </div>
       <div class="cl"></div>
     </div>
-<% end %>
+<% end %>
+<script type="text/javascript">
+    function resetHead()
+    {
+        $("#exercise_name").val("<%=exercise.exercise_name%>");
+        $("#exercise_end_time").val("<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>");
+        $("#exercise_time").val("<%=exercise.time if exercise.time!= -1 %>");
+        $("#exercise_publish_time").val("<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if !exercise.publish_time.nil?%>");
+        /*$("#exercise_description").text("<%#=exercise.exercise_description.html_safe %>");*/
+    }
+</script>

app/views/exercise/_edit_single.html.erb

@@ -8,7 +8,7 @@
             $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>" +
                     "<li class='ur_item'>" +
                     "<label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
-                    "<input  name='exercise_choice[<%=exercise_choice.id %>]' placeholder='请输入候选答案' type='text' value='<%=exercise_choice.answer_text %>'/>" +
+                    "<input class='candiate_answer' name='exercise_choice[<%=exercise_choice.id %>]' placeholder='请输入候选答案' type='text' value='<%=exercise_choice.answer_text %>'/>" +
 
                     "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a>" +
                     "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
@@ -24,7 +24,7 @@
         <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
         <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text" value="<%=exercise_question.question_title %>">
       </div>
-      <div class="ur_editor_content">
+      <div class="ur_editor_content" id="edit_single">
         <ul>
           <li class="ur_item">
             <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
@@ -35,7 +35,7 @@
             <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
                 <li class="ur_item">
                   <label>候选答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-                  <input  name="exercise_choice[<%=exercise_choice.id %>]" placeholder="请输入候选答案" type="text" value="<%=exercise_choice.answer_text %>"/>
+                  <input class="candiate_answer" name="exercise_choice[<%=exercise_choice.id %>]" placeholder="请输入候选答案" type="text" value="<%=exercise_choice.answer_text %>"/>
                   <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
                   <a class="icon_remove" title="删除" onclick="remove_single_answer($(this));"></a>
                 </li>

app/views/exercise/_exercise.html.erb

@@ -1,61 +1,60 @@
-<%# has_commit = has_commit_poll?(poll.id ,User.current)%>
+<%# has_commit = has_commit_poll?(poll.id ,User.current)%>
-<% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%>
+<% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%>
-<% if @is_teacher%>
+<% if @is_teacher%>
-    <li title="<%= exercise.exercise_name %>">
+    <li title="<%= exercise.exercise_name %>">
-      <div style="width: 310px;float: left;">
+      <div style="width: 310px;float: left;">
-        <%# if has_commit %>
+        <%# if has_commit %>
-            <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
+            <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
-        <%# else %>
+        <%# else %>
-            <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
+            <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
-        <%# end %>
+        <%# end %>
-        <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
+        <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
-      </div>
+      </div>
-    </li>
+    </li>
-
+
-    <% if exercise.exercise_status == 1%>
+    <%# if exercise.exercise_status == 2 %>
-        <li class="pollsbtn fl ml10 pollsbtn_grey">统计结果</li>
+        <!--<li><a class="polls_de fr ml5" onclick="" href="javascript:">关闭</a></li>-->
-    <% else %>
+    <%# else %>
-        <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fl ml10"%></li>
+        <!--<li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>-->
-    <% end%>
+    <%# end%>
-
+
-    <% if exercise.exercise_status == 1 %>
+    <%# if exercise.exercise_status == 1%>
-        <li><a href="javascript:" class="pollsbtn btn_pu fl ml5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>);">发布试卷</a></li>
+        <!--<li class="polls_de_grey fr ml5">导出</li>-->
-    <% elsif exercise.exercise_status == 2%>
+    <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %>
-        <li><a href="javascript:" class="pollsbtn btn_de fl ml5" onclick="republish_exercise(<%= exercise.id%>);">取消发布</a></li>
+        <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
-    <% else%>
+    <%# end%>
-        <li class="pollsbtn fl ml10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
+    <% if exercise.exercise_status == 1 %>
-    <% end%>
+        <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>,<%=index.to_i %>);">发布试卷</a></li>
-
+    <% elsif exercise.exercise_status == 2%>
-    <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
+        <li><a href="javascript:" class="pollsbtn btn_de fr mr5" onclick="republish_exercise(<%= exercise.id%>,<%=index.to_i %>);">取消发布</a></li>
-
+    <% else%>
-    <% if exercise.exercise_status == 1 %>
+        <li class="pollsbtn fr mr10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
-        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li>
+    <% end%>
-    <% else%>
+
-        <li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
+    <% if exercise.exercise_status == 1%>
-    <% end%>
+        <li class="pollsbtn fr mr10 pollsbtn_grey">统计结果</li>
-
+    <% else %>
-    <%# if exercise.exercise_status == 2 %>
+        <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%></li>
-        <!--<li><a class="polls_de fr ml5" onclick="" href="javascript:">关闭</a></li>-->
+    <% end%>
-    <%# else %>
+
-        <!--<li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>-->
+    <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
-    <%# end%>
+
-
+    <% if exercise.exercise_status == 1 %>
-    <%# if exercise.exercise_status == 1%>
+        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml10"%></li>
-        <!--<li class="polls_de_grey fr ml5">导出</li>-->
+        <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
-    <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %>
+    <% else%>
-        <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
+        <li class="polls_de_grey fr ml10" title="未发布的试卷才能进行编辑">编辑</li>
-    <%# end%>
+        <li class="polls_date fr">已发布</li>
-
+    <% end%>
-
+
-    <li class="polls_date fr"><%= format_date exercise.created_at.to_date%></li>
+<% else%>
-<% else%>
+    <% if exercise.exercise_status == 2%>
-    <% if exercise.exercise_status == 2%>
+        <%# if has_commit%>
-        <%# if has_commit%>
+            <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
-            <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
+            <li class="pollsbtn_tip fl ml5">已答</li-->
-            <li class="pollsbtn_tip fl ml5">已答</li-->
+        <%#else%>
-        <%#else%>
+            <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
-            <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <%#end%>
-        <%#end%>
+    <% end%>
-    <% end%>
+    <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>
-    <li class="polls_date fr mr10"><%= format_date exercise.created_at.to_date%></li>
 <% end%>

app/views/exercise/_exercise_form.html.erb

@@ -1,194 +1,219 @@
-<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
-<script type="text/javascript">
+<script type="text/javascript">
-    $(function(){
+    $(function(){
-        $("#RSide").removeAttr("id");
+        $("#RSide").removeAttr("id");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
-        $("#Container").css("width","1000px");
+        $("#Container").css("width","1000px");
-    });
+    });
-    //编辑问卷描述之后
+    //编辑问卷描述之后
-    var popWindow ; //弹出框的引用
+    var popWindow ; //弹出框的引用
-    var importPollPopWindow; //选择导入的弹出框引用
+    var importPollPopWindow; //选择导入的弹出框引用
-    function edit_head(){
+    function edit_head(){
-        $("#polls_description").val($("#polls_description_div").html());
+        $("#exercise_description").val($("#exercise_description_div").html());
-    }
+    }
-    $(function(){
+    $(function(){
-        //点击空白处
+        //点击空白处
-        $(document).bind('click',function(e){
+        $(document).bind('click',function(e){
-            //弹出框非空 不是a标签 点击的不是弹出框 ，那么弹出框就会隐藏
+            //弹出框非空 不是a标签 点击的不是弹出框 ，那么弹出框就会隐藏
-            if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
+            if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
-                popWindow.css('display', 'none');
+                popWindow.css('display', 'none');
-            }
+            }
-            if(importPollPopWindow && e.target.nodeName != 'A' && !importPollPopWindow.is(e.target) && importPollPopWindow.has(e.target).length === 0){
+            if(importPollPopWindow && e.target.nodeName != 'A' && !importPollPopWindow.is(e.target) && importPollPopWindow.has(e.target).length === 0){
-                importPollPopWindow.css('display', 'none');
+                importPollPopWindow.css('display', 'none');
-            }
+            }
-        });
+        });
-    })
+    })
-
+
-    function dismiss(quest_type,quest_id){
+    function dismiss(quest_type,quest_id){
-        popWindow = $("#div_"+quest_type+"_"+quest_id);
+        popWindow = $("#div_"+quest_type+"_"+quest_id);
-        if(popWindow){
+        if(popWindow){
-            popWindow.css('display', 'none');
+            popWindow.css('display', 'none');
-        }
+        }
-    }
+    }
-
+
-    function chooseQuestionType(quest_type,quest_id){
+    function chooseQuestionType(quest_type,quest_id){
-        //quest_type 分为 mc mcq single multi
+        //quest_type 分为 mc mcq single multi
-        //quest_id 是quetion的id  下同
+        //quest_id 是quetion的id  下同
-        if(popWindow){
+        if(popWindow){
-            popWindow.css('display', 'none');
+            popWindow.css('display', 'none');
-        }
+        }
-        popWindow = $("#div_"+quest_type+"_"+quest_id);
+        popWindow = $("#div_"+quest_type+"_"+quest_id);
-        $("#div_"+quest_type+"_"+quest_id).click(function(e){
+        $("#div_"+quest_type+"_"+quest_id).click(function(e){
-            e.stopPropagation(); //组织冒泡到document.body中去
+            e.stopPropagation(); //组织冒泡到document.body中去
-        });
+        });
-        $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");
+        $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");
-
+
-        $("#div_"+quest_type+"_"+quest_id).css("top", $("#add_"+quest_type+"_"+quest_id).offset().top+30);
+        $("#div_"+quest_type+"_"+quest_id).css("top", $("#add_"+quest_type+"_"+quest_id).offset().top+30);
-
+
-        $("#div_"+quest_type+"_"+quest_id).css("left", $("#add_"+quest_type+"_"+quest_id).offset().left-10);
+        $("#div_"+quest_type+"_"+quest_id).css("left", $("#add_"+quest_type+"_"+quest_id).offset().left-10);
-        if( $("#div_"+quest_type+"_"+quest_id).css('display') == 'block') {
+        if( $("#div_"+quest_type+"_"+quest_id).css('display') == 'block') {
-            $("#div_"+quest_type+"_"+quest_id).css('display', 'none');
+            $("#div_"+quest_type+"_"+quest_id).css('display', 'none');
-        }
+        }
-        else{
+        else{
-            $("#div_"+quest_type+"_"+quest_id).css('display', 'block');
+            $("#div_"+quest_type+"_"+quest_id).css('display', 'block');
-        }
+        }
-    }
+    }
-
+
-    //选择导入调查问卷
+    //选择导入调查问卷
-    function importPoll(){
+    function importPoll(){
-        importPollPopWindow = $("#import_poll");
+        importPollPopWindow = $("#import_poll");
-        $("#import_poll").css("position", "absolute");
+        $("#import_poll").css("position", "absolute");
-
+
-        $("#import_poll").css("top", $("#import_btn").offset().top+30);
+        $("#import_poll").css("top", $("#import_btn").offset().top+30);
-
+
-        $("#import_poll").css("left", $("#import_btn").offset().left-65);
+        $("#import_poll").css("left", $("#import_btn").offset().left-65);
-        $("#import_poll").css("display","block")
+        $("#import_poll").css("display","block")
-    }
+    }
-
+
-    function remote_import(){
+    function remote_import(){
-        importPollPopWindow.css('display', 'none');
+        importPollPopWindow.css('display', 'none');
-        if($("#import_poll").val() === 0){
+        if($("#import_poll").val() === 0){
-            return;
+            return;
-        }else{
+        }else{
-            if(confirm("确认导入问卷"+$("#import_poll").find("option:selected").text()+"?")){
+            if(confirm("确认导入问卷"+$("#import_poll").find("option:selected").text()+"?")){
-                $("#import_form").submit();
+                $("#import_form").submit();
-            }else{
+            }else{
-                return;
+                return;
-            }
+            }
-        }
+        }
-
+
-    }
+    }
-
+
-    //添加标题时确定按钮
+    //添加标题时确定按钮
-    function add_poll_question(doc,quest_type)
+    function add_poll_question(doc,quest_type)
-    {
+    {
-        var title = $.trim($("#poll_questions_title").val());
+        var title = $.trim($("#poll_questions_title").val());
-        var score = $.trim($("#question_score").val());
+        var score = $.trim($("#question_score").val());
-        var standard_ans = $.trim($("#question_standard_ans").val());
+        var standard_ans = $.trim($("#question_standard_ans").val());
-        if(title.length == 0 || score.length == 0){
+        if(title.length == 0 || score.length == 0){
-            alert("题目标题/分数不能为空");
+            alert("题目标题/分数不能为空");
-        }else if(quest_type !=3 && standard_ans.length == 0) {
+        }else if(!/^[1-9][0-9]*$/.test(score)) {
-            alert("标准答案不能为空");
+            alert("分数必须是非零开头的数字");
-        }else{
+        }else if(quest_type !=3 && standard_ans.length == 0) {
-            doc.parent().parent().parent().submit();}
+            alert("标准答案不能为空");
-    }
+        }else{
-    //修改标题时确定按钮
+            doc.parent().parent().parent().submit();}
-    function edit_poll_question(doc,id,quest_type)
+    }
-    {
+    //修改标题时确定按钮
-        var title = $.trim($("#poll_questions_title_" + id).val());
+    function edit_poll_question(doc,id,quest_type)
-        var score = $.trim($("#poll_question_score_"+ id).val());
+    {
-        var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val());
+        var title = $.trim($("#poll_questions_title_" + id).val());
-        if(title.length == 0 || score.length == 0){
+        var score = $.trim($("#poll_question_score_"+ id).val());
-            alert("题目标题/分数不能为空");
+        var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val());
-        }else if(quest_type !=3 && standard_ans.length == 0) {
+        if(title.length == 0 || score.length == 0){
-            alert("标准答案不能为空");
+            alert("题目标题/分数不能为空");
-        }else{
+        }else if(!/^[1-9][0-9]*$/.test(score)) {
-            doc.parent().parent().parent().submit();}
+            alert("分数必须是非零开头的数字");
-    }
+        }else if(quest_type !=3 && standard_ans.length == 0) {
-
+            alert("标准答案不能为空");
-    //问卷头
+        }else if(quest_type ==3) {
-    function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+            var div = $("#poll_answers_" + id);
-    function pollsSubmit(doc){
+            var candiate_answer = $(".candiate_answer",div);
-        var title = $.trim($("#exercise_name").val());
+            if(candiate_answer.length > 0) {
-        if(title.length == 0){
+                for(i=0;i<candiate_answer.length;i++) {
-            alert("测验标题不能为空");
+                    if(i<candiate_answer.length-1 && $.trim($(candiate_answer[i]).val()) == "") {
-        } else if($.trim($("#exercise_publish_time").val()) =="") {
+                        continue;
-            alert("发布时间不能为空");
+                    } else if(i == (candiate_answer.length-1) && $.trim($(candiate_answer[i]).val()) == "") {
-        } else if($.trim($("#exercise_end_time").val()) =="") {
+                        alert("候选答案不能为空");
-            alert("截止时间不能为空");
+                    } else if($.trim($(candiate_answer[i]).val()) != ""){
-        } else if($.trim($("#exercise_time").val()) =="") {
+                        doc.parent().parent().parent().submit();
-            alert("考试时长不能为空");
+                        break;
-        } else if(Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
+                    }
-            alert("截止时间必须大于发布时间");
+
-        }
+                }
-        else {
+            } else{
-            doc.parent().parent().parent().submit();
+                alert("候选答案不能为空");
-        }
+            }
-    }
+        }else{
-    function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
+            doc.parent().parent().parent().submit();}
-    //
+    }
-    function pollQuestionCancel(question_id){
+
-        $("#show_poll_questions_"+question_id).show();
+    //问卷头
-        $("#edit_poll_questions_"+question_id).hide();
+    function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
-    }
+    function pollsSubmit(doc){
-    function pollQuestionEdit(question_id){
+        var title = $.trim($("#exercise_name").val());
-        $("#show_poll_questions_"+question_id).hide();
+        if(title.length == 0){
-        $("#edit_poll_questions_"+question_id).show();
+            alert("测验标题不能为空");
-        $("#poll_questions_title_"+question_id).focus();
+        } else if($.trim($("#exercise_end_time").val()) =="") {
-    }
+            alert("截止时间不能为空");
-    //单选题
+        } else if((Date.parse($("#exercise_end_time").val())+(24*60*60-1)*1000) < Date.now()) {
-    function add_single_answer(doc)
+            alert("截止时间不能小于当前时间");
-    {
+        } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
-        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
+            alert("测验时长必须为非零开头的数字");
-                "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) {
-                "</li><div class='cl'></div>");
+            alert("发布时间不能小于当前时间");
-    }
+        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) < Date.parse($("#exercise_publish_time").val())) {
-    function add_candidate_answer(doc)
+            alert("截止时间不能小于发布时间");
-    {
+        } else {
-        doc.parent().after("<li class='ur_item'><label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='exercise_choice["+new Date().getTime()+"]' placeholder='请输入候选答案（选填）'/>" +
+            doc.parent().parent().parent().submit();
-                "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+        }
-                "</li><div class='cl'></div>");
+    }
-    }
+    function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
-    function remove_single_answer(doc)
+    //
-    {
+    function pollQuestionCancel(question_id){
-        if(doc.parent().siblings("li").length == 0)
+        $("#show_poll_questions_"+question_id).show();
-        {
+        $("#edit_poll_questions_"+question_id).hide();
-            alert("选择题至少有一个选项");
+    }
-        }
+    function pollQuestionEdit(question_id){
-        else
+        $("#show_poll_questions_"+question_id).hide();
-        {
+        $("#edit_poll_questions_"+question_id).show();
-            doc.parent().remove();
+        $("#poll_questions_title_"+question_id).focus();
-        }
+    }
-    }
+    //单选题
-</script>
+    function add_single_answer(doc)
-<div class="homepageRight mt0 ml10">
+    {
-<div class="resources">
+        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
-  <!-- 头部 -->
+                "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
-  <div id="polls_head_show"  style="display: none;">
+                "</li><div class='cl'></div>");
-    <%= render :partial => 'show_head', :locals => {:exercise => @exercise}%>
+    }
-  </div>
+    function add_candidate_answer(doc)
-  <div id="polls_head_edit">
+    {
-    <%= render :partial => 'edit_head', :locals => {:exercise => @exercise}%>
+        doc.parent().after("<li class='ur_item'><label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='exercise_choice["+new Date().getTime()+"]' placeholder='请输入候选答案（选填）'/>" +
-  </div>
+                "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
-  <% current_score = get_current_score @exercise %>
+                "</li><div class='cl'></div>");
-  <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%=current_score %>分</span></div>
+    }
-  <!-- 问题 -->
+    function remove_single_answer(doc)
-  <div id="poll_content">
+    {
-    <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise}%>
+        if(doc.parent().siblings("li").length == 0)
-  </div>
+        {
-
+            alert("至少有一个选项或一个候选答案");
-  <div class="testQuestion" id="new_exercise_question">
+        }
-    <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
+        else
-  </div><!--选项 end-->
+        {
-
+            doc.parent().remove();
-  <!-- 新增问题 -->
+        }
-  <div id="new_poll_question">
+    }
-  </div>
+</script>
-
+<div class="homepageRight mt0 ml10">
-  <div id="exercise_submit">
+  <div class="resources">
-    <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
+    <!-- 头部 -->
-  </div>
+    <div id="polls_head_show" style="display: none;">
-  <div class="cl"></div>
+      <%= render :partial => 'show_head', :locals => {:exercise => @exercise} %>
-  <!--contentbox end-->
+    </div>
-</div>
+    <div id="polls_head_edit">
-</div><!--编辑end-->
+      <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %>
+    </div>
+    <% current_score = get_current_score @exercise %>
+    <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%= current_score %>
+      分</span></div>
+    <!-- 问题 -->
+    <div id="poll_content">
+      <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %>
+    </div>
+
+    <div class="testQuestion" id="new_exercise_question">
+      <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
+    </div>
+    <!--选项 end-->
+
+    <!-- 新增问题 -->
+    <div id="new_poll_question">
+    </div>
+
+    <div id="exercise_submit">
+      <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
+    </div>
+    <div class="cl"></div>
+    <!--contentbox end-->
+  </div>
+</div><!--编辑end-->

app/views/exercise/_exercise_student.html.erb

@@ -3,6 +3,12 @@
         $("#RSide").removeAttr("id");
         $("#homework_page_right").css("min-height",$("#LSide").height()-30);
         $("#Container").css("width","1000px");
+        <%uncomplete_question =get_uncomplete_question(exercise, User.current) %>;
+        <% if (uncomplete_question.count < 1) %>
+            $("#exercise_submit_btn").html("提交");
+        <% end %>
+        var end_time = <%=exercise.end_time.to_i%>;
+        getTime(end_time);
         /*start_time = new Date();
         start_time.setFullYear(<%#=exercise_user.start_at.year%>);
         start_time.setMonth(<%#=exercise_user.start_at.month%>);
@@ -17,11 +23,16 @@
     function getTime(end_time) {
         //alert(end_time);
         now = new Date();
-        var total_seconds = (now.getTime() - end_time)/1000;
+        var total_seconds = now.getTime()/1000 - end_time;
+        if (total_seconds > 0) {
+            $("#exercise_submit_btn").click();
+            return;
+        }
+        setTimeout("getTime("+end_time+");", 1000);
         //start = new Date(start_time);
         //end_time = start_time;
         //var total_seconds = total_seconds - 1;
-        var hours = total_seconds / 60 / 60;
+        /*var hours = total_seconds / 60 / 60;
         var hoursRound = Math.floor(hours);
         var minutes = total_seconds /60 - (60 * hoursRound);
         var minutesRound = Math.floor(minutes);
@@ -29,9 +40,9 @@
         var secondsRound = Math.round(seconds);
         $("#rest_hours").html(hoursRound);
         $("#rest_minutes").html(minutesRound);
-        $("#rest_seconds").html(secondsRound);
+        $("#rest_seconds").html(secondsRound);*/
         //if(total_seconds >0) {
-            setTimeout("getTime("+end_time+");", 1000);
+            //setTimeout("getTime("+end_time+");", 1000);
         //}
     }
 </script>
@@ -41,8 +52,11 @@
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div id="start_time" style="display: none"><%=exercise_user.start_at %></div>
       <div class="fontGrey2">
-        <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s)%></span>
+        <span class="mr100">开始时间：<%=Time.parse(h(exercise_user.start_at)).strftime("%Y-%m-%d %H:%M:%S")%></span>
-        <span class="mr130">测验时长：<%=exercise.time %>分钟</span>
+        <span class="mr100">截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S")%></span>
+        <% unless exercise.time == -1 %>
+            <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
 <!--
         <span class="fr">剩余时长：<span class="c_red" id="rest_hours"></span>&nbsp;小时&nbsp;<span class="c_red" id="rest_minutes"></span>&nbsp;分钟&nbsp;<span class="c_red" id="rest_seconds"></span>&nbsp;秒</span>
 -->
@@ -90,6 +104,11 @@
                                               {
                                                   obj.checked = false;
                                               }
+                                              if(dataObj.complete == 1) {
+                                                  $("#exercise_submit_btn").html("提交");
+                                              } else {
+                                                  $("#exercise_submit_btn").html("保存");
+                                              }
                                           }
                                       });
                                   }
@@ -144,6 +163,11 @@
                                               {
                                                   obj.checked = false;
                                               }
+                                              if(dataObj.complete == 1) {
+                                                  $("#exercise_submit_btn").html("提交");
+                                              } else {
+                                                  $("#exercise_submit_btn").html("保存");
+                                              }
                                           }
                                       });
                                   }
@@ -186,12 +210,17 @@
                               success: function (data) {
                                   var dataObj = eval(data);
                                   obj.value = dataObj.text;
+                                  if(dataObj.complete == 1) {
+                                      $("#exercise_submit_btn").html("提交");
+                                  } else {
+                                      $("#exercise_submit_btn").html("保存");
+                                  }
                               }
                           });
 
                       }
                   </script>
-                  <input class="fillInput" placeholder="在此填入答案" type="text" value="" onblur="onblur_<%= exercise_question.id %>(this);" <%= @can_edit_excercise?"":"disabled=disabled" %>>
+                  <input class="fillInput" placeholder="在此填入答案" type="text" value="<%= get_anwser_vote_text(exercise_question.id,User.current.id).html_safe %>" onblur="onblur_<%= exercise_question.id %>(this);" <%= @can_edit_excercise?"":"disabled=disabled" %>>
                 </div>
               </div>
             </div>
@@ -199,7 +228,7 @@
       <% end %>
     </div>
     <div class="ur_buttons">
-      <%= link_to l(:button_submit),commit_exercise_exercise_path(exercise), :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %>
+      <%= link_to "保存",commit_exercise_exercise_path(exercise),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %>
     </div>
     <div class="cl"></div>
     <!--contentbox end-->

app/views/exercise/_exercise_student_result.html.erb

@@ -10,8 +10,11 @@
     <div class="testStatus"><!--头部显示 start-->
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div class="fontGrey2">
-        <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s) %></span>
+        <span class="mr100">开始时间：<%=Time.parse(h(exercise_user.start_at)).strftime("%Y-%m-%d %H:%M:%S") %></span>
-        <span class="mr130">测验时长：<%=exercise.time %>分钟</span>
+        <span class="mr100">截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S")%></span>
+        <% unless exercise.time == -1 %>
+            <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
         <%# time = exercise_user.end_at - exercise_user.start_at %>
         </div>
       <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
@@ -29,14 +32,14 @@
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <span class="ml15 c_red">
-                    <% answer = get_user_answer(exercise_question, User.current)%>
+                    <% answer = get_user_answer(exercise_question, user)%>
-                    <% standard_answer = get_user_standard_answer(exercise_question, User.current)%>
+                    <% standard_answer = get_user_standard_answer(exercise_question, user)%>
-                    <% if answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %>
+                    <% if !answer.empty? && !standard_answer.empty? && answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %>
                         √
                     <% else %>
                         ×
                     <% end %></span><br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first %>
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
@@ -46,7 +49,7 @@
                         <tr>
                           <td>
                             <label>
-                              <%= radio_button "exercise",exercise_question.id.to_s+"exercise_choice_id",exercise_choice.id,:class=>"ur_radio",:checked => answer_be_selected?(exercise_choice,User.current),:disabled => !@can_edit_excercise %>
+                              <%= radio_button "exercise",exercise_question.id.to_s+"exercise_choice_id",exercise_choice.id,:class=>"ur_radio",:checked => answer_be_selected?(exercise_choice,user),:disabled => !@can_edit_excercise %>
                               <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
                             </label>
                           </td>
@@ -68,9 +71,9 @@
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <span class="ml15 c_red">
-                    <% answer = get_user_answer(exercise_question, User.current)%>
+                    <% answer = get_user_answer(exercise_question, user)%>
-                    <% standard_answer = get_user_standard_answer(exercise_question, User.current)%>
+                    <% standard_answer = get_user_standard_answer(exercise_question, user)%>
-                    <% if get_mulscore(exercise_question, User.current).to_i == standard_answer.first.exercise_choice_id %>
+                    <% if !standard_answer.empty? && get_mulscore(exercise_question, user).to_i == standard_answer.first.exercise_choice_id %>
                         √
                     <% else %>
                         ×
@@ -85,7 +88,7 @@
                         <tr>
                           <td>
                             <label>
-                              <input class="ur_radio" type="checkbox" <%= answer_be_selected?(exercise_choice,User.current) ? "checked":"" %> <%= @can_edit_poll?"":"disabled=disabled" %> >
+                              <input class="ur_radio" type="checkbox" <%= answer_be_selected?(exercise_choice,user) ? "checked":"" %> <%= @can_edit_excercise?"":"disabled=disabled" %> >
                               <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
                             </label>
                           </td>
@@ -107,14 +110,14 @@
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <span class="ml15 c_red">
-                    <% answer = get_user_answer(exercise_question, User.current)%>
+                    <% answer = get_user_answer(exercise_question, user)%>
-                    <% standard_answer = get_user_standard_answer(exercise_question, User.current)%>
+                    <% standard_answer = get_user_standard_answer(exercise_question, user)%>
-                    <% if standard_answer.include?(answer.first.answer_text) %>
+                    <% if !answer.empty? && !standard_answer.empty? && standard_answer.include?(answer.first.answer_text) %>
                         √
                     <% else %>
                         ×
                     <% end %></span><br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first %>
                 </div>
                 <div class="cl"></div>
                 <div>
@@ -123,7 +126,7 @@
                   <% end %>
                 </div>
                 <div>
-                  <input class="fillInput" placeholder="在此填入答案" type="text" value="<%= get_anwser_vote_text(exercise_question.id,User.current.id).html_safe %>" <%= @can_edit_poll?"":"disabled=disabled" %>>
+                  <input class="fillInput" placeholder="在此填入答案" type="text" value="<%= get_anwser_vote_text(exercise_question.id,user.id).html_safe %>" <%= @can_edit_excercise?"":"disabled=disabled" %>>
                 </div>
               </div>
             </div>

app/views/exercise/_exercise_submit_info.html.erb

@@ -19,14 +19,9 @@
       <% mc_count = exercise.exercise_questions.where("question_type=1").count %>
       <% mcq_count = exercise.exercise_questions.where("question_type=2").count %>
       <% single_count = exercise.exercise_questions.where("question_type=3").count %>
-      <p class="f14">当前测验
+      <p class="f14">当前测验<%if question_count >0%>共有<%= question_count %>道题，其中<%end%><%if mc_count > 0%><%=mc_count %>道单选、<%end%><%if mcq_count > 0%><%=mcq_count %>道多选、<%end%><%if single_count > 0%><%=single_count %>道填空，<%end%>总分为<span class="c_red"><%=current_score %></span>分。
-        <% if question_count > 0 %>共有<%= question_count %>道题，其中<% end %>
-        <% if mc_count > 0 %><%= mc_count %>道单选、<% end %>
-        <% if mcq_count > 0 %><%= mcq_count %>道多选、<% end %>
-        <% if single_count > 0%><%= single_count %>道填空,<% end %>
-        总分为<span class="c_red"><%=current_score %></span>分。
         <br /><br />
-        是否确定提交该测验？
+        <% if exercise.publish_time.nil? %>点击提交后测验将立即发布，<% end %>是否确定提交该测验？
       </p>
       <div class="polls_btn_box">
         <a class="upload_btn" onclick="exercise_submit();">

app/views/exercise/_exercise_teacher.html.erb

@@ -10,9 +10,13 @@
     <div class="testStatus"><!--头部显示 start-->
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div class="fontGrey2">
-        <span class="mr130">发布时间：<%=format_time(exercise.publish_time.to_s) %></span>
+        <% unless exercise.publish_time.nil? %>
-        <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s) %></span>
+            <span class="mr100">发布时间：<%=Time.parse(h(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") %></span>
-        <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
+        <span class="mr100">截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") %></span>
+        <% if exercise.time != -1 %>
+            <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
       </div>
       <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
       <div class="cl"></div>
@@ -92,7 +96,7 @@
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first%>
                 </div>
                 <div class="cl"></div>
                 <div>

app/views/exercise/_exercises_list.html.erb

@@ -1,25 +1,25 @@
-<div class="polls_head">
+<div class="polls_head" style="width:730px;">
-  <h2>所有试卷
+  <h2>所有试卷
-    <span>（<%= @obj_count%>）</span>
+    <span>（<%= @obj_count%>）</span>
-  </h2>
+  </h2>
-  <% if @is_teacher%>
+  <% if @is_teacher%>
-      <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%>
+      <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%>
-      <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %>
+      <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %>
-  <% end%>
+  <% end%>
-</div>
+</div>
-<div class="cl"></div>
+<div class="cl"></div>
-<div id="polls_list" class="polls_list">
+<div id="polls_list" class="polls_list">
-
+
-  <% @exercises.each do |exercise|%>
+  <% @exercises.each_with_index do |exercise,index|%>
-      <ul id="exercises_<%= exercise.id %>" class="polls_list_ul">
+      <ul id="exercises_<%= exercise.id %>" class="polls_list_ul">
-        <%= render :partial => 'exercise', :locals => {:exercise => exercise} %>
+        <%= render :partial => 'exercise', :locals => {:exercise => exercise,:index => index} %>
-      </ul>
+      </ul>
-      <div class="cl"></div>
+      <div class="cl"></div>
-  <% end%>
+  <% end%>
-
+
-  <ul class="wlist">
+  <ul class="wlist">
-    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-  </ul>
+  </ul>
-
+
-  <div class="cl"></div>
+  <div class="cl"></div>
 </div><!--列表end-->

app/views/exercise/_new_MC.html.erb

@@ -1,60 +1,62 @@
-<%= form_for(ExerciseQuestion.new,
+<%= form_for(ExerciseQuestion.new,
-             :html => { :multipart => true },
+             :html => { :multipart => true },
-             :url=>create_exercise_question_exercise_path(exercise.id),
+             :url=>create_exercise_question_exercise_path(exercise.id),
-             :remote=>true ) do |f| %>
+             :remote=>true ) do |f| %>
-<div class="questionContainer">
+<div class="questionContainer">
-  <div class="ur_editor_title">
+  <div class="ur_editor_title">
-    <label>问题：&nbsp;&nbsp;</label>
+    <label>问题：&nbsp;&nbsp;</label>
-    <input name="question_type" value="1" type="hidden">
+    <input name="question_type" value="1" type="hidden">
-    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text">
+    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text">
-  </div>
+  </div>
-  <div class="ur_editor_content">
+  <div class="ur_editor_content">
-    <ul>
+    <ul>
-      <li class="ur_item">
+      <li class="ur_item">
-        <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %>
+        <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %>
-         <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+         <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-         <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
+         <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
-      </li>
+      </li>
-      <div class="cl"></div>
+      <div class="cl"></div>
-      <li class="ur_item">
+      <div>
-        <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
+            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+          <div class="cl"></div>
-        <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
+            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+          <div class="cl"></div>
-        <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
+            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+          <div class="cl"></div>
-        <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
+            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+      </div>
-        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+      <div class="cl"></div>
-        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text">
+      <li class="ur_item">
-      </li>
+        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-      <div class="cl"></div>
+        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text">
-    </ul>
+      </li>
-  </div>
+      <div class="cl"></div>
-  <div class="ur_editor_footer">
+    </ul>
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);"> 保存 </a>
+  </div>
-    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
+  <div class="ur_editor_footer">
-  </div>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);"> 保存 </a>
-  <div class="cl"></div>
+    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
-</div>
+  </div>
+  <div class="cl"></div>
+</div>
 <% end %>

app/views/exercise/_new_MCQ.html.erb

@@ -1,60 +1,62 @@
-<%= form_for(ExerciseQuestion.new,
+<%= form_for(ExerciseQuestion.new,
-             :html => { :multipart => true },
+             :html => { :multipart => true },
-             :url=>create_exercise_question_exercise_path(exercise.id),
+             :url=>create_exercise_question_exercise_path(exercise.id),
-             :remote=>true ) do |f| %>
+             :remote=>true ) do |f| %>
-<div class="questionContainer">
+<div class="questionContainer">
-  <div class="ur_editor_title">
+  <div class="ur_editor_title">
-    <label>问题：&nbsp;&nbsp;</label>
+    <label>问题：&nbsp;&nbsp;</label>
-    <input name="question_type" value="2" type="hidden">
+    <input name="question_type" value="2" type="hidden">
-    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text">
+    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text">
-  </div>
+  </div>
-  <div class="ur_editor_content">
+  <div class="ur_editor_content">
-    <ul>
+    <ul>
-      <li class="ur_item">
+      <li class="ur_item">
-        <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
+        <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
-        <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
+        <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
-      </li>
+      </li>
-      <div class="cl"></div>
+      <div class="cl"></div>
-      <li class="ur_item">
+      <div>
-        <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
+            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+          <div class="cl"></div>
-        <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
+            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+          <div class="cl"></div>
-        <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
+            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+          <div class="cl"></div>
-        <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
+            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+      </div>
-        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+      <div class="cl"></div>
-        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">
+      <li class="ur_item">
-      </li>
+        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-      <div class="cl"></div>
+        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">
-    </ul>
+      </li>
-  </div>
+      <div class="cl"></div>
-  <div class="ur_editor_footer">
+    </ul>
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);"> 保存 </a>
+  </div>
-    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
+  <div class="ur_editor_footer">
-  </div>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);"> 保存 </a>
-  <div class="cl"></div>
+    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
-</div>
+  </div>
+  <div class="cl"></div>
+</div>
 <% end %>

app/views/exercise/_new_single.html.erb

@@ -8,7 +8,7 @@
     <input name="question_type" value="3" type="hidden">
     <input maxlength="250" class="questionTitle" name="question_title" id="poll_questions_title" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text">
   </div>
-  <div class="ur_editor_content">
+  <div class="ur_editor_content" id="new_single">
     <ul>
       <li class="ur_item">
         <% score = exercise.exercise_questions.where("question_type=3").last.nil? ? "": exercise.exercise_questions.where("question_type=3").last.question_score %>
@@ -16,26 +16,28 @@
         <input id="question_score" value="<%= score%>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
       </li>
       <div class="cl"></div>
-      <li class="ur_item">
+      <div>
-        <label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input  name="exercise_choice[0]" placeholder="请输入候选答案一" type="text">
+            <label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+            <input  class="candiate_answer" name="exercise_choice[0]" placeholder="请输入候选答案一" type="text">
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+          <div class="cl"></div>
-        <label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input  name="exercise_choice[1]" placeholder="请输入候选答案二（选填）" type="text">
+            <label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+            <input  class="candiate_answer" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）" type="text">
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      <div class="cl"></div>
+          </li>
-      <li class="ur_item">
+          <div class="cl"></div>
-        <label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+          <li class="ur_item">
-        <input  name="exercise_choice[2]" placeholder="请输入候选答案三（选填）" type="text">
+            <label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+            <input  class="candiate_answer" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）" type="text">
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+            <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
-      </li>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+      </div>
       <div class="cl"></div>
     </ul>
   </div>

app/views/exercise/_show_MC.html.erb

@@ -1,111 +1,111 @@
-<div>
+<div>
-  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
+  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-    <%= exercise_question.question_title %>
+    <%= exercise_question.question_title %>
-    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
+    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
-  </div>
+  </div>
-
+
-  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
-              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
-  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
-  <a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
+  <a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
-  <div class="cl"></div>
+  <div class="cl"></div>
-  <div class="ur_inputs">
+  <div class="ur_inputs">
-    <table class="ur_table"  style="width:675px;">
+    <table class="ur_table"  style="width:675px;">
-      <tbody>
+      <tbody>
-      <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+      <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
-          <tr>
+          <tr>
-            <td>
+            <td>
-              <label>
+              <label>
-                <input class="ur_radio" type="radio" name="<%= exercise_question %>" value="<%= exercise_choice.choice_text%>" >
+                <input class="ur_radio" type="radio" name="<%= exercise_question %>" value="<%= exercise_choice.choice_text%>" >
-                <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+                <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
-              </label>
+              </label>
-            </td>
+            </td>
-          </tr>
+          </tr>
-      <% end %>
+      <% end %>
-      </tbody>
+      </tbody>
-    </table>
+    </table>
-  </div>
+  </div>
-</div><!--单选题显示 end-->
+</div><!--单选题显示 end-->
-<!-- 新增问题 -->
+<!-- 新增问题 -->
-<div id="insert_new_poll_question_mc_<%=exercise_question.id%>">
+<div id="insert_new_poll_question_mc_<%=exercise_question.id%>">
-</div>
+</div>
-
+
-<script type="text/javascript">
+<script type="text/javascript">
-    function insert_MC(quest_type,quest_num,quest_id){
+    function insert_MC(quest_type,quest_num,quest_id){
-        var forms = $("form.new_exercise_question");
+        var forms = $("form.new_exercise_question");
-        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
+        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
-            if(forms.length > 0){
+            if(forms.length > 0){
-                alert("请先保存正在编辑的题目再新建。");
+                alert("请先保存正在编辑的题目再新建。");
-            } else{
+            } else{
-                <% score =exercise_question.question_score %>
+                <% score =exercise_question.question_score %>
-                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
-                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
-                                '<div class="ur_editor_title"> '+
+                                '<div class="ur_editor_title"> '+
-                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
-                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
-                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
-                                '<input type="hidden" name="question_type" value="1"/>'+
+                                '<input type="hidden" name="question_type" value="1"/>'+
-                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text"/>'+
+                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text"/>'+
-                                '</div>'+
+                                '</div>'+
-                                '<div class="ur_editor_content">'+
+                                '<div class="ur_editor_content">'+
-                                '<ul>'+
+                                '<ul>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input value="<%=score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '<input value="<%=score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                                '</li>'+
+                                '</li><div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
+                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
+                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
+                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
+                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li></div>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A，在此输入A即可" type="text">'+
+                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A，在此输入A即可" type="text">'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '</ul>'+
+                                '</ul>'+
-                                '</div>'+
+                                '</div>'+
-                                '<div class="ur_editor_footer">'+
+                                '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);">'+
-                                '保存'+
+                                '保存'+
-                                '</a>'+
+                                '</a>'+
-                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
-                                '<%= l(:button_cancel)%>'+
+                                '<%= l(:button_cancel)%>'+
-                                '</a>'+
+                                '</a>'+
-                                '</div>'+
+                                '</div>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '</div>'+
+                                '</div>'+
-                                '<% end%>'
+                                '<% end%>'
-                );
+                );
-                $("#poll_questions_title").focus();
+                $("#poll_questions_title").focus();
-                }
+                }
-       }
+       }
-        else {
+        else {
-            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
+            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
-        }
+        }
-    }
+    }
 </script>

app/views/exercise/_show_MCQ.html.erb

@@ -1,109 +1,109 @@
-<div>
+<div>
-  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
+  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-    <%= exercise_question.question_title %>
+    <%= exercise_question.question_title %>
-    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
+    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
-  </div>
+  </div>
-  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
-              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de",:title => "删除")  %>
-  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
-  <a class='ur_icon_add' title='向下插入' id="add_mcq_<%=exercise_question.id%>" onclick="dismiss('mcq',<%=exercise_question.id%>);insert_MCQ('mcq',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
+  <a class='ur_icon_add' title='向下插入' id="add_mcq_<%=exercise_question.id%>" onclick="dismiss('mcq',<%=exercise_question.id%>);insert_MCQ('mcq',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
-  <div class="cl"></div>
+  <div class="cl"></div>
-  <div class="ur_inputs">
+  <div class="ur_inputs">
-    <table class="ur_table" style="width:675px;">
+    <table class="ur_table" style="width:675px;">
-      <tbody>
+      <tbody>
-      <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+      <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
-          <tr>
+          <tr>
-            <td>
+            <td>
-              <label>
+              <label>
-                <input class="ur_radio" type="checkbox" name="<%= exercise_question  %>" value="<%= exercise_choice.choice_text%>" >
+                <input class="ur_radio" type="checkbox" name="<%= exercise_question  %>" value="<%= exercise_choice.choice_text%>" >
-                <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+                <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
-              </label>
+              </label>
-            </td>
+            </td>
-          </tr>
+          </tr>
-      <% end %>
+      <% end %>
-      </tbody>
+      </tbody>
-    </table>
+    </table>
-  </div>
+  </div>
-</div><!--多选题显示 end-->
+</div><!--多选题显示 end-->
-<!-- 新增问题 -->
+<!-- 新增问题 -->
-<div id="insert_new_poll_question_mcq_<%=exercise_question.id%>">
+<div id="insert_new_poll_question_mcq_<%=exercise_question.id%>">
-</div>
+</div>
-
+
-<script type="text/javascript">
+<script type="text/javascript">
-    function insert_MCQ(quest_type,quest_num,quest_id){
+    function insert_MCQ(quest_type,quest_num,quest_id){
-        var forms = $("form.new_exercise_question");
+        var forms = $("form.new_exercise_question");
-        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == ""){
+        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == ""){
-            if(forms.length > 0){
+            if(forms.length > 0){
-                alert("请先保存正在编辑的题目再新建。");
+                alert("请先保存正在编辑的题目再新建。");
-            } else {
+            } else {
-                <% score =exercise_question.question_score %>
+                <% score =exercise_question.question_score %>
-                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
-                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
-                                '<div class="ur_editor_title"> '+
+                                '<div class="ur_editor_title"> '+
-                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
-                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
-                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
-                                '<input type="hidden" name="question_type" value="2"/>'+
+                                '<input type="hidden" name="question_type" value="2"/>'+
-                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text"/>'+
+                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text"/>'+
-                                '</div>'+
+                                '</div>'+
-                                '<div class="ur_editor_content">'+
+                                '<div class="ur_editor_content">'+
-                                '<ul>'+
+                                '<ul>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                                '</li>'+
+                                '</li><div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
+                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
+                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
+                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
+                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li></div>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">'+
+                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '</ul>'+
+                                '</ul>'+
-                                '</div>'+
+                                '</div>'+
-                                '<div class="ur_editor_footer">'+
+                                '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);">'+
-                                '保存'+
+                                '保存'+
-                                '</a>'+
+                                '</a>'+
-                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
-                                '<%= l(:button_cancel)%>'+
+                                '<%= l(:button_cancel)%>'+
-                                '</a>'+
+                                '</a>'+
-                                '</div>'+
+                                '</div>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '</div>'+
+                                '</div>'+
-                                '<% end%>'
+                                '<% end%>'
-                );
+                );
-                $("#poll_questions_title").focus();
+                $("#poll_questions_title").focus();
-        }
+        }
-        }else {
+        }else {
-            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
+            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
-        }
+        }
-    }
+    }
 </script>

app/views/exercise/_show_head.html.erb

@@ -3,10 +3,14 @@
   <!--  <a class='ur_icon_add' title='导入' id="import_btn" onclick="importPoll();"></a> -->
   <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
   <div class="fontGrey2">
-    <span class="mr100">发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
+    <% unless exercise.publish_time.nil? %>
-    <span class="mr100">截止时间：<%=Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %></span>
+        <span class="mr100">发布时间：<%=Time.parse(h(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
-    <span>测验时长：<%= exercise.time %>分钟</span></div>
+    <% end %>
-  <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
+    <span class="mr100">截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %></span>
-  <div class="cl"></div>
+    <% if exercise.time != -1 %>
+        <span>测验时长：<%= exercise.time %>分钟</span>
+    <% end %>
+  </div>
+  <pre class="fontGrey2 font_cus"><%= exercise.exercise_description.nil? ? "" :exercise.exercise_description.html_safe%></pre>
   <div class="cl"></div>
 </div>

app/views/exercise/_show_single.html.erb

@@ -1,85 +1,85 @@
-<div>
+<div>
-  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
+  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-    <%= exercise_question.question_title %>
+    <%= exercise_question.question_title %>
-  </div>
+  </div>
-  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
-              method: :delete, :confirm => l(:text_are_you_sure), :remote => true,  :class => "ur_icon_de") %>
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true,  :class => "ur_icon_de",:title => "删除") %>
-  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
-  <a class='ur_icon_add' title='向下插入' id="add_single_<%=exercise_question.id%>" onclick="dismiss('single',<%=exercise_question.id%>);insert_SINGLE('single',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
+  <a class='ur_icon_add' title='向下插入' id="add_single_<%=exercise_question.id%>" onclick="dismiss('single',<%=exercise_question.id%>);insert_SINGLE('single',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
-  <div class="cl"></div>
+  <div class="cl"></div>
-  <div>
+  <div>
-    <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
+    <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
-        候选答案：<%= exercise_choice.answer_text%><br />
+        候选答案：<%= exercise_choice.answer_text%><br />
-    <% end %>
+    <% end %>
-  </div>
+  </div>
-</div>
+</div>
-<!-- 新增问题 -->
+<!-- 新增问题 -->
-<div id="insert_new_poll_question_single_<%=exercise_question.id%>">
+<div id="insert_new_poll_question_single_<%=exercise_question.id%>">
-</div>
+</div>
-
+
-<script type="text/javascript">
+<script type="text/javascript">
-    function insert_SINGLE(quest_type,quest_num,quest_id){
+    function insert_SINGLE(quest_type,quest_num,quest_id){
-        var forms = $("form.new_exercise_question");
+        var forms = $("form.new_exercise_question");
-        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
+        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
-            if(forms.length > 0){
+            if(forms.length > 0){
-                alert("请先保存正在编辑的题目再新建。");
+                alert("请先保存正在编辑的题目再新建。");
-            } else {
+            } else {
-                <% score =exercise_question.question_score %>
+                <% score =exercise_question.question_score %>
-                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
-                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
-                                '<div class="ur_editor_title"> '+
+                                '<div class="ur_editor_title"> '+
-                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
-                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
-                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
-                                '<input type="hidden" name="question_type" value="3"/>'+
+                                '<input type="hidden" name="question_type" value="3"/>'+
-                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text"/>'+
+                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text"/>'+
-                                '</div>'+
+                                '</div>'+
-                                '<div class="ur_editor_content">'+
+                                '<div class="ur_editor_content" id="new_single">'+
-                                '<ul>'+
+                                '<ul>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                                '</li>'+
+                                '</li><div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="text" name="exercise_choice[0]" placeholder="请输入候选答案一"/>'+
+                                '<input class="candiate_answer" type="text" name="exercise_choice[0]" placeholder="请输入候选答案一"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
-                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="text" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）"/>'+
+                                '<input class="candiate_answer" type="text" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
-                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
+                                '<li class="ur_item">'+
-                                '<label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）"/>'+
+                                '<input class="candiate_answer" type="text" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
-                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li></div>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '</ul>'+
+                                '</ul>'+
-                                '</div>'+
+                                '</div>'+
-                                '<div class="ur_editor_footer">'+
+                                '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);">'+
-                                '保存'+
+                                '保存'+
-                                '</a>'+
+                                '</a>'+
-                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
-                                '<%= l(:button_cancel)%>'+
+                                '<%= l(:button_cancel)%>'+
-                                '</a>'+
+                                '</a>'+
-                                '</div>'+
+                                '</div>'+
-                                '<div class="cl"></div>'+
+                                '<div class="cl"></div>'+
-                                '</div>'+
+                                '</div>'+
-                                '<% end%>'
+                                '<% end%>'
-                );
+                );
-                $("#poll_questions_title").focus();
+                $("#poll_questions_title").focus();
-            }
+            }
-        } else {
+        } else {
-            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
+            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
-        }
+        }
-    }
+    }
 </script>

app/views/exercise/_student_exercise.html.erb

@@ -44,7 +44,13 @@
             <li>
               <ul class="mt10 fl">
                 <li class="hworkStName mr15 mt16" title="姓名">
-                  <%= exercise.user.show_name%>
+                  <% name = exercise.user.show_name %>
+                  <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
+                    <%= link_to name,show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>
+                  <% else %>
+                    <span title="截止日期未到，暂不能查看学生答题结果。"><%=name%></span>
+                      <%#= link_to name,'',:title=>"截止日期未到，暂不能查看学生答题结果。" %>
+                  <% end %>
                 </li>
                 <li class="hworkStID mr10 mt16" title="学号">
                   <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>

app/views/exercise/commit_exercise.js.erb

@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status,:exercise =>@exercise}) %>');
 showModal('ajax-modal', '270px');
 $('#ajax-modal').css('height','110px');
 $('#ajax-modal').siblings().remove();

app/views/exercise/index.html.erb

@@ -1,63 +1,68 @@
-<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
-<script type="text/javascript">
+<script type="text/javascript">
-    function republish_exercise(exercise_id)
+    $(function(){
-    {
+        $("#RSide").css("width","730px");
-        $('#ajax-modal').html("<div id='popbox02'>" +
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
-                "<div class='upload_con'>" +
+        $("#Container").css("width","1000px");
-                "<div class='upload_box'>" +
+    });
-                "<p class='polls_box_p'>取消发布后学生答题将会被清空<br />是否确定取消发布该测验？</p>" +
+    function republish_exercise(exercise_id,index)
-                "<div class='polls_btn_box'>" +
+    {
-                "<a href='/exercise/"+ exercise_id +"/republish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+        $('#ajax-modal').html("<div id='popbox02'>" +
-                "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                "<div class='upload_con'>" +
-                "</div>" +
+                "<div class='upload_box'>" +
-                "<div class='cl'></div>" +
+                "<p class='polls_box_p'>取消发布后学生答题将会被清空<br />是否确定取消发布该测验？</p>" +
-                "</div>" +
+                "<div class='polls_btn_box'>" +
-                "</div>" +
+                "<a href='/exercise/"+ exercise_id +"/republish_exercise?index="+index+"' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
-                "</div>");
+                "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
-        showModal('ajax-modal', '310px');
+                "</div>" +
-        $('#ajax-modal').css('height','120px');
+                "<div class='cl'></div>" +
-        $('#ajax-modal').siblings().remove();
+                "</div>" +
-        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                "</div>" +
-                "<a onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+                "</div>");
-        $('#ajax-modal').parent().removeClass("alert_praise");
+        showModal('ajax-modal', '310px');
-        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').css('height','120px');
-        $('#ajax-modal').parent().addClass("popbox_polls");
+        $('#ajax-modal').siblings().remove();
-    }
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-
+                "<a onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-    function clickCanel(){hideModal("#popbox02");}
+        $('#ajax-modal').parent().removeClass("alert_praise");
-
+        $('#ajax-modal').parent().css("top","").css("left","");
-    function exercise_submit(exercise_id,exercise_name)
+        $('#ajax-modal').parent().addClass("popbox_polls");
-    {
+    }
-        if(exercise_name == 0)
+
-        {
+    function clickCanel(){hideModal("#popbox02");}
-            alert("试卷标题不能为空");
+
-        }
+    function exercise_submit(exercise_id,exercise_name,index)
-        else
+    {
-        {
+        if(exercise_name == 0)
-            $('#ajax-modal').html("<div id='popbox02'>" +
+        {
-                    "<div class='upload_con'>" +
+            alert("试卷标题不能为空");
-                    "<div class='upload_box'>" +
+        }
-                    "<p class='polls_box_p'>测验发布后将不能对测验进行修改，<br />是否确定发布该测验？</p>" +
+        else
-                    "<div class='polls_btn_box'>" +
+        {
-                    "<a href='/exercise/"+ exercise_id +"/publish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+            $('#ajax-modal').html("<div id='popbox02'>" +
-                    "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                    "<div class='upload_con'>" +
-                    "</div>" +
+                    "<div class='upload_box'>" +
-                    "<div class='cl'></div>" +
+                    "<p class='polls_box_p'>测验发布后将不能对测验进行修改，<br />是否确定发布该测验？</p>" +
-                    "</div>" +
+                    "<div class='polls_btn_box'>" +
-                    "</div>" +
+                    "<a href='/exercise/"+ exercise_id +"/publish_exercise?index="+index+"' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
-                    "</div>");
+                    "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
-            showModal('ajax-modal', '310px');
+                    "</div>" +
-            $('#ajax-modal').css('height','120px');
+                    "<div class='cl'></div>" +
-            $('#ajax-modal').siblings().remove();
+                    "</div>" +
-            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                    "</div>" +
-                    "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+                    "</div>");
-            $('#ajax-modal').parent().removeClass("alert_praise");
+            showModal('ajax-modal', '310px');
-            $('#ajax-modal').parent().css("top","").css("left","");
+            $('#ajax-modal').css('height','120px');
-            $('#ajax-modal').parent().addClass("popbox_polls");
+            $('#ajax-modal').siblings().remove();
-        }
+            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-    }
+                    "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-
+            $('#ajax-modal').parent().removeClass("alert_praise");
-</script>
+            $('#ajax-modal').parent().css("top","").css("left","");
-<div class="polls_content02" id="exercise">
+            $('#ajax-modal').parent().addClass("popbox_polls");
-  <%= render :partial => 'exercises_list'%>
+        }
+    }
+
+</script>
+<div class="polls_content02" id="exercise" style="width: 730px;">
+  <%= render :partial => 'exercises_list'%>
 </div><!--问卷内容end-->

app/views/exercise/publish_exercise.js.erb

@@ -1,4 +1,4 @@
-$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise}) %>");
+$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index =>@index}) %>");
 $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>");
 showModal('ajax-modal', '250px');
 //$('#ajax-modal').css('height','111px');

app/views/exercise/republish_exercise.js.erb

@@ -1,4 +1,4 @@
-$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise}) %>");
+$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index => @index}) %>");
 $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>");
 showModal('ajax-modal', '250px');
 //$('#ajax-modal').css('height','80px');

app/views/exercise/show.html.erb

@@ -5,6 +5,6 @@
     <% if @can_edit_excercise %>
         <%=render :partial => 'exercise_student', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user} %>
     <% else %>
-        <%=render :partial => 'exercise_student_result', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user} %>
+        <%=render :partial => 'exercise_student_result', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user,:user=>User.current} %>
     <% end %>
 <% end %>

app/views/exercise/show_student_result.html.erb

@@ -0,0 +1 @@
+<%=render :partial => 'exercise_student_result', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user,:user =>@user} %>

app/views/exercise/student_exercise_list.html.erb

@@ -73,7 +73,7 @@
             <ul>
               <% @all_exercises.each_with_index do |exercise,index |%>
                   <li class="pr10">
-                    <%= link_to "作业#{@all_exercises.count - index}：#{exercise.exercise_name}",''%>
+                    <%= link_to "测验#{@all_exercises.count - index}：#{exercise.exercise_name}",student_exercise_list_exercise_path(exercise.id,:course_id => @course.id)%>
                     <%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
                   </li>
               <% end%>

app/views/forums/_show_topics.html.erb

@@ -16,7 +16,7 @@
                   <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
                   <div class="postDetailDate"><%= format_date(topic.last_reply.created_at)%></div>
               <% end%>
-
+              <span class=" fr" style="color: #888888; font-size: 12px;">更新时间：<%= format_date(topic.updated_at)%></span>
             </div>
             <div class="postDetailReply">
               <a href="<%= forum_memo_path(topic.forum, topic)%>" class="postReplyIcon mr5" target="_blank"></a>

app/views/forums/show.html.erb

@@ -3,7 +3,7 @@
 <div class="postRightContainer">
   <div id="create_memo_div" style="display: none">
     <div id="error" class="red fl mb10" style="display: none">error</div>
-    <%= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
+    <%= labelled_form_for(@memo, :url => forum_memos_path(@forum),:remote=>true) do |f|  %>
     <div>
       <textarea type="text" name="memo[subject]" id="memo_subject" maxlength="50" onblur="check_memo_name();" onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子标题"  ></textarea>
       <script>
@@ -112,7 +112,21 @@
         }
         if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
             memo_content.sync();
-            $("#new_memo").submit();
+            $.ajax({
+                url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',
+                type:'post',
+                data:{
+                    'memo[content]':$("#memo_content").val(),
+                    'memo[subject]':$("#memo_subject").val()
+                },
+                success:function(data){
+
+                },
+                error:function(){
+                    alert('请检查当前网络连接')
+                }
+            });
+            //$("#new_memo").submit();
         }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
             $("#error").html("主题和内容不能为空").show();
         }

app/views/homework_common/score_rule_set.js.erb

@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:remote=>true}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:course_activity =>@course_activity,:remote=>true}) %>');
 showModal('ajax-modal', '350px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +

app/views/kaminari/_last_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 
-  <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %>
+  <%= link_to_unless false, t('views.pagination.last').html_safe, url, :remote => remote %>
 

app/views/kaminari/_next_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <li>
-  <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote, :class => "next c_blue" %>
+  <%= link_to_unless false, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote, :class => "next c_blue" %>
 </li>

app/views/kaminari/_paginator.html.erb

@@ -8,8 +8,7 @@
 -%>
 <%= paginator.render do -%>
   <ul id="paginator" class="wlist">
-   <%#= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag  %>
-    <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| -%>
       <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
         <%= page_tag page %>
@@ -17,7 +16,7 @@
         <%= gap_tag %>
       <% end -%>
     <% end -%>
-    <%= next_page_tag unless current_page.last? %>
+    <%= next_page_tag %>
     <!--<%#= last_page_tag unless current_page.last? %>-->
   </ul>
 <% end -%>

app/views/kaminari/_prev_page.html.erb

@@ -7,6 +7,6 @@
     remote:        data-remote
 -%>
 <li >
-  <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote ,:class=>"previous c_blue"%>
+  <%= link_to_unless false, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote ,:class=>"previous c_blue"%>
 </li>
 

app/views/layouts/_logined_header.html.erb

@@ -18,24 +18,24 @@
     </ul>
   </div>
   <script>
-      <% type = type%>
+      <%# type = type%>
-      $(function (){
+//      $(function (){
-          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
+//          if('<%#= type %>' != null && '<%#= type %>' == 'courses' ){
-              $('input:radio[value="courses"]').attr('checked','checked');
+//              $('input:radio[value="courses"]').attr('checked','checked');
-          }
+//          }
-          if('<%= type %>' != null && '<%= type %>' == 'projects' ){
+//          if('<%#= type %>' != null && '<%#= type %>' == 'projects' ){
-              $('input:radio[value="projects"]').attr('checked','checked');
+//              $('input:radio[value="projects"]').attr('checked','checked');
-          }
+//          }
-          if('<%= type %>' != null && '<%= type %>' == 'users' ){
+//          if('<%#= type %>' != null && '<%#= type %>' == 'users' ){
-              $('input:radio[value="users"]').attr('checked','checked');
+//              $('input:radio[value="users"]').attr('checked','checked');
-          }
+//          }
-      });
+//      });
 
       $(function(){
           $("#navHomepageSearchInput").keypress(function(e){
               var name = $.trim($('#navHomepageSearchInput').val());
               if (e.keyCode == '13' && name != "" &&  name.length != 0) {
-                  $('#type').val($('input[type=radio]:checked').val());
+                  //$('#type').val($('input[type=radio]:checked').val());
                   $(this).parent().submit();
               }
           })
@@ -44,7 +44,7 @@
       function search_in_header(obj){
           var name = $.trim($('#navHomepageSearchInput').val());
           if (name != "" &&  name.length != 0) {
-              $('#type').val($('input[type=radio]:checked').val());
+              //$('#type').val($('input[type=radio]:checked').val());
               obj.parent().submit();
           }
       }
@@ -54,28 +54,28 @@
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/>
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户以及资源"/>
-      <input type="hidden" name="search_type" id="type" value=""/>
+      <input type="hidden" name="search_type" id="type" value="all"/>
       <input type="text" style="display: none;"/>
       <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
     <% end %>
-    <div class="navSearchTypeBox" id="navHomepageSearchType">
+    <!--<div class="navSearchTypeBox" id="navHomepageSearchType">-->
-      <div class="fl mr15 mt8">
+      <!--<div class="fl mr15 mt8">-->
-        <input type="radio"  value="courses" name="search_type" checked/>
+        <!--<input type="radio"  value="courses" name="search_type" checked/>-->
-        课程
+        <!--课程-->
-      </div>
+      <!--</div>-->
-      <div class="fl mr15 mt8">
+      <!--<div class="fl mr15 mt8">-->
-        <input type="radio"  value="projects" name="search_type" />
+        <!--<input type="radio"  value="projects" name="search_type" />-->
-        项目
+        <!--项目-->
-      </div>
+      <!--</div>-->
-      <div class="fl mr15 mt8">
+      <!--<div class="fl mr15 mt8">-->
-        <input type="radio" value="users" name="search_type"  />
+        <!--<input type="radio" value="users" name="search_type"  />-->
-        用户
+        <!--用户-->
-      </div>
+      <!--</div>-->
-      <div id="navSearchAlert" class="fr mr10">
+      <!--<div id="navSearchAlert" class="fr mr10">-->
-        <span class="c_red">请选择搜索类型</span>
+        <!--<span class="c_red">请选择搜索类型</span>-->
-      </div>
+      <!--</div>-->
-    </div>
+    <!--</div>-->
   </div>
 
   <div class="navHomepageProfile" id="navHomepageProfile">

app/views/layouts/_unlogin_header.html.erb

@@ -18,23 +18,23 @@
           //  alert(3)
           $(doc).parent().submit();
       }
-      <% type = type%>
+      <!--<%# type = type%>-->
-      $(function (){
+//      $(function (){
-          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
+//          if('<%#= type %>' != null && '<%#= type %>' == 'courses' ){
-              $('input:radio[value="courses"]').attr('checked','checked');
+//              $('input:radio[value="courses"]').attr('checked','checked');
-          }
+//          }
-          if('<%= type %>' != null && '<%= type %>' == 'projects' ){
+//          if('<%#= type %>' != null && '<%#= type %>' == 'projects' ){
-              $('input:radio[value="projects"]').attr('checked','checked');
+//              $('input:radio[value="projects"]').attr('checked','checked');
-          }
+//          }
-          if('<%= type %>' != null && '<%= type %>' == 'users' ){
+//          if('<%#= type %>' != null && '<%#= type %>' == 'users' ){
-              $('input:radio[value="users"]').attr('checked','checked');
+//              $('input:radio[value="users"]').attr('checked','checked');
-          }
+//          }
-      });
+//      });
 
       function search_in_header(obj){
           var name = $.trim($('#navHomepageSearchInput').val());
           if (name != "" &&  name.length != 0) {
-              $('#type').val($('input[type=radio]:checked').val());
+              //$('#type').val($('input[type=radio]:checked').val());
               obj.parent().submit();
           }
       }
@@ -42,7 +42,7 @@
           function search_in_header_I(e,obj){
               var name = $.trim($('#navHomepageSearchInput').val());
               if (e.keyCode == '13' && name != "" &&  name.length != 0) {
-                  $('#type').val($('input[type=radio]:checked').val());
+                  //$('#type').val($('input[type=radio]:checked').val());
                   obj.parent().submit();
               }
           }
@@ -52,28 +52,28 @@
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
+        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户以及资源" onkeypress="search_in_header_I(event,$(this));"/>
-        <input type="hidden" name="search_type" id="type" value=""/>
+        <input type="hidden" name="search_type" id="type" value="all"/>
         <input type="text" style="display: none;"/>
         <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
     <% end %>
-    <div class="navSearchTypeBox" id="navHomepageSearchType">
+    <!--<div class="navSearchTypeBox" id="navHomepageSearchType">-->
-      <div class="fl mr15 mt8">
+      <!--<div class="fl mr15 mt8">-->
-        <input type="radio" value="courses" name="search_type"  checked/>
+        <!--<input type="radio" value="courses" name="search_type"  checked/>-->
-        课程
+        <!--课程-->
-      </div>
+      <!--</div>-->
-      <div class="fl mr15 mt8">
+      <!--<div class="fl mr15 mt8">-->
-        <input type="radio" value="projects" name="search_type" />
+        <!--<input type="radio" value="projects" name="search_type" />-->
-        项目
+        <!--项目-->
-      </div>
+      <!--</div>-->
-      <div class="fl mr15 mt8">
+      <!--<div class="fl mr15 mt8">-->
-        <input type="radio" value="users" name="search_type" />
+        <!--<input type="radio" value="users" name="search_type" />-->
-        用户
+        <!--用户-->
-      </div>
+      <!--</div>-->
-      <div id="navSearchAlert" class="fr mr10">
+      <!--<div id="navSearchAlert" class="fr mr10">-->
-        <span class="c_red">请选择搜索类型</span>
+        <!--<span class="c_red">请选择搜索类型</span>-->
-      </div>
+      <!--</div>-->
-    </div>
+    <!--</div>-->
 
   </div>
   <div id="loginInButton" class="fr ml20">

app/views/layouts/base_courses.html.erb

@@ -136,50 +136,125 @@
       </div>
 
       <div class="subNavBox">
+        <% unless show_nav?(@course.course_activities.count) %>
         <div class="subNav">
           <%= link_to l(:label_activity), course_path(@course), :class => "f14 c_blue02" %>
           <!--暂时不显示课程动态数，优化后在显示-->
           <%= link_to "(#{@course.course_activities.count})", course_path(@course), :class => "subnav_num c_orange"%>
         </div>
+        <% end %>
+        <% unless show_nav?(@course.homework_commons.count) %>
         <div class="subNav">
           <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
           <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
-          <%= link_to( "+#{l(:label_course_homework_new)}", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'subnav_green c_white') if is_teacher %>
+          <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
         </div>
+        <% end %>
+        <% unless show_nav?(@course.news.count) %>
         <div class="subNav">
           <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%>
-          <%= link_to( "+#{l(:label_course_news_new)}", new_course_news_path(@course), :class => 'subnav_green c_white') if is_teacher %>
+          <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
         </div>
+        <% end %>
+        <% unless show_nav?(course_file_num) %>
         <div class="subNav">
           <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %>
           <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
               <!--link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white')-->
-              <a class="subnav_green ml95 c_white" href="javascript:void(0);" onclick="course_files_upload();">+上传资源 </a>
+              <a class="courseMenuSetting" title="上传资源" href="javascript:void(0);" onclick="course_files_upload();"> </a>
           <% end %>
         </div>
+        <% end %>
+        <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "+#{l(:label_message_new)}",course_boards_path(@course, :flag => true, :is_new => 1),:class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
+          <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
         </div>
+        <% end %>
+        <% unless show_nav?(course_feedback_count) %>
         <div class="subNav">
           <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%>
+          <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
         </div>
+        <% end %>
+        <% unless show_nav?(course_poll_count) %>
         <div class="subNav">
           <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%>
           <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %>
-          <%= link_to( "+#{l(:label_new_poll)}", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
+          <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
         </div>
+        <% end %>
+        <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
         <div class="subNav">
           <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%>
           <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %>
-          <%= link_to( "+新建试卷", new_exercise_path(:course_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
+          <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
         </div>
+        <% end %>
+        <%# 工具栏展开 %>
+        <% if @course.homework_commons.count == 0 || @course.news.count == 0 || course_file_num == 0 || course_poll_count == 0 || @course.exercises.count == 0 ||
+             course_feedback_count == 0 || @course.exercises.count == 0 || (@course.boards.first ? @course.boards.first.topics.count : 0) == 0 %>
+            <div class="subNav subNav_jiantou" id="expand_tools_expand" nhtype="toggle4cookie" data-id="expand_tool_more" data-target="#navContentCourse" data-val="retract"><%= l(:label_project_more) %></div>
+            <ul class="navContent" id="navContentCourse">
+              <%= render 'courses/tool_expand', :locals => {:is_teacher => is_teacher, :course_file_num => course_file_num} %>
+            </ul>
+        <% end %>
       </div><!--项目侧导航 end-->
+      <%# 课程贡献榜 %>
       <div class="cl"></div>
+      <% unless contributor_course_scor(@course.id).count == 0 %>
+        <ul class="rankList">
+        <h4>课程活跃度</h4>
+        <% contributor_course_scor(@course.id).each do |contributor_score| %>
+          <% unless contributor_score.total_score ==0 %>
+            <li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %></a>
+              <p><a href="javascript:void:(0);"><%=link_to contributor_score.user.show_name, user_path(contributor_score.user), :title => contributor_score.user.show_name %></a></p>
+              <p><span class="c_green" style="cursor:pointer">
+                <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green"><%= contributor_score.total_score.to_i %></a></span></p>
+              <div  style="display: none" class="numIntro">
+                <% unless contributor_score.resource_num == 0 %>
+                    课程资源：<%= contributor_score.resource_num %><br />
+                <% end %>
+                <% unless contributor_score.message_num == 0 %>
+                    课程讨论：<%= contributor_score.message_num %><br />
+                <% end %>
+                <% unless contributor_score.message_reply_num == 0 %>
+                    评论回复：<%= contributor_score.message_reply_num %><br />
+                <% end %>
+                <% unless contributor_score.journal_num == 0 %>
+                    课程留言：<%= contributor_score.journal_num %><br />
+                <% end %>
+                <% unless contributor_score.news_reply_num == 0 %>
+                    课程通知：<%= contributor_score.news_reply_num %><br />
+                <% end %>
+              </div>
+            </li>
+          <% end %>
+        <% end %>
+        <div class="cl"></div>
+      </ul>
+      <% end %>
+
+      <% hero_homework_scores = hero_homework_score(@course, "desc") %>
+      <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
+        <ul class="rankList">
+          <h4>课程英雄榜</h4>
+          <% hero_homework_scores.each do |student_score| %>
+              <% if student_score.score.to_i != 0 %>
+                  <li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %></a>
+                    <p><a href="javascript:void:(0);"><%=link_to student_score.user.show_name, user_path(student_score.user), :title => student_score.user.show_name %></a></p>
+                    <p><span class="c_red" style="cursor:pointer" title="作业总分：<%= student_score.score  %>"><%= student_score.score.to_i %></span></p>
+                  </li>
+              <% end %>
+          <% end %>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+
       <div class="project_intro">
         <div id="course_description" class="course_description">
           <h4 ><%= l(:label_course_brief_introduction)%>：</h4>
@@ -278,6 +353,16 @@
             $('#ajax-modal').parent().css("top","").css("left","");
             $('#ajax-modal').parent().addClass("popbox_polls");
     }
+//    鼠标经过的时候显示内容
+    function message_titile_show(obj,e)
+    {
+        obj.parent().parent().next("div").show();
+        obj.parent().next("div").css("top",e.pageY).css("left",e.pageX).css("position","absolute");
+    }
+    function message_titile_hide(obj)
+    {
+        obj.parent().parent().next("div").hide();
+    }
 
 </script>
 

app/views/layouts/base_forums.html.erb

@@ -9,7 +9,7 @@
 		<%= favicon %>
 		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', 'nyan','leftside', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
-		<%= javascript_heads %>
+		<%= javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min') %>
     <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'prettify' %>
 		<%= heads_for_theme %>
 
@@ -241,7 +241,8 @@
         </div>
       </div>
     </div>
-
+    <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
+    <div id="ajax-modal" style="display:none;"></div>
     <div class="cl"></div>
     <%= render :partial => 'layouts/footer' %>
     <div class="cl"></div>

app/views/layouts/base_org.html.erb

@@ -18,18 +18,62 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
-
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>
 
 </head>
 <!--add by huang-->
 <body onload="prettyPrint();">
-    <div class="navContainer">
+<div class="orgContainer">
+  <div class="orgNav">
+    <div class="navOrgLogo fl"><a href="javascript:void(0);" onclick="show_homepage(<%= @organization.id %>, <%= @organization.home_id.nil? ? 0 : 1 %>);"><img src="/images/home_logo.png" width="21" height="19" alt="Trustie" class="mt3" /></a></div>
+    <ul>
+      <li class="navOrgMenu fl">
+        <a href="javascript:void(0);"  onclick="show_homepage(<%= @organization.id %>, <%= @organization.home_id.nil? ? 0 : 1 %>);" class="linkGrey8 f14">首页</a>
+        <%#= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %>
+      </li>
       <% if User.current.logged? %>
-          <%= render :partial => 'layouts/logined_header' %>
+        <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
+          <span class="orgMenuArrow" id="orgArrow">
+            <ul class="org_login_list" style="display:none;">
+              <li> <%= link_to "个人主页",user_path(User.current), :class => "linkGrey8", :target => "_blank" %></li>
+              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>
+              <!--<li><%#= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>-->
+          </ul>
+          </span>
+        </li>
+        <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="linkGrey8 f14" id="orgUserName"><%= User.current %></a></li>
+          <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
-          <%= render :partial => 'layouts/unlogin_header' %>
+          <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
+          <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>false) %>" class="linkGrey8 f14 mr15">注册</a></li>
       <% end %>
-    </div>
+    </ul>
+    <!--<div class="navHomepageProfile">
+      <ul>
+        <li class="homepageProfileMenuIcon"><a href="javascript:void(0);">
+          <div class="mt5 mb8"><img src="images/homepageProfileImage.png" width="40" height="40" /></div>
+          </a>
+          <ul class="topnav_login_list" style="display:none;">
+            <li><a href="javascript:void(0);" class="menuGrey">修改资料</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">退出</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div>-->
+  </div>
+</div>
 <div class="cl"></div>
   <div class="homepageContentContainer">
     <div class="homepageContent">
@@ -53,10 +97,12 @@
           <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
           <div class="orgName fl mb5 f14">
             <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
-            <% if @organization.is_public? %>
+            <% if User.current.logged? %>
-                <span class="img_private"><%= l(:label_public)%></span>
+                <% if @organization.is_public? %>
-            <% else %>
+                    <span class="img_private"><%= l(:label_public)%></span>
-                <span class="img_private"><%= l(:label_private)%></span>
+                <% else %>
+                    <span class="img_private"><%= l(:label_private)%></span>
+                <% end %>
             <% end %>
           </div>
 
@@ -75,39 +121,24 @@
 
           <div class="cl"></div>
           <div class="f12 fontGrey3">
-            <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;(
+            <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
-            <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+            <% if User.current.logged? %>
-            )&nbsp;|&nbsp;
+                (
-            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;（<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+                <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
-          </div>
+                )
-        </div>
+            <% end %>
-        <div class="homepageLeftMenuContainer">
+            &nbsp;|&nbsp;
-          <div class="homepageLeftMenuBlock">
+            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
-            <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
+            <% if User.current.logged? %>
+              （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+            <% end %>
           </div>
-          <div class="homepageLeftMenuBlock"><a href="javascript:void(0);" class="homepageMenuText">项目</a>
-          <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
         </div>
-          <div class="homepageLeftMenuCourses borderBottomNone">
+        <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
-            <ul >
+            <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
-              <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
-              <!--<%#= @organization.org_projects.each do |p|%>-->
-              <!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey"><%#= p.name%></a></li>-->
-              <!--<%# end %>-->
-              <!--<li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>-->
-            </ul>
-          </div>
-          <div class="homepageLeftMenuBlock"><a href="javascript:void(0);" class="homepageMenuText">课程</a>
-            <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
-          </div>
-          <div class="homepageLeftMenuCourses borderBottomNone">
-            <ul >
-              <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
-            </ul>
-          </div>
         </div>
       </div>
-      <div class="homepageRight">
+      <div class="homepageRight" style="margin-top:<%= params[:show_homepage].nil? ? '10px':'0px' %>;">
         <%= render_flash_messages %>
         <%= yield %>
         <%= call_hook :view_layouts_base_content %>
@@ -118,13 +149,69 @@
 
     <!--页面底部-->
     <div class="cl"></div>
-    <%= render :partial => 'layouts/footer' %>
+    <div id="Footer">
+      <div class="footerAboutContainer">
+        <ul class="footerAbout">
+          <li class="fl"><a href="<%= about_us_path %>"  class=" f_grey mw20" target="_blank">关于我们</a>|</li>
+          <li class="fl"><a href="<%= agreement_path %>" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+          <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+          <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
+        </ul>
+      </div>
+      <div class="cl"></div>
+
+      <ul class="copyright mt10">
+        <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
+        <li>ICP备09019772</li>
+      </ul>
+    </div>
     <div class="cl"></div>
     <div id="ajax-modal" style="display:none;"></div>
 
     <div id="ajax-indicator" style="display:none;">
       <span><%= l(:label_loading) %></span>
     </div>
+
+    <script type="text/javascript">
+        $("#courseMenu").mouseenter(function(){
+            $("#topnav_course_menu").show();
+        });
+        $("#courseMenu").mouseleave(function(){
+            $("#topnav_course_menu").hide();
+        });
+        $("#projectMenu").mouseenter(function(){
+            $("#topnav_project_menu").show();
+        });
+        $("#projectMenu").mouseleave(function(){
+            $("#topnav_project_menu").hide();
+        });
+
+  function show_homepage(id, has_homepage){
+      if (has_homepage == 1)
+      {
+          window.location.href = "/organizations/" + id + "?show_homepage=1";
+      }
+      else
+      {
+          alert("您还未设置首页！");
+      }
+  }
+    $(document).ready(function(){
+        $("#orgUser,#orgSwitch").click(function(){
+            $(".org_login_list").toggle();
+            if($("#orgArrow").attr("class") == "orgMenuArrow"){
+                $("#orgArrow").attr("class","orgMenuArrow2");
+            }
+            else {
+                $("#orgArrow").attr("class","orgMenuArrow") ;
+            }
+        });
+        if($(".org_login_list").children().click){
+            $(".org_login_list").css("display","none");
+            $("#orgArrow").attr("class","orgMenuArrow");
+        };
+    });
+</script>
 </body>
 </html>
 

app/views/layouts/base_organization.html.erb

@@ -0,0 +1,127 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
+<%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>组织主页</title>
+  <meta charset="utf-8" />
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <link href="css/public.css" rel="stylesheet"   type="text/css" />
+  <link href="css/leftside.css" rel="stylesheet"   type="text/css" />
+  <link href="css/org.css" rel="stylesheet"   type="text/css" />
+  <script src="js/jquery-1.3.2.js" type="text/javascript"></script>
+  <script type="text/javascript" src="js/bootstrap.js"></script>
+  <script>
+      $(document).ready(function(){
+          h1 = $(".homepageLeft").height();
+          if ($("#orgMain").height()< h1) {$("#orgMain").height(h1-42);}
+      })
+  </script>
+</head>
+
+<body>
+<div class="orgContainer">
+  <div class="orgNav">
+    <div class="navOrgLogo fl"><a href="javascript:void(0);"><img src="/images/home_logo.png" width="21" height="19" alt="确实Trustie" class="mt3" /></a></div>
+    <ul>
+      <li class="navOrgMenu fl"><a href="javascript:void(0);" class="linkGrey8 f14">首页</a></li>
+      <li class="navOrgMenu fr"><a href="javascript:void(0);" class="linkGrey8 f14">登录</a></li>
+      <li class="navOrgMenu fr"><a href="javascript:void(0);" class="linkGrey8 f14 mr15">注册</a></li>
+    </ul>
+    <!--<div class="navHomepageProfile">
+      <ul>
+        <li class="homepageProfileMenuIcon"><a href="javascript:void(0);">
+          <div class="mt5 mb8"><img src="images/homepageProfileImage.png" width="40" height="40" /></div>
+          </a>
+          <ul class="topnav_login_list" style="display:none;">
+            <li><a href="javascript:void(0);" class="menuGrey">修改资料</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">退出</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div>-->
+  </div>
+</div>
+<div class="homepageContentContainer">
+  <div class="homepageContent">
+    <div class="homepageLeft">
+      <div class="homepagePortraitContainer">
+        <!--<div class="pr_info_logo fl mr10 mb5">-->
+
+        <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
+          <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
+          <% if User.current.logged?%>
+              <% if User.current.id == @organization.creator_id %>
+                  <div id="edit_org_file_btn" class="none">
+                    <div class="homepageEditProfile">
+                      <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
+                    </div>
+                  </div>
+              <% end %>
+          <% end%>
+        </div>
+        <div class="orgName fl mb5 f14">
+          <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+          <% if @organization.is_public? %>
+              <span class="img_private"><%= l(:label_public)%></span>
+          <% else %>
+              <span class="img_private"><%= l(:label_private)%></span>
+          <% end %>
+        </div>
+
+        <% if User.current.admin_of_org?(@organization) and params[:show_homepage].nil? %>
+            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+        <% end %>
+
+        <div class="cl"></div>
+        <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;(
+          <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+          )&nbsp;|&nbsp;
+          <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;（<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+        </div>
+      </div>
+      <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
+        <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
+      </div>
+    </div>
+    <div class="homepageRight" style="margin-top:0px;">
+      <%= render_flash_messages %>
+      <%= yield %>
+      <%= call_hook :view_layouts_base_content %>
+      <div style="clear:both;"></div>
+    </div>
+  </div>
+</div>
+<div class="cl"></div>
+<div id="Footer">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
+    </ul>
+  </div>
+  <div class="cl"></div>
+
+  <ul class="copyright mt10">
+    <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
+    <li>ICP备09019772</li>
+  </ul>
+</div>
+
+<div id="ajax-modal" style="display:none;"></div>
+
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+</body>
+</html>

app/views/mailer/send_mail_anonymous_comment_open.html.erb

@@ -2,7 +2,7 @@
   <ul style="list-style-type:none; margin:0; padding:0;">
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-          <p><%=link_to @author, user_url(@author) %> 发布的作业：<%=link_to @anonymous_comment_close_name, @anonymous_comment_close_url%> <span style="color: red; padding-left: 10px;">已经开启匿评了！</span></p>
+          <p><%=link_to @author, user_url(@author) %> 发布的作业：<%=link_to @anonymous_comment_close_name, @anonymous_comment_close_url%> <span style="color: red; padding-left: 10px;">已经开启匿评了，请您关注！</span></p>
         </span>
     </li>
   </ul>

app/views/memos/create.js.erb

@@ -0,0 +1 @@
+window.location.href='<%= forum_memo_path(:forum_id=>@memo.forum_id,:id=>@memo.id ) %>'

app/views/memos/edit.html.erb

@@ -13,7 +13,21 @@
               return false;
           }
           memo_content.sync();
-          $("#edit_memo").submit();
+          $.ajax({
+              url:' /forums/'+'<%= @memo.forum_id.to_s %>'+'/memos/<%= @memo.id.to_s%>',
+              type:'put',
+              data:{
+                'memo[subject]':$("#memo_subject").val(),
+                 'memo[content]':$("#memo_content").val()
+              },
+              success:function(data){
+
+              },
+              error:function(){
+                  alert('请检查当前网络连接')
+              }
+          });
+          //$("#edit_memo").submit();
       }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
           $("#error").html("主题不能为空").show();
       }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){

app/views/memos/show.html.erb

@@ -79,6 +79,8 @@
             <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>
         <% end %>
       </div>
+      <div class="cl"></div>
+      <span class=" fr" style="color: #888888; font-size: 12px;">更新时间：<%= format_date(@memo.updated_at)%></span>
     </div>
     <div class="cl"></div>
   </div>

app/views/memos/update.js.erb

@@ -0,0 +1,5 @@
+<% if  @flag%>
+window.location.href='<%= forum_memo_path(:forum_id=>@memo.forum_id,:id=>@memo.id ) %>'
+<%else%>
+$("#error").html('内容填写存在错误');
+<% end %>

app/views/org_document_comments/_new.html.erb

@@ -25,13 +25,14 @@
         $("#document_title").val("");
         org_document_description_editor.html("");
         org_document_description_editor.sync();
-        $('#org_document_editor').hide(); $('#doc_title_hint').hide();
+        $('#org_document_editor').hide();
+        $('#doc_title_hint').hide();
     }
 </script>
 <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
     <div class="resources">
       <div>
-        <input class="postDetailInput fl" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" placeholder="请输入文章标题" />
+        <input class="postDetailInput fl" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题" />
       </div>
       <div id="doc_title_hint"></div>
       <div class="cl"></div>

app/views/org_document_comments/add_reply.js.erb

@@ -1,3 +1,3 @@
 
-$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document, :act => @act}) %>");
+$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
 init_activity_KindEditor_data(<%= @act.id %>,"","87%");