Merge branch 'develop' into sw_new_course

app/controllers/exercise_controller.rb

@@ -1,7 +1,7 @@
 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
 
@@ -34,7 +34,7 @@ class ExerciseController < ApplicationController
       render_403
       return
     end
-    exercise_end = Time.parse(format_time(@exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S")
+    exercise_end = @exercise.end_time > Time.now
     if @exercise.time == -1
       @can_edit_excercise = exercise_end
     else
@@ -59,6 +59,9 @@ 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
@@ -342,10 +345,10 @@ class ExerciseController < ApplicationController
     @exercise = Exercise.find params[:id]
     @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 = []
@@ -359,7 +362,7 @@ 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?) && @exercise.time != -1
+    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
@@ -376,8 +379,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"}
@@ -392,8 +401,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
@@ -422,8 +437,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
@@ -465,7 +486,7 @@ class ExerciseController < ApplicationController
         @exercise.update_attributes(:publish_time => Time.now)
         redirect_to exercise_url(@exercise)
         return
-      elsif Time.parse(@exercise.publish_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") > Time.now.strftime("%Y-%m-%d-%H-%M-%S")
+      elsif @exercise.publish_time > Time.now
         @exercise.update_attributes(:show_result => params[:show_result])
         redirect_to exercise_url(@exercise)
         return
@@ -503,6 +524,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
@@ -513,7 +548,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)
@@ -555,19 +590,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
@@ -586,7 +608,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/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

@@ -38,12 +38,19 @@ class OrgDocumentCommentsController < ApplicationController
       act.update_attributes(:updated_at => @org_document.updated_at)
     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] == 0
+          redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)
+        else
+          redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)
+        end
+      }
     end
   end
 
   def edit
     @org_document = OrgDocumentComment.find(params[:id])
+    @flag = params[:flag]
     @organization = Organization.find(params[:organization_id])
   end
 

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/organizations_controller.rb

@@ -175,4 +175,75 @@ class OrganizationsController < ApplicationController
       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 inner join org_courses on courses.id = org_courses.course_id where org_courses.organization_id != #{@organization.id} and members.user_id = #{User.current.id} and courses.name like '#{condition}'"
+    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}'"
+    user_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 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}'"
+    user_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
+  end
 end

app/controllers/repositories_controller.rb

@@ -34,7 +34,7 @@ class RepositoriesController < ApplicationController
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab]
   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,78 @@ class RepositoriesController < ApplicationController
 
   end
 
+  def forked
+    # 被forked的标识如果不满足单个用户唯一性，则不执行fork
+    if is_sigle_identifier?(User.current, @repository.identifier)
+      # REDO: 那些人有权限forked项目
+      g = Gitlab.client
+      gproject = g.post ("/projects/fork/#{@project.gpid}?user_id=#{User.current.gid}")
+      if gproject
+        copy_project(@project, gproject)
+      end
+    else
+      flash[:notice] = l(:project_gitlab_fork_double_message)
+      redirect_to settings_project_url(@project, :tab => 'repositories')
+    end
+  end
+
+  # copy a project for fork
+  def copy_project(project, gproject)
+    project = Project.new
+    project.name = @project.name
+    project.is_public = @project.is_public
+    project.status = @project.status
+    project.description = @project.description
+    project.hidden_repo = @project.hidden_repo
+    project.user_id = User.current.id
+    project.project_type = 0
+    project.project_new_type = @project.project_new_type
+    project.gpid = gproject.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 +187,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 +315,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 +369,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 +401,7 @@ update
     render :layout => 'base_projects'
   end
 
+
   def revisions
     @changeset_count = @repository.changesets.count
     @changeset_pages = Paginator.new @changeset_count,
@@ -467,8 +585,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

@@ -167,6 +167,18 @@ class StudentWorkController < ApplicationController
   end
 
   def create
+    # 提交作品前先判断是否已经提交
+    @has_commit = false;
+    if hsd_committed_work?(User.current.id, @homework.id)
+      @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
+      @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]
       @submit_result = true
       student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
@@ -499,6 +511,12 @@ class StudentWorkController < ApplicationController
   end
 
   private
+  def hsd_committed_work?(user, homework)
+    sw = StudentWork.where("user_id =? and homework_common_id =?", user, homework).first
+    sw.nil? ? result = false : result = true
+    result
+  end
+
   #获取作业
   def find_homework
     @homework = HomeworkCommon.find params[:homework]

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是否在给定的列表

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/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/models/attachment.rb

@@ -560,4 +560,5 @@ class Attachment < ActiveRecord::Base
       self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id)
     end
   end
+
 end

app/models/comment.rb

@@ -35,7 +35,7 @@ class Comment < ActiveRecord::Base
   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,24 @@ 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
+    unless self.author.allowed_to?(:as_teacher, self.commented.course)
+      course_member_score(self.commented.course.id, self.author_id, "NewReply")
+    end
+  end
+
 end

app/models/course.rb

@@ -40,8 +40,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

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/journals_for_message.rb

@@ -64,7 +64,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 +263,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

@@ -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|
@@ -285,4 +285,16 @@ class Message < ActiveRecord::Base
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE
   end
 
+  # 课程成员得分（英雄榜）
+  def act_as_student_score
+    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

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/user.rb

@@ -153,6 +153,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

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

@@ -5,9 +5,12 @@
   <% 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: green">提交成功!</h3>
       <%= link_to "确定", exercise_index_path(:course_id => @course.id),:class => 'commit'%>
-  <% elsif status == 1 %>
+  <% 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>
+      <h3 style="font-weight: normal;color: red">保存成功!</h3>
-      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
+      <%= 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'%>

app/views/exercise/_edit_head.html.erb

@@ -30,10 +30,11 @@
 <script type="text/javascript">
     function resetHead()
     {
-        $("#exercise_name").val("<%=@exercise.exercise_name%>");
+        $("#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").val("<%=exercise.exercise_description %>");
+        /*$("#exercise_description").text("<%#=exercise.exercise_description.html_safe %>");*/
+        document.getElementById("exercise_description").innerText = <%=exercise.exercise_description.html_safe %>;
     }
 </script>

app/views/exercise/_exercise_form.html.erb

@@ -9,7 +9,7 @@
     var popWindow ; //弹出框的引用
     var importPollPopWindow; //选择导入的弹出框引用
     function edit_head(){
-        $("#polls_description").val($("#polls_description_div").html());
+        $("#exercise_description").val($("#exercise_description_div").html());
     }
     $(function(){
         //点击空白处

app/views/exercise/_exercise_student.html.erb

@@ -3,7 +3,11 @@
         $("#RSide").removeAttr("id");
         $("#homework_page_right").css("min-height",$("#LSide").height()-30);
         $("#Container").css("width","1000px");
-        end_time = <%=exercise.end_time.to_i%>
+        <%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%>);
@@ -100,6 +104,11 @@
                                               {
                                                   obj.checked = false;
                                               }
+                                              if(dataObj.complete == 1) {
+                                                  $("#exercise_submit_btn").html("提交");
+                                              } else {
+                                                  $("#exercise_submit_btn").html("保存");
+                                              }
                                           }
                                       });
                                   }
@@ -154,6 +163,11 @@
                                               {
                                                   obj.checked = false;
                                               }
+                                              if(dataObj.complete == 1) {
+                                                  $("#exercise_submit_btn").html("提交");
+                                              } else {
+                                                  $("#exercise_submit_btn").html("保存");
+                                              }
                                           }
                                       });
                                   }
@@ -196,6 +210,11 @@
                               success: function (data) {
                                   var dataObj = eval(data);
                                   obj.value = dataObj.text;
+                                  if(dataObj.complete == 1) {
+                                      $("#exercise_submit_btn").html("提交");
+                                  } else {
+                                      $("#exercise_submit_btn").html("保存");
+                                  }
                               }
                           });
 
@@ -209,7 +228,7 @@
       <% end %>
     </div>
     <div class="ur_buttons">
-      <%= link_to l(:button_submit),commit_exercise_exercise_path(exercise),:id=>"exercise_submit_btn", :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

@@ -32,8 +32,8 @@
               <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.empty? && !standard_answer.empty? && answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %>
                         √
                     <% else %>
@@ -49,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>
@@ -71,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 !standard_answer.empty? && 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 %>
                         ×
@@ -88,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>
@@ -110,8 +110,8 @@
               <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.empty? && !standard_answer.empty? && standard_answer.include?(answer.first.answer_text) %>
                         √
                     <% else %>
@@ -126,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_teacher.html.erb

@@ -96,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/_show_head.html.erb

@@ -11,7 +11,6 @@
         <span>测验时长：<%= exercise.time %>分钟</span>
     <% end %>
   </div>
-  <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
+  <pre class="fontGrey2 font_cus"><%= exercise.exercise_description.nil? ? "" :exercise.exercise_description.html_safe%></pre>
-  <div class="cl"></div>
   <div class="cl"></div>
 </div>

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/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/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, user_path(contributor_score.user), :title => contributor_score.user %></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 != nil}.nil? %>
+        <ul class="rankList">
+          <h4>课程英雄榜</h4>
+          <% hero_homework_scores.each do |student_score| %>
+              <% unless student_score.score.nil? %>
+                  <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, user_path(student_score.user), :title => student_score.user %></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_org.html.erb

@@ -85,10 +85,24 @@
           <div class="homepageLeftMenuBlock">
             <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
           </div>
-          <div class="homepageLeftMenuBlock"><a href="javascript:void(0);" class="homepageMenuText">项目</a>
+          <div class="homepageLeftMenuBlock">
+            <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
+            <%=link_to "", join_project_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
+            <!--<div class="courseMenu" id="projectMenu">-->
+              <!--<ul>-->
+                <!--<li class="courseMenuIcon" id="projectMenuIcon">-->
+                  <!--<ul class="topnav_course_menu" id="topnav_project_menu" style="line-height:1;">-->
+                    <!--&lt;!&ndash;<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>&ndash;&gt;-->
+                    <!--<li>-->
+                      <!--<%#= link_to "关联项目",join_project_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%>-->
+                    <!--</li>-->
+                  <!--</ul>-->
+                <!--</li>-->
+              <!--</ul>-->
+            <!--</div>-->
           <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
         </div>
-          <div class="homepageLeftMenuCourses borderBottomNone">
+          <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuProjects">
             <ul >
               <%= 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|%>-->
@@ -97,10 +111,25 @@
               <!--<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>
+          <div class="homepageLeftMenuBlock">
+            <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
+            <%=link_to "", join_course_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
+            <%#= link_to "关联课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%>
+            <!--<div class="courseMenu" id="courseMenu">-->
+              <!--<ul>-->
+              <!--<li class="courseMenuIcon" id="courseMenuIcon">-->
+                <!--<ul class="topnav_course_menu" id="topnav_course_menu" style="line-height:1;">-->
+                  <!--&lt;!&ndash;<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>&ndash;&gt;-->
+                  <!--<li>-->
+                    <!--<%#= link_to "关联课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%>-->
+                  <!--</li>-->
+                <!--</ul>-->
+              <!--</li>-->
+            <!--</ul>-->
+            <!--</div>-->
             <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
           </div>
-          <div class="homepageLeftMenuCourses borderBottomNone">
+          <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuCourses">
             <ul >
               <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
             </ul>
@@ -125,6 +154,21 @@
     <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();
+        });
+    </script>
 </body>
 </html>
 

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

@@ -17,7 +17,7 @@
 </div>
 <div class="cl"></div>
 <div>
-<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id),:method => 'put', :id => 'new_org_document_form' do |f| %>
+<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag),:method => 'put', :id => 'new_org_document_form' do |f| %>
     <div class="resources">
       <div>
         <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />

app/views/org_document_comments/show.html.erb

@@ -43,7 +43,7 @@
                     <% end %>
                   </li>
                   <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id), :class => "postOptionLink" %>
+                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :flag => 1), :class => "postOptionLink" %>
                   </li>
                   <li>
                     <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id), :method => 'delete',

app/views/org_member/create.js.erb

@@ -4,4 +4,5 @@
     $("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
     $("#principals_for_new_member").html('');
     $("#org_members_count_id").html("<%= @org.org_members.count %>");
+    $("#not_org_member_search").val("");
 <% end %>

app/views/organizations/_join_course_menu.html.erb

@@ -0,0 +1,99 @@
+<!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">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <link href="css/public.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(){
+          var popupHeight = $(".resourceSharePopup").outerHeight(true);
+          $(".resourceSharePopup").css("marginTop",-popupHeight/2);
+
+
+          $(".resourcePopupClose").click(function(){
+              $(".resourceSharePopup").css("display","none");
+          });
+      });
+  </script>
+
+</head>
+
+<body>
+<div class="resourceSharePopup">
+  <div>
+    <div class="relateText fl">请选择关联到组织的课程</div>
+  </div>
+  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose"></a></div>
+  <div class="fl">
+    <%=form_tag url_for(:controller => 'organizations', :action => 'join_courses', :organization_id => organization_id),:method => 'post', :id => 'join_courses_form', :remote => true,:class=>"resourcesSearchBox" do %>
+      <input type="text" name="courses" placeholder="搜索您已加入的课程的名称" class="searchCourse" />
+      <div id="search_courses_result_list" class="mb8"></div>
+      <div class="courseSendSubmit">
+        <a href="javascript:void(0);" onclick="org_join_courses(<%= organization_id %>);" class="sendSourceText">关联</a>
+      </div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" onclick="cancel_join_courses();" class="sendSourceText">取消</a></div>
+    <% end %>
+  </div>
+
+  <div class="cl"></div>
+  <div>
+  </div>
+  <div class="cl"></div>
+</div>
+
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var page = 1;
+    var count = 0;
+    var maxPage = 0;
+    function search_courses(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'organizations', :action => 'search_courses') %>'+'?name='+ e.target.value,
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询组织
+    $("input[name='courses']").on('input', function (e) {
+        throttle(search_courses,window,e);
+    });
+
+    $(document).ready(function(){
+        $.ajax({
+            url: '<%= url_for(:controller => 'organizations', :action => 'search_courses') %>',
+            type:'get'
+        });
+    });
+    function cancel_join_courses() {
+        $("#join_courses_form input:checked").attr("checked", false);
+        //$("#search_courses_result_list").html("");
+    }
+    function org_join_courses(orgId) {
+        $.ajax({
+            url: "/organizations/"+orgId + "/join_courses?" + $("#join_courses_form").serialize(),
+            type: "post",
+            success: function (data) {
+                $.ajax({
+                    url: "/organizations/" + orgId + "/search_courses?name=" + $("input[name='courses']").val().trim(),
+                    type: "get"
+                });
+            }
+        });
+    }
+</script>
+</body>
+</html>

app/views/organizations/_join_project_menu.html.erb

@@ -0,0 +1,95 @@
+<!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">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <link href="css/public.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(){
+          var popupHeight = $(".resourceSharePopup").outerHeight(true);
+          $(".resourceSharePopup").css("marginTop",-popupHeight/2);
+
+
+          $(".resourcePopupClose").click(function(){
+              $(".resourceSharePopup").css("display","none");
+          });
+      });
+  </script>
+
+</head>
+
+<body>
+<div class="resourceSharePopup">
+  <div>
+    <div class="relateText fl">请选择关联到组织的项目</div>
+  </div>
+  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose"></a></div>
+  <div class="fl">
+    <%=form_tag url_for(:controller => 'organizations', :action => 'join_projects', :organization_id => organization_id),:method => 'post', :id => 'join_projects_form', :remote => true,:class=>"resourcesSearchBox" do %>
+        <input type="text" name="projects" placeholder="搜索您已加入的项目的名称" class="searchCourse" />
+        <div id="search_projects_result_list" class="mb8"></div>
+        <div class="courseSendSubmit">
+          <a href="javascript:void(0);" onclick="org_join_projects(<%= organization_id %>);" class="sendSourceText">关联</a>
+        </div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" onclick="cancel_join_projects();" class="sendSourceText">取消</a></div>
+    <% end %>
+  </div>
+  <div class="cl"></div>
+</div>
+
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var page = 1;
+    var count = 0;
+    var maxPage = 0;
+    function search_projects(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'organizations', :action => 'search_projects') %>'+'?name='+ e.target.value,
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询组织
+    $("input[name='projects']").on('input', function (e) {
+        throttle(search_projects,window,e);
+    });
+
+    $(document).ready(function(){
+        $.ajax({
+            url: '<%= url_for(:controller => 'organizations', :action => 'search_projects') %>',
+            type:'get'
+        });
+    });
+    function cancel_join_projects() {
+        $("#join_projects_form input:checked").attr("checked", false);
+        //$("#search_projects_result_list").html("");
+    }
+    function org_join_projects(orgId) {
+        $.ajax({
+            url: "/organizations/"+orgId + "/join_projects?" + $("#join_projects_form").serialize(),
+            type: "post",
+            success: function (data) {
+                $.ajax({
+                    url: "/organizations/" + orgId + "/search_projects?name=" + $("input[name='projects']").val().trim(),
+                    type: "get"
+                });
+            }
+        });
+    }
+</script>
+</body>
+</html>

app/views/organizations/_org_activities.html.erb

@@ -56,7 +56,7 @@
 <% end %>
 
 <% if org_act_count == 10 %>
-    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>
+    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>
     <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>
 

app/views/organizations/_show_org_document.html.erb

@@ -36,7 +36,7 @@
                     <% end %>
                   </li>
                   <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %>
+                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 0), :class => "postOptionLink" %>
                   </li>
                   <li>
                     <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
@@ -87,7 +87,7 @@
       </ul>
     </div>
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
         <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
       </div>
       <div class="homepagePostReplyInputContainer">

app/views/organizations/join_course_menu.js.erb

@@ -0,0 +1,3 @@
+$('#topnav_course_menu').hide();
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_course_menu', :locals => {:organization_id => @organization.id}) %>');
+$('#ajax-modal').show();

app/views/organizations/join_courses.js.erb

@@ -0,0 +1,5 @@
+$("#homepageLeftMenuCourses").html("");
+$("#homepageLeftMenuCourses").append("<ul>");
+$("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses',
+    :locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1})  %>");
+$("#homepageLeftMenuCourses").append("</ul>");

app/views/organizations/join_project_menu.js.erb

@@ -0,0 +1,3 @@
+$('#topnav_project_menu').hide();
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_project_menu', :locals => {:organization_id => @organization.id}) %>');
+$('#ajax-modal').show();

app/views/organizations/join_projects.js.erb

@@ -0,0 +1,5 @@
+$("#homepageLeftMenuProjects").html("");
+$("#homepageLeftMenuProjects").append("<ul>");
+$("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects',
+    :locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1})  %>");
+$("#homepageLeftMenuProjects").append("</ul>");

app/views/organizations/search_courses.js.erb

@@ -0,0 +1,9 @@
+$("#search_courses_result_list").html("");
+$("#search_courses_result_list").append('<ul class="ml5">');
+
+<% @courses.each do |course|%>
+link = "<li><label><input type='checkbox'class='mr5 fl mt3' name='courseNames[]' value='<%=course.id%>'/><span class='search_org fl'> <%=course.name %> </span></label></li><div class='cl mt5'></div>";
+$("#search_courses_result_list").append(link );
+<%end %>
+$("#search_courses_result_list").append('</ul>')
+

app/views/organizations/search_projects.js.erb

@@ -0,0 +1,9 @@
+$("#search_projects_result_list").html("");
+$("#search_projects_result_list").append('<ul class="ml5">');
+
+<% @projects.each do |project|%>
+    link = "<li><label><input type='checkbox'class='mr5 fl mt3' name='projectNames[]' value='<%=project.id%>'/><span class='search_org fl'> <%=project.name %> </span></label></li><div class='cl mt5'></div>";
+    $("#search_projects_result_list").append(link );
+<%end %>
+$("#search_projects_result_list").append('</ul>')
+

app/views/projects/_development_group.html.erb

@@ -47,7 +47,7 @@
     <% else %>
         <%= link_to l(:project_module_repository),({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => gitlab_repository(@project).identifier}), :class => "f14 c_blue02" %>
     <% end %>
-    <a class="subnav_num">(<%= @project.repositories.count %>)</a>
+    <!--<a class="subnav_num">(<%= @project.repositories.count %>)</a>-->
     <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %>
         <%= link_to "+"+l(:project_gitlab_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %>
     <% end %>

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

@@ -12,11 +12,11 @@
       <span class="pic_add fl mr5 mt3"></span><span class="f14 fontBlue fl">关联组织</span>
       <div class="cl mb5"></div>
       <%= form_tag url_for(:controller => 'org_projects', :action => 'create', :project_id => @project.id), :id => 'join_orgs_for_project', :remote => true do %>
-        <input type="text" name="orgs" class="searchOrg mb5 ml20" placeholder="请输入组织名称" />
+      <input type="text" name="orgs" class="searchOrg mb5 ml20" placeholder="请输入组织名称" />
-        <div id="search_orgs_result_list" class="ml20"></div>
+      <div id="search_orgs_result_list" class="ml20"></div>
-        <ul id="paginator" class="wlist ml20" style="float:none;"></ul>
+      <ul id="paginator" class="wlist ml20" style="float:none;"></ul>
         <a href="javascript:void(0);" class="saveBtn db fl ml20 mr15 mb5" onclick="join_org(<%= @project.id %>);">关联</a>
-        <a href="javascript:void(0);" class="cancelBtn db fl" onclick="cancel_join_orgs();">取消</a>
+      <a href="javascript:void(0);" class="cancelBtn db fl" onclick="cancel_join_orgs();">取消</a>
       <% end %>
     </div>
     <div class="relatedList fr">
@@ -67,9 +67,7 @@
       });
   });
   function cancel_join_orgs() {
-      $("#search_orgs_result_list").html("");
+      $("#join_orgs_for_project input:checked").attr("checked", false);
-      $("#paginator").html("");
-      $("#paginator").css("display", "none");
   }
   function join_org(projectId) {
       $.ajax({

app/views/projects/show.html.erb

@@ -111,4 +111,4 @@
         <% end %>
     <% end %>
 <% end %>
-<%= paginate @events_pages, :left => 3, :right => 3 %>
+<%= paginate @events_pages, :left => 3, :right => 3 %>

app/views/repositories/_breadcrumbs.html.erb

@@ -1,12 +1,12 @@
 <div class="git_usr_title">
+  <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %>
+  /
   <span><%= link_to @repository.identifier.present? ? h(@repository.identifier) : 'root',
                     {:action => 'show', :id => @project,
                      :repository_id => @repository.identifier_param,
                      :path => nil, :rev => @rev },
                      :class => "repository-title-dec"
   %>
-    /
-    <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %>
   </span>
 </div>
 

app/views/repositories/_revisions.html.erb

@@ -13,6 +13,7 @@
         <!--<th><%= l(:field_comments) %></th>-->
       <!--</tr></thead>-->
       <tbody>
+
       <% show_diff = revisions.size > 1 %>
       <% line_num = 1 %>
       <% revisions.each do |changeset| %>
@@ -48,4 +49,9 @@
       <%#= submit_tag(l(:label_view_diff), :name => nil, :class=>"c_blue") if show_diff %>
     </p>
 
+    <ul class="wlist">
+      <%= pagination_links_full commits_pages, commits_count, :per_page_links => false, :remote => false, :flag => true%>
+    </ul>
+
 <% end %>
+

app/views/repositories/changes.html.erb

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

app/views/repositories/forked.html.erb

@@ -0,0 +1,10 @@
+<div class="project_r_h">
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
+</div>
+<%= form_for('forked',:url =>  {:controller => 'repositories', :action => 'forked'},:method => "post") do |f| %>
+    <input type="text" name="repo_name"/>
+    <button type="submit">确定</button>
+<% end %>
+<%= @project.id %>
+<%= @repository.id %>
+<%= User.current %>

app/views/repositories/show.html.erb

@@ -26,21 +26,30 @@
       <a href="javascript:void(0);" class="clone_btn mt5" onclick="jsCopy()"><span class="vl_copy" title="点击复制版本库地址"></span></a>
       <div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
       <div class="fr mt5"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_fork"></span>Fork</a> <span href="javascript:void(0);" class="vl_btn_2 fb">0</span> </div>
+      <!--<div class="fr mt5"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_fork"></span><%= link_to "Fork", :controller => 'repositories', :action => 'forked' %></a> <span href="javascript:void(0);" class="vl_btn_2 fb">0</span> </div>-->
       <div class="cl"></div>
       <div class="recordBanner mt10">
         <% if @changesets && !@changesets.empty? %>
-            <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
+            <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %>
-            <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
+                <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
-                <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
+                <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
-                <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
+                    <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
-            </span>
+                    <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
+                </span>
+            <% else %>
+                 <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
+                    <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
+                    <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
+                </span>
+            <%end%>
         <% end %>
         <span class="fr mr5 "><font class="fb ml2 mr2 vl_branch mt2">
             <%= @repository.branches.count %></font> 个分支
         </span>
 
         <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
-            <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev} %></font> 提交
+            <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font> 提交
+
         </span>
       </div>
   <% end %>

app/views/student_work/_has_commit_work.html.erb

@@ -0,0 +1,24 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <div><p align='center' style='margin-top: 35px'>您已提交过作品，请不要重复提交，如果想修改作品请点击编辑。</p></div>
+    <div class="cl"></div>
+    <div class="ni_btn mt10">
+      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
+        编&nbsp;&nbsp;辑
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 15px;margin-top:15px;" >
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    function clickOK() {
+        window.location.href = '<%= edit_student_work_path(@work.id)%>';
+    }
+    function clickCanel() {
+        hideModal('#popbox02');
+        window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+    }
+</script>

app/views/student_work/create.js.erb

@@ -1,4 +1,12 @@
-<% if @submit_result%>
+<% if @has_commit %>
+    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/has_commit_work') %>');
+    showModal('ajax-modal', '500px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+            "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+    $('#ajax-modal').parent().css("top","").css("left","");
+    $('#ajax-modal').parent().addClass("anonymos");
+<% elsif @submit_result%>
     $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
     showModal('ajax-modal', '500px');
     $('#ajax-modal').siblings().remove();

app/views/student_work/edit.html.erb

@@ -62,10 +62,13 @@
 </div>
 <script type="text/javascript">
     function popupRegex(){
-        $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+        if(regexStudentWorkName()&&regexStudentWorkDescription())
-        showModal('ajax-modal', '500px');
+        {
-        $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-        $('#ajax-modal').parent().css("top","").css("left","");
+            showModal('ajax-modal', '500px');
-        $('#ajax-modal').parent().addClass("anonymos");
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').parent().css("top","").css("left","");
+            $('#ajax-modal').parent().addClass("anonymos");
+        }
     }
 </script>

app/views/student_work/new.html.erb

@@ -121,10 +121,13 @@
 </div>
 <script type="text/javascript">
   function popupRegex(){
-      $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+      if(regexStudentWorkName()&&regexStudentWorkDescription())
-      showModal('ajax-modal', '500px');
+      {
-      $('#ajax-modal').siblings().remove();
+          $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-      $('#ajax-modal').parent().css("top","").css("left","");
+          showModal('ajax-modal', '500px');
-      $('#ajax-modal').parent().addClass("anonymos");
+          $('#ajax-modal').siblings().remove();
+          $('#ajax-modal').parent().css("top","").css("left","");
+          $('#ajax-modal').parent().addClass("anonymos");
+      }
   }
 </script>

app/views/users/user_organizations.html.erb

@@ -6,8 +6,8 @@
       <div class="postBanner" style="padding-bottom:5px;">
         <span class="linkGrey2 f16">组织列表</span>
 
-        <!--<%#= form_tag url_for(:controller => 'users', :action => 'search_user_orgs', :id => User.current.id), :method => 'get', :id => "search_org_form", :class=>"resourcesSearchloadBox", :style=>"float:right; margin-top:-5px;" do %>-->
+        <%#= form_tag url_for(:controller => 'users', :action => 'search_user_orgs', :id => User.current.id), :method => 'get', :id => "search_org_form", :class=>"resourcesSearchloadBox", :style=>"float:right; margin-top:-5px;" do %>
-          <!--<input  type="text" name="search_orgs" placeholder="输入关键词进行搜索" class="problem_search_input fl"/>-->
+          <!--<input type="text" name="search_orgs" placeholder="输入关键词进行搜索" class="searchResource" />-->
 
           <!--&lt;!&ndash;<a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#search_org_form').submit();"></a>&ndash;&gt;-->
             <!--<a href="javascript:void(0);" class="problem_search_btn fl" onclick="$('#search_org_form').submit();">搜索</a>-->

config/configuration.yml

@@ -201,7 +201,7 @@ default:
   judge_server: 'http://judge.trustie.net/'
 
   # Git's url
-  gitlab_address: 'http://git.trustie.net'
+  gitlab_address: 'http://gitfast.trustie.net'
 
 # specific configuration options for production environment
 # that overrides the default ones

config/initializers/gitlab_config.rb

@@ -1,8 +1,8 @@
 Gitlab.configure do |config|
   # config.endpoint       = 'http://192.168.41.130:3000/trustie/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
   # config.private_token  = 'cK15gUDwvt8EEkzwQ_63'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
-  config.endpoint       = 'http://git.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  config.endpoint       = 'http://gitfast.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
-  config.private_token  = 'kZUYYbAY12QSQ2Tx1zes'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  config.private_token  = 'fPc_gBmEiSANve8TCfxW'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
   # Optional
   # config.user_agent   = 'Custom User Agent'          # user agent, default: 'Gitlab Ruby Gem [version]'
   # config.sudo         = 'user'                       # username for sudo mode, default: nil

config/locales/courses/zh.yml

@@ -94,4 +94,6 @@ zh:
   label_user_name: "用户名称"
   #setting end
 
-  label_course_poll: 课程问卷
+  label_course_poll: 课程问卷
+
+  label_homework_committed: 你已经提交过作品，如果你想修改作品的话，可以在作品列表页面对作品信息进行修改。

config/locales/projects/zh.yml

@@ -89,6 +89,8 @@ zh:
   project_module_repository: 版本库
   project_module_create_repository: 创建版本库
   project_gitlab_create_repository: 新版本库
+  project_gitlab_create_double_message: 亲，您已经创建了一个同名的版本库，换个特别点的名字同名的概率就会变小哦~
+  project_gitlab_fork_double_message: 亲，您已经有了一个相同名字的版本库，所以不能fork改版本库~
 
 
   label_project_more: 更多

config/locales/zh.yml

@@ -2081,7 +2081,7 @@ zh:
   label_co_organizer_BHU: 北京航空航天大学
   label_co_organizer_CAS: 中国科学院软件研究所
   label_co_organizer_InforS: 中创软件
-  label_rights_reserved: Copyright  2007~2015, All Rights Riserved
+  label_rights_reserved: Copyright  2007~2015, All Rights Reserved
   label_about_us: 关于我们
   label_contact_us: 联系我们
   label_recruitment_information: 招聘信息

config/routes.rb

@@ -39,6 +39,12 @@ RedmineApp::Application.routes.draw do
       get 'members'
       get 'more_org_projects'
       get 'more_org_courses'
+      get 'search_courses'
+      post 'join_course_menu'
+      post 'join_courses'
+      get 'search_projects'
+      post 'join_project_menu'
+      post 'join_projects'
     end
     collection do
       get 'check_uniq'
@@ -168,6 +174,7 @@ RedmineApp::Application.routes.draw do
       get 'export_exercise'
       get 'publish_exercise'
       get 'republish_exercise'
+      get 'show_student_result'
       post 'create_exercise_question'
       post 'commit_answer'
       post 'commit_exercise'
@@ -637,6 +644,7 @@ RedmineApp::Application.routes.draw do
         # get 'create', :via=>[:get, :post]
       end
     end
+
     match 'wiki/index',  :via => :get
     resources :wiki, :except => [:index, :new, :create], :as => 'wiki_page' do
       member do
@@ -734,6 +742,7 @@ RedmineApp::Application.routes.draw do
 
   get 'projects/:id/repository/changes(/*path(.:ext))', :to => 'repositories#changes'
 
+  get 'projects/:id/repository/forked', :to => 'repositories#forked'
   get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
   get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
   get 'projects/:id/repository/revision', :to => 'repositories#revision'

db/migrate/20151118031602_copy_course_activities_to_org_activities.rb

@@ -1,25 +1,25 @@
 class CopyCourseActivitiesToOrgActivities < ActiveRecord::Migration
   def up
-    # count = CourseActivity.all.count/30 + 1
+    count = CourseActivity.all.count/30 + 1
-    # for i in 1 ... count do
+    for i in 1 ... count do
-    #   transaction do
+      transaction do
-    #     CourseActivity.page(i).per(30).each do |course_act|
+        CourseActivity.page(i).per(30).each do |course_act|
-    #       if course_act.course_act_type == 'Message' && !course_act.course_act.parent_id.nil?
+          if course_act.course_act_type == 'Message' && !course_act.course_act.parent_id.nil?
-    #         org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{course_act.course_act.parent.id}").first
+            org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{course_act.course_act.parent.id}").first
-    #         org_activity.created_at = course_act.created_at
+            org_activity.created_at = course_act.created_at
-    #         org_activity.save
+            org_activity.save
-    #       else
+          else
-    #         OrgActivity.create(:user_id => course_act.user_id,
+            OrgActivity.create(:user_id => course_act.user_id,
-    #                            :org_act_id => course_act.course_act_id,
+                               :org_act_id => course_act.course_act_id,
-    #                            :org_act_type => course_act.course_act_type,
+                               :org_act_type => course_act.course_act_type,
-    #                            :container_id => course_act.course_id,
+                               :container_id => course_act.course_id,
-    #                            :container_type => 'Course',
+                               :container_type => 'Course',
-    #                            :created_at => course_act.created_at,
+                               :created_at => course_act.created_at,
-    #                            :updated_at => course_act.updated_at)
+                               :updated_at => course_act.updated_at)
-    #       end
+          end
-    #     end
+        end
-    #   end
+      end
-    # end
+    end
   end
 
   def down

db/migrate/20151120134208_changecolumn_of_exercise_question.rb

@@ -0,0 +1,9 @@
+class ChangecolumnOfExerciseQuestion < ActiveRecord::Migration
+  def up
+    change_column :exercise_questions, :question_title, :text
+    change_column :exercises, :exercise_name, :text
+  end
+
+  def down
+  end
+end

db/migrate/20151124032319_delete_useless_org_activities.rb

@@ -0,0 +1,18 @@
+class DeleteUselessOrgActivities < ActiveRecord::Migration
+  def up
+    OrgActivity.all.each do |act|
+      if act.container_type == 'Course'
+        if CourseActivity.where("course_act_type=? and course_act_id =? and course_id =?", act.org_act_type, act.org_act_id, act.container_id).count == 0
+          act.destroy
+        end
+      else
+        if act.container_type == 'Project' and ForgeActivity.where("forge_act_type=? and forge_act_id =? and project_id =?", act.org_act_type, act.org_act_id, act.container_id).count == 0
+          act.destroy
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20151125064914_create_course_contributor_scores.rb

@@ -0,0 +1,16 @@
+class CreateCourseContributorScores < ActiveRecord::Migration
+  def change
+    create_table :course_contributor_scores do |t|
+      t.integer :course_id
+      t.integer :user_id
+      t.integer :message_num
+      t.integer :message_reply_num
+      t.integer :news_reply_num
+      t.integer :resource_num
+      t.integer :journal_num
+      t.integer :journal_reply_num
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20151126160252_add_total_score_to_course_contributor_score.rb

@@ -0,0 +1,5 @@
+class AddTotalScoreToCourseContributorScore < ActiveRecord::Migration
+  def change
+    add_column :course_contributor_scores, :total_score, :integer
+  end
+end

db/migrate/20151127011351_add_course_contributor_total_score.rb

@@ -0,0 +1,36 @@
+class AddCourseContributorTotalScore < ActiveRecord::Migration
+  def up
+    # course_count = Course.all.count / 30 + 1
+    # transaction do
+    #   for i in 1 ... course_count do i
+    Course.all.each do |course|
+      if course.course_activities.count > 1
+        course.student.each do |s|
+          puts course.id
+          puts course.name
+          puts s.student_id
+          # board_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?",s.student_id, course.id, "Message").count * 2
+          board_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.student_id} and me.parent_id is null;").count * 2
+          message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.student_id} and me.parent_id is not null").count * 1
+          common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.student_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1
+          # attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5
+          attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.student_id} and container_type ='Course'").count * 5
+          journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.student_id, course.id, "Course").count * 1
+          # journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1
+          # journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1
+          total =   board_count + message_reply_count + common_reply_count + attachment_count + journal_count
+          if total !=0
+            CourseContributorScore.create(:course_id => course.id, :user_id => s.student_id, :message_num => board_count, :message_reply_num => message_reply_count,
+                                          :news_reply_num => common_reply_count, :resource_num => attachment_count, :journal_num => journal_count, :journal_reply_num => 0, :total_score => total)
+          end
+
+        end
+      end
+    end
+    #   end
+    # end
+  end
+
+  def down
+  end
+end

lib/gitlab-cli/lib/gitlab/client/projects.rb

@@ -239,6 +239,12 @@ class Gitlab::Client
       delete("/projects/#{project}/hooks/#{id}")
     end
 
+    # Forks a project into the user namespace of the authenticated user.
+    # @param  [Integer] - The ID of the project to be forked
+    def fork(id)
+      post("/projects/fork/#{id}")
+    end
+
     # Mark this project as forked from the other
     #
     # @example

lib/tasks/sync_sigle_rep.rake

@@ -12,19 +12,15 @@ namespace :sync_rep do
         puts count
         unless count > 1
           rep.identifier
-          puts "################################"
-          puts project.id
-          puts rep.id
           s = Trustie::Gitlab::Sync.new
           s.sync_project(project, path: rep.identifier, import_url: rep.url)
           rep.type = 'Repository::Gitlab'
           rep.save
-          puts "*************************************"
-          puts project.id
-          puts rep.id
-          puts rep.identifier
         end
       end
     end
   end
+
+  task :delete_rep => :environment do
+  end
 end

lib/trustie/gitlab/manage_member.rb

@@ -1,60 +1,63 @@
-#coding=utf-8
+#coding=utf-8
-#
+#
-# 
+# 
-module Trustie
+module Trustie
-  module Gitlab
+  module Gitlab
-
+
-    module ManageMember
+    module ManageMember
-      def self.included(base)
+      def self.included(base)
-        base.class_eval {
+        base.class_eval {
-          before_create :add_gitlab_member
+          before_create :add_gitlab_member
-          before_destroy :delete_gitlab_member
+          before_destroy :delete_gitlab_member
-          after_save :change_gitlab_member
+          after_save :change_gitlab_member
-        }
+        }
-      end
+      end
-
+
-      def change_gitlab_member
+      def change_gitlab_member
-        if isGitlabProject?
+        if isGitlabProject?
-          @g ||= ::Gitlab.client
+          @g ||= ::Gitlab.client
-          @g.edit_team_member(project.gpid, self.member.user.gid, self.role.to_gitlab_role )
+          @g.edit_team_member(project.gpid, self.member.user.gid, self.role.to_gitlab_role )
-        end
+        end
-      end
+      end
-
+
-      def add_gitlab_member
+      def add_gitlab_member
-        if isGitlabProject?
+        if isGitlabProject?
-          @g ||= ::Gitlab.client
+          @g ||= ::Gitlab.client
-          @g.add_team_member(project.gpid, self.member.user.gid, self.role.to_gitlab_role )
+          if self.member.user.gid.nil?
-        end
+            add_user(self.member.user)
-      end
+          end
-
+          @g.add_team_member(project.gpid, self.member.user.gid, self.role.to_gitlab_role )
-      def delete_gitlab_member
+        end
-        if isGitlabProject?
+      end
-          if member.roles.count <=1
+
-              @g ||= ::Gitlab.client
+      def delete_gitlab_member
-              @g.remove_team_member(project.gpid, self.member.user.gid)
+        if isGitlabProject?
-          end
+          if member.roles.count <=1
-        end
+              @g ||= ::Gitlab.client
-      end
+              @g.remove_team_member(project.gpid, self.member.user.gid)
-
+          end
-      private
+        end
-      def project
+      end
-        self.member.project
+
-      end
+      private
-
+      def project
-      def repository
+        self.member.project
-        unless project.nil?
+      end
-          project.repository
+
-        end
+      def repository
-      end
+        unless project.nil?
-
+          project.repository
-      def isGitlabProject?
+        end
-        unless repository.nil?
+      end
-          repository && repository.gitlab?
+
-        end
+      def isGitlabProject?
-      end
+        unless repository.nil?
-
+          repository && repository.gitlab?
-    end
+        end
-
+      end
-  end
+
-end
+    end
-
+
+  end
+end
+

lib/trustie/gitlab/manage_user.rb

@@ -11,7 +11,7 @@ module Trustie
             base.class_eval {
                 #before_create :add_gitlab_user
                 #before_destroy :delete_gitlab_user
-                before_save :change_gitlab_user
+                #before_save :change_gitlab_user
             }
         end
 
@@ -22,10 +22,10 @@ module Trustie
         def delete_gitlab_user
             del_user(self)
         end
-
+        #
-        def change_gitlab_user
+        #def change_gitlab_user
-            change_password(self.gid, self.hashed_password, self.salt)
+        #    change_password(self.gid, self.hashed_password, self.salt)
-        end
+        #end
 
         def g
             @g ||= ::Gitlab.client

lib/trustie/gitlab/sync.rb

@@ -73,11 +73,6 @@ module Trustie
 
             # import url http://xianbo_trustie2:1234@repository.trustie.net/xianbo/trustie2.git
             # can use password
-            puts "@@@@@@@@@@@@@@@@@@@@@@@"
-            puts path
-            puts project.description
-            puts gid
-            puts import_url
             gproject = self.g.create_project(path, 
                             path: path,
                             description: project.description, 
@@ -91,7 +86,6 @@ module Trustie
                             import_url: import_url,
                             visibility_level: project.is_public? ? UserLevel::PUBLIC : UserLevel::PRIVATE
                             )
-            puts "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
             project.gpid = gproject.id
             project.save!
             puts "Successfully created #{project.name}"

public/javascripts/course.js

@@ -1306,3 +1306,60 @@ function cancel_org_course_relation(id, courseId){
 //        alert('<%= @course.id%>')
 //    })
 //})
+
+//项目点击展开
+function expand_tools_expand(content) {
+    if (content == "invit") {
+        $("#expand_tools_expand_invit").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
+        $("#expand_tools_expand_invit").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
+        $("#expand_tools_expand_invit").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+    }
+    else {
+//        $("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
+//        $("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
+//        $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+        $("#navContent").toggle(500);
+    }
+
+    // 修改数字控制速度， slideUp(500)控制卷起速度
+}
+
+//通过cookie存储伸开形式
+$(function(){
+    var personalized_expand_key = "personalized_expand";
+    function personalized_init(){
+        var personalized_map = cookieget(personalized_expand_key);
+        if(personalized_map!=false){
+            personalized_map = JSON.parse(personalized_map);
+            $("*[nhtype='toggle4cookie']").each(function(){
+                var personalized_id=$(this).data('id');
+                var val = personalized_map[personalized_id];
+                if(val!=undefined && val!=$(this).data('val')){
+                    personalized_click($(this),0);
+                }
+            });
+        }
+    }
+    function personalized_click(obj,timeout){
+        var target = $(obj.data('target'));
+        var oldval = obj.data('val');
+        var val='';
+        if(oldval=='expand'){val='retract';}else{val='expand';}
+        obj.data('val',val);
+        var personalized_map = cookieget(personalized_expand_key);
+        if(personalized_map == false){
+            personalized_map={};
+        }else{
+            personalized_map = JSON.parse(personalized_map);
+        }
+        var personalized_id=obj.data('id');
+        personalized_map[personalized_id]=val;
+        cookiesave(personalized_expand_key,JSON.stringify(personalized_map));
+        target.toggle(timeout);
+    }
+    $("*[nhtype='toggle4cookie']").on('click',function(){
+        personalized_click($(this),500);
+    });
+
+    personalized_init();
+});

public/stylesheets/courses.css

@@ -1166,5 +1166,13 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px  no-repeat;}
 .questionEditContainer {border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px; margin-top:10px;}
 .fillInput {border:1px solid #cbcbcb; padding-left:5px; background-color:#ffffff; width:693px; height:30px; color:#888888;}
 .mr130 {margin-right:130px;}
-.mr100 {margin-right:100px;}
+.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; }
-.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; }
+/*20151123课程排行榜Tim*/
+.courseMenuSetting {background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top:3px; float:right; margin-right:5px;}
+.courseMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;}
+.rankList {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;}
+.rankList li {width:73px; padding:8px 0px 0px 0px; text-align:center; float:left; position:relative;}
+.rankList li p {width:100%; overflow:hidden; white-space:normal; text-overflow:ellipsis; color:#585858;word-wrap: normal; word-break: normal;}
+.rankPortrait {border-radius:50%; width:35px; height:35px;}
+.numIntro {position:absolute; text-align:left; z-index:999; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); border:1px solid #eaeaea; background-color:#ffffff; padding:3px 5px; left:15px; color:#585858; white-space: nowrap;}
+.font_cus {font-family: "微软雅黑","宋体"; font-size: 12px; line-height: 1.5;}

public/stylesheets/new_user.css

@@ -384,6 +384,8 @@ a.resourcesGrey:hover {font-size:12px; color:#269ac9;}
 a.uploadText {color:#ffffff; font-size:14px;}
 .resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;}
 .searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}
+.searchCourse {border:none; outline:none; background-color:#ffffff; width:184px; padding-left:10px; display:block; margin-bottom:15px;}
+.searchResource:focus {border:none;}
 .searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
 /*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
 .resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}

public/stylesheets/org.css

@@ -37,16 +37,21 @@ a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;}
 /*项目关联css*/
 .relateOrg {width:335px;}
 .relatedList {width:335px;}
-.searchOrg {height:24px; width:200px; color:#9b9b9b9; border:1px solid #15bccf;}
+.searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;}
 a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;}
 a.cancelBtn:hover {background-color:#717171; color:#ffffff;}
 .relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;}
 .relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
 .relatedListOption {width:80px; text-align:center;}
 .relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;}
+.search_org {width:150px; max-width:200px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;}
 
 /*组织列表*/
 .mt28 {margin-top:28px;}
 .orgWrap {width:880px; float:left;}
 .orgTitle {width:880px; max-width:880px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; }
-.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;}
+.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;}
+
+/*关联项目弹窗*/
+.projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden; width:288px;}
+.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}

public/stylesheets/repository.css

@@ -220,7 +220,7 @@
 .vl_branch {background:url(../images/vlicon/branch_icon.png) 0px -2px no-repeat; padding-left:22px}
 .mt1 {margin-top:1px;}
 .mt2 {margin-top:2px;}
-.commit_content_dec{width: 300px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;}
+.commit_content_dec{width: 200px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;}
 
 /*提交信息列表*/
 .col-md-10 {

spec/factories/course_contributor_scores.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :course_contributor_score do
+    course_id 1
+user_id 1
+message_num 1
+message_reply_num 1
+news_reply_num 1
+resource_num 1
+journal_num 1
+journal_reply_num 1
+  end
+
+end

spec/models/course_contributor_score_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CourseContributorScore, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end