Merge branch 'szzh' into develop

app/controllers/admin_controller.rb

@@ -337,6 +337,19 @@ class AdminController < ApplicationController
       format.html
     end
   end
+
+  #学校列表
+  def schools
+    @school_name = params[:school_name]
+    if @school_name
+      @schools = School.where("name like '%#{@school_name}%'")
+    else
+      @schools = School.all
+    end
+    respond_to do |format|
+      format.html
+    end
+  end
   #移动端版本管理
   def mobile_version
     @versions = PhoneAppVersion.reorder('created_at desc')

app/controllers/homework_common_controller.rb

@@ -18,28 +18,28 @@ class HomeworkCommonController < ApplicationController
   end
 
   def new
-    @homework_type = "1"
-
-    @homework = HomeworkCommon.new
-    @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 0
-    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-
-    if @homework_type == "1"
-      #匿评作业相关属性
-      @homework_detail_manual = HomeworkDetailManual.new
-      @homework_detail_manual.ta_proportion = 0.6
-      @homework_detail_manual.absence_penalty = 0
-      @homework_detail_manual.evaluation_num = 3
-      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-      @homework.homework_detail_manual = @homework_detail_manual
-    elsif @homework_type == "2"
-      #编程作业相关属性
-      @homework_detail_programing = HomeworkDetailPrograming.new
-      @homework.homework_detail_programing = @homework_detail_programing
-    end
+    # @homework_type = "1"
+    #
+    # @homework = HomeworkCommon.new
+    # @homework.safe_attributes = params[:homework_common]
+    # @homework.late_penalty = 0
+    # @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    # @homework.publish_time = Time.now.strftime('%Y-%m-%d')
+    #
+    # if @homework_type == "1"
+    #   #匿评作业相关属性
+    #   @homework_detail_manual = HomeworkDetailManual.new
+    #   @homework_detail_manual.ta_proportion = 0.6
+    #   @homework_detail_manual.absence_penalty = 0
+    #   @homework_detail_manual.evaluation_num = 3
+    #   @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
+    #   @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    #   @homework.homework_detail_manual = @homework_detail_manual
+    # elsif @homework_type == "2"
+    #   #编程作业相关属性
+    #   @homework_detail_programing = HomeworkDetailPrograming.new
+    #   @homework.homework_detail_programing = @homework_detail_programing
+    # end
     respond_to do |format|
       format.html
     end
@@ -99,12 +99,13 @@ class HomeworkCommonController < ApplicationController
         question = {title:homework.name,content:homework.description}
         question[:input] = []
         question[:output] = []
-        if params[:input] && params[:output]
+        if params[:input] && params[:output] && params[:result]
           params[:input].each do |k,v|
             if params[:output].include? k
               homework_test = HomeworkTest.new
               homework_test.input = v
               homework_test.output = params[:output][k]
+              homework_test.result = params[:result][k]
               homework.homework_tests << homework_test
               question[:input] << homework_test.input
               question[:output] << homework_test.output
@@ -351,6 +352,23 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  def programing_test
+    test = {language:params[:language],src:params[:src],input:[params[:input]],output:[params[:output]]}
+    @index = params[:index]
+    uri = URI('http://192.168.80.21:8080/api/realtime.json')
+    body = test.to_json
+    res = Net::HTTP.new(uri.host, uri.port).start do |client|
+      request                 = Net::HTTP::Post.new(uri.path)
+      request.body            = body
+      request["Content-Type"] = "application/json"
+      client.request(request)
+    end
+    result = JSON.parse(res.body)
+    result[:results].each do |re|
+      @result = re[:status]
+    end
+  end
+
   private
   #获取课程
   def find_course

app/controllers/poll_controller.rb

@@ -137,11 +137,19 @@ class PollController < ApplicationController
         @poll_questions.poll_answers.new question_option
       end
     end
-    if @poll_questions.save
-      respond_to do |format|
-        format.js
+    # 如果是插入的话，那么从插入的这个id以后的question_num都将要+1
+    if params[:quest_id]
+      @is_insert = true
+      @poll.poll_questions.where("question_number > #{params[:quest_num].to_i}").update_all(" question_number = question_number + 1")
+      @poll_question_num = params[:quest_num].to_i
+      @poll_questions.question_number = params[:quest_num].to_i + 1
+    end
+      if @poll_questions.save
+        respond_to do |format|
+          format.js
+        end
       end
-    end
+
   end
 
   #修改题目
@@ -328,6 +336,37 @@ class PollController < ApplicationController
     end
   end
 
+
+  def import_poll
+    @poll = Poll.find(params[:to_id])
+    question_num = @poll.poll_questions.select("max(question_number) question_number").first.question_number
+    import_poll = Poll.find(params[:import_id])
+    import_poll.poll_questions.each_with_index  do |question,index|
+      option = {
+          :is_necessary => question.is_necessary,
+          :question_title => question.question_title,
+          :question_type => question.question_type,
+          :question_number => question_num + index+1
+      }
+      poll_questions = @poll.poll_questions.new option
+      for i in 1..question.poll_answers.count
+        answer = question.poll_answers[i-1][:answer_text]
+        question_option = {
+            :answer_position => i,
+            :answer_text => answer
+        }
+        poll_questions.poll_answers.new question_option
+      end
+      @poll.poll_questions << poll_questions
+    end
+    if @poll.save
+      @poll = Poll.find(params[:to_id])
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   #重新发布问卷
   def republish_poll
     @poll.poll_questions.each do |poll_question|

app/controllers/projects_controller.rb

@@ -150,11 +150,15 @@ class ProjectsController < ApplicationController
   end
 
   def new
-    @issue_custom_fields = IssueCustomField.sorted.all
-    @trackers = Tracker.sorted.all
-    @project = Project.new
-    @project.safe_attributes = params[:project]
-    render :layout => 'base'
+    if User.current.login?
+      @issue_custom_fields = IssueCustomField.sorted.all
+      @trackers = Tracker.sorted.all
+      @project = Project.new
+      @project.safe_attributes = params[:project]
+      render :layout => 'base'
+    else
+      redirect_to signin_url
+    end
   end
   
   def share
@@ -167,6 +171,10 @@ class ProjectsController < ApplicationController
   end
 
   def create
+    unless User.current.login?
+      redirect_to signin_url
+      return
+    end
     @issue_custom_fields = IssueCustomField.sorted.all
     @trackers = Tracker.sorted.all
     @project = Project.new
@@ -280,11 +288,11 @@ class ProjectsController < ApplicationController
 
     # 根据私密性，取出符合条件的所有数据
     if User.current.member_of?(@project) || User.current.admin?
-      @events_pages = ForgeActivity.where("project_id = ?",@project).order("created_at desc").page(params['page'|| 1]).per(20);
+      @events_pages = ForgeActivity.where("project_id = ? and forge_act_type != ?",@project, "Document" ).order("created_at desc").page(params['page'|| 1]).per(20);
       #events = @activity.events(@date_from, @date_to)
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public
-                                                    = ?",@project,1).order("created_at desc")
+                                                    = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc")
                                                           .page(params['page'|| 1]).per(10);
      # @events = @activity.events(@date_from, @date_to, :is_public => 1)
     end

app/controllers/repositories_controller.rb

@@ -449,6 +449,8 @@ update
   def stats
     @project_id = params[:id]
     @repository_id = @repository.identifier
+    # 提交次数统计
+    @status_commit_count = Changeset.count(:conditions => ["#{Changeset.table_name}.repository_id = ?", @repository.id])
     render :layout => 'base_projects'
   end
 

app/controllers/school_controller.rb

@@ -4,28 +4,21 @@ class SchoolController < ApplicationController
   
   def upload
     uploaded_io = params[:logo]
-    school_id = 0
-    schools = School.where("name = ?", params[:school])
-    
-    schools.each do |s|
-      school_id = s.id
-    end
-    
+    school_id ||= params[:id]
     unless uploaded_io.nil? 
       File.open(Rails.root.join('public', 'images', 'school', school_id.to_s+'.png'), 'wb') do |file|
         file.write(uploaded_io.read)
       end
-      
       s1 = School.find(school_id)
       s1.logo_link  = '/images/school/'+school_id.to_s+'.png'
       s1.save
-      
-      
-    end    
+    end
+    redirect_to admin_schools_url(:school_name => params[:school_name])
   end  
 
   def upload_logo
-
+    @school = School.find params[:id]
+    @school_name = params[:school_name]
   end
 
   #获取制定学校开设的课程数

app/controllers/users_controller.rb

@@ -112,39 +112,20 @@ class UsersController < ApplicationController
 
   #added by young
   def user_projects
-
-    #add by huang
     unless User.current.admin?
       if !@user.active? #|| (@user != User.current  && @memberships.empty? && events.empty?)
         render_404
         return
       end
     end
-    #end
-    # if User.current.admin?
-    #   @memberships = @user.memberships.all(conditions: "projects.project_type = #{Project::ProjectType_project}")
-    # else
-    #   cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1"
-    #   @memberships = @user.memberships.all(:conditions => cond)
-    # end
-    #events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 20)
-    #@events_by_day = events.group_by(&:event_date)
-    # @state = 0
-
-    limit = 10;
-    query = Project.joins("join members m on #{Project.table_name}.id=m.project_id")
-    query = query.where("m.user_id = ? and #{Project.table_name}.project_type=?",@user.id,Project::ProjectType_project)
+    projects = @user.projects.visible.order("updated_on desc")
     if(params[:status] == '1')
-      query = query.where("#{Project.table_name}.user_id = ?",@user.id);
+      projects = projects.where("projects.user_id = ?",@user.id)
     elsif(params[:status] == '2')
-      query = query.where("#{Project.table_name}.user_id <> ?",@user.id);
+      projects = projects.where("projects.user_id <> ?",@user.id)
     end
-    @obj_count = query.count();
-
-    @obj_pages = Paginator.new @obj_count,limit,params['page']
-    @list = query.order("#{Project.table_name}.updated_on desc,#{Project.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
-    @params = params
-
+    @list = paginateHelper projects,10
+    @params = params[:status]
     respond_to do |format|
       format.html{render :layout=>'base_users_new'}
       format.api
@@ -262,75 +243,33 @@ class UsersController < ApplicationController
   def user_courses
 
     unless User.current.admin?
-      if !@user.active? #|| (@user != User.current  && @memberships.empty? && events.empty?)
+      if !@user.active?
         render_404
         return
       end
     end
-
-    #@user.coursememberships.all(:conditions => Course.visible_condition(User.current))
-
-    limit = 10;
-    query = Course.joins("join members m on #{Course.table_name}.id=m.course_id")
-    query = query.where("m.user_id = ?",@user.id)
+    courses = @user.courses.visible.order("created_at desc")
     if(params[:status] == '1')
-      query = query.where("endup_time >= ? or endup_time is null or endup_time=''",Time.now);
+      courses = courses.where("endup_time >= ? or endup_time is null or endup_time=''",Time.now)
     elsif(params[:status] == '2')
-      query = query.where("endup_time < ?",Time.now);
+      courses = courses.where("endup_time < ?",Time.now)
     end
-    @obj_count = query.count();
-
-    @obj_pages = Paginator.new @obj_count,limit,params['page']
-    @list = query.order("#{Course.table_name}.updated_at desc,#{Course.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
-    @params = params
+    @list = paginateHelper courses,10
+    @params = params[:status]
     render :layout=>'base_users_new'
-
-    # if User.current == @user || User.current.admin?
-    #   membership = @user.coursememberships.all
-    # else
-    #   membership = @user.coursememberships.all(:conditions => Course.visible_condition(User.current))
-    # end
-    #
-    # membership.sort! {|older, newer| newer.created_on <=> older.created_on }
-    # @memberships = []
-    # membership.collect { |e|
-    #   @memberships.push(e)
-    # }
-    # ## 判断课程是否过期 [需封装]
-    # @memberships_doing = []
-    # @memberships_done  = []
-    # #now_time = Time.now.year
-    # @memberships.map { |e|
-    #   #end_time = e.course.get_time.year
-    #   isDone = course_endTime_timeout?(e.course)
-    #   if isDone
-    #     @memberships_done.push e
-    #   else
-    #     @memberships_doing.push e
-    #   end
-    # }
-    # respond_to do |format|
-    # format.html
-    # format.api
-    # end
   end
 
 # modified by fq
   def user_newfeedback
-    @jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
-    @jours.update_all(:is_readed => true, :status => false)
-    @jours.each do |journal|
+    jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    jours.update_all(:is_readed => true, :status => false)
+    jours.each do |journal|
       fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
     end
-
-    #@limit =  10
-    #@feedback_count = @jours.count
-    #@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
-    #@offset ||= @feedback_pages.offset
-    @jour = paginateHelper @jours,10
+    @jour = paginateHelper jours,10
     @state = false
+    render :layout=>'base_users_new'
   end
- # end
 
   def user_comments
 
@@ -482,95 +421,6 @@ class UsersController < ApplicationController
     render :layout=>nil
   end
 
-  # def user_course_activities
-  #   @list = []
-  #   lastid = nil
-  #   if params[:lastid]!=nil && !params[:lastid].empty?
-  #     lastid = params[:lastid];
-  #   end
-  #
-  #   user_ids = []
-  #   if @user == User.current
-  #     watcher = User.watched_by(@user)
-  #     watcher.push(User.current)
-  #     user_ids = watcher.map{|x| x.id}
-  #   else
-  #     user_ids << @user.id
-  #   end
-  #
-  #   query_rec_count = 8
-  #   query_times = 10 #query_times次没查到query_rec_count条记录就不查了
-  #   query_i = 0;
-  #   while( true )
-  #     query_i = query_i+1
-  #     if(query_i>query_times)
-  #       break
-  #     end
-  #     query = Activity.where(user_id: user_ids)
-  #     if(lastid != nil)
-  #       query = query.where("id < ?",lastid)
-  #     end
-  #     lastid,item_list = query_activities(query,'course');
-  #     for item in item_list
-  #       @list << item
-  #       if @list.count() >= query_rec_count
-  #         break
-  #       end
-  #     end
-  #     if @list.count() >= query_rec_count
-  #       break
-  #     end
-  #     if lastid == nil
-  #       break
-  #     end
-  #   end
-  #   render :layout=>nil
-  # end
-  #
-  # def user_project_activities
-  #   @list = []
-  #   lastid = nil
-  #   if params[:lastid]!=nil && !params[:lastid].empty?
-  #     lastid = params[:lastid];
-  #   end
-  #
-  #   user_ids = []
-  #   if @user == User.current
-  #     watcher = User.watched_by(@user)
-  #     watcher.push(User.current)
-  #     user_ids = watcher.map{|x| x.id}
-  #   else
-  #     user_ids << @user.id
-  #   end
-  #
-  #   query_rec_count = 8
-  #   query_times = 10 #query_times次没查到query_rec_count条记录就不查了
-  #   query_i = 0;
-  #   while( true )
-  #     query_i = query_i+1
-  #     if(query_i>query_times)
-  #       break
-  #     end
-  #     query = Activity.where(user_id: user_ids)
-  #     if(lastid != nil)
-  #       query = query.where("id < ?",lastid)
-  #     end
-  #     lastid,item_list = query_activities(query,'project');
-  #     for item in item_list
-  #       @list << item
-  #       if @list.count() >= query_rec_count
-  #         break
-  #       end
-  #     end
-  #     if @list.count() >= query_rec_count
-  #       break
-  #     end
-  #     if lastid == nil
-  #       break
-  #     end
-  #   end
-  #   render :action=>'user_course_activities',:layout=>nil
-  # end
   def user_course_activities
     lastid = nil
     if params[:lastid]!=nil && !params[:lastid].empty?
@@ -629,7 +479,7 @@ class UsersController < ApplicationController
       query = query.where("#{Activity.table_name}.id < ?",lastid)
     end
     query = query.order("#{Activity.table_name}.id desc")
-    @list = query_activities(query);
+    @list = query_activities(query)
 
     render :action=>'user_course_activities',:layout=>nil
   end

app/controllers/welcome_controller.rb

@@ -100,44 +100,6 @@ class WelcomeController < ApplicationController
     @course_page = FirstPage.find_by_page_type('course')
     @school_id = params[:school_id] || User.current.user_extensions.school.try(:id) || 117
     @logoLink ||= logolink()
-
-    ##3-8月份为查找春季课程，9-2月份为查找秋季课程
-    #month_now = Time.now.strftime("%m").to_i
-    #year_now = Time.new.strftime("%Y").to_i
-    #(month_now >= 3 && month_now < 9) ? course_term = l(:label_spring) : course_term = l(:label_autumn)
-    ##year_now -= 1 if year_now < 3
-    #@school_id.nil? ? @cur_school_course = [] : @cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term)
-    ##未登录或者当前学校未开设课程
-    #if @cur_school_course.empty?
-    #  @has_course = false
-    #  User.current.logged? ? course_count = 9 : course_count = 10
-    #  @cur_school_course += find_all_new_hot_course(course_count, @school_id, year_now, course_term)
-    #  while @cur_school_course.count < 9 do
-    #    if course_term == l(:label_spring)
-    #      course_term = l(:label_autumn)
-    #      year_now -= 1
-    #    else
-    #      course_term = l(:label_spring)
-    #    end
-    #    @cur_school_course += find_all_new_hot_course((10-@cur_school_course.count), nil, year_now, course_term)
-    #  end
-    #else
-    #  if @cur_school_course.count < 9
-    #    @has_course = false
-    #    @cur_school_course += find_all_new_hot_course(9-@cur_school_course.count, @school_id, year_now, course_term)
-    #    if @cur_school_course.count < 9
-    #      if course_term == l(:label_spring)
-    #        course_term = l(:label_autumn)
-    #        year_now -= 1
-    #      else
-    #        course_term = l(:label_spring)
-    #      end
-    #      @cur_school_course += find_all_new_hot_course(9-@cur_school_course.count, nil, year_now, course_term)
-    #    end
-    #  else
-    #    @has_course = true
-    #  end
-    #end
   end
 
   def logolink()

app/controllers/words_controller.rb

@@ -4,7 +4,7 @@ class WordsController < ApplicationController
   include ApplicationHelper
   before_filter :find_user, :only => [:new, :create, :destroy, :more, :back]
   def create
-    if params[:new_form][:user_message].size>0
+    if params[:new_form][:user_message].size>0 && User.current.logged?
       unless params[:user_id].nil?
         if params[:reference_content]
           message = params[:new_form][:user_message] + "\n" + params[:reference_content]
@@ -18,22 +18,13 @@ class WordsController < ApplicationController
           list = User.find(refer_user_id).add_jour(User.current, message, refer_user_id)
         end
         @jour = list.last
-        # @user.count_new_jour
-        # if a_message.size > 5
-          # @message = a_message[-5, 5]
-        # else
-          # @message = a_message
-        # end
-        # @message_count = a_message.count
       end
     end
-    # @jours = @user.journals_for_messages.where('m_parent_id IS NULL').reverse
-    # @jour = paginateHelper @jours,10
+    jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    @jour = paginateHelper jours,10
 
     respond_to do |format|
-     # format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}
       format.js
-      #format.api { render_api_ok }
     end
   end
 
@@ -93,7 +84,6 @@ class WordsController < ApplicationController
     end
     respond_to do |format|
       format.js
-      #format.api { render_api_ok }
     end
   end
 
@@ -206,7 +196,15 @@ class WordsController < ApplicationController
       flash[:error] = feedback.errors.full_messages[0]
       redirect_to project_feedback_url(params[:id])
     end
+  end
 
+  #给用户留言
+  def leave_user_message
+    @user = User.find(params[:id])
+    if params[:new_form][:user_message].size>0 && User.current.logged? && @user
+      @user.add_jour(User.current, params[:new_form][:user_message])
+    end
+    redirect_to feedback_path(@user)
   end
 
   # add by nwb

app/helpers/users_helper.rb

@@ -364,14 +364,15 @@ module UsersHelper
   end
 
   def query_activities(query)
-    list = query.limit(8).all
-    result = [];
+    list = query.limit(13).all
+    result = []
     for item in list
       container = get_activity_container(item)
       result << { :item=>item,:e=>container }
     end
-    return result
+    result
   end
+
   def get_activity_container activity
     return activity.activity_container
   end
@@ -474,14 +475,14 @@ module UsersHelper
       when "Issue"
         return '发表了问题'
       when "Journal"
-        return '回复了问题'
+        return '更新了问题'
       when "JournalsForMessage"
         return e.class.to_s == 'Course' ? '发表了留言' : '提交了反馈'
       #return ( activity.act.reply_id == nil || activity.act.reply_id == 0 ) ? '' : ''
       when "Message"
         return ( activity.act.parent_id == nil || activity.act.parent_id == '' ) ? '发布了帖子' : '回复了帖子'
       when "Poll"
-        return '发布了问卷'
+        return '创建了问卷'
       else
         return '有了新动态'
     end

app/models/mailer.rb

@@ -388,7 +388,8 @@ class Mailer < ActionMailer::Base
     @user = applied.user
     recipients = @project.manager_recipients
     s = l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name)
-    @applied_url =  url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'members')
+    @token = Token.get_token_from_user(@user, 'autologin')
+    @applied_url =  url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'members', :token => @token.value)
     mail :to => recipients,
          :subject => s
   end

app/views/admin/schools.html.erb

@@ -0,0 +1,50 @@
+<h3 style="float: left">
+  <%=l(:label_school_plural)%>
+</h3>
+<%= form_tag({:controller => 'admin', :action => 'schools' }, :method => :get,:id=>"search_course_form") do %>
+    <%= submit_tag "搜索",:style => "float: right;margin-right: 15px;"%>
+    <input style="float: right;margin-right: 10px;" id="v_subject" placeholder="学校名称" type="text" name="school_name" value="<%= @school_name%>">
+<% end %>
+<div class="cl"></div>
+
+<div class="autoscroll" style="margin-top: 40px;">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 50px;">
+        序号
+      </th>
+      <th style="width: 100px;">
+        LOGO
+      </th>
+      <th>
+        学校名称
+      </th>
+      <th style="width: 100px;"></th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @schools.each do |school|%>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td  style="text-align:center;vertical-align: middle;">
+            <%= school.id %>
+          </td>
+          <td align="center">
+            <%= image_tag(school.logo_link,width:40,height:40) %>
+          </td>
+          <td style="text-align:center;vertical-align: middle;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=school.name%>'>
+            <span>
+              <%= link_to school.name,"http://#{Setting.host_course}/?school_id=#{school.id}" %>
+            </span>
+          </td>
+          <td class="buttons" style="vertical-align: middle;">
+            <%= link_to("修改",  upload_logo_school_path(school.id,:school_name => @school_name), :class => 'icon icon-copy') %>
+            <%#= link_to(l(:button_delete),  organization_path(school.id), :method => :delete,:confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
+          </td>
+        </tr>
+    <% end%>
+    </tbody>
+  </table>
+</div>
+
+<% html_title(l(:label_project_plural)) -%>

app/views/applied_project/_set_applied.js.erb

@@ -17,6 +17,8 @@ if (window.Messenger) {
   Messenger().post({
     id: "label_apply_project_waiting",
     message: "<%= l(:label_apply_project_waiting) %>",
-    showCloseButton: true,
+    showCloseButton: true
   });
 };
+
+$("#applied_project_link_<%= @project.id%>").replaceWith("<%= escape_javascript(link_to "加入项目",appliedproject_path(:user_id => User.current.id,:project_id => @project.id,:project_join => true),:class => "blue_n_btn fr mt20", :remote => "true",:method => "post",:id => "applied_project_link_#{@project.id}") %>");

app/views/applied_project/applied_join_project.js.erb

@@ -6,6 +6,7 @@
 <% elsif @status == 2%>
     alert("<%= l('project.join.tips.success') %>");
     hideModal($("#popbox"));
+    $("#applied_project_link_<%= @project.id%>").replaceWith("<%=escape_javascript(link_to '取消申请',appliedproject_applied_path(:project_id => @project.id,:user_id => User.current.id),:class => "blue_n_btn fr mt20", :remote => "true",:method => "delete",:id => "applied_project_link_#{@project.id}")%>");
 <% elsif @status == 3%>
     alert("<%= l('project.join.tips.has') %>");
 <%else%>

app/views/attachments/_project_file_links.html.erb

@@ -29,32 +29,32 @@
   <% is_float ||= false %>
   <% for attachment in attachments %>
       <div style="float:left;">
-      <p style="height:14px;line-height:12px;width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-        <%if is_float%>
-          <div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">
-      <% end%>
-      <span title="<%= attachment.filename %>" id = "attachment_">
+        <p style="height:14px;line-height:12px;width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+          <%if is_float%>
+            <div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">
+        <% end%>
+        <span title="<%= attachment.filename %>" id = "attachment_">
         <% if options[:length] %>
           <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true,:length => options[:length] -%>
         <% else %>
-          <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true -%>
+
         <% end %>
       </span>
-      <%if is_float%>
-          </div>
-      <% end%>
+        <%if is_float%>
+            </div>
+        <% end%>
 
-      <% if attachment.is_text? %>
-          <%= link_to image_tag('magnifier.png'),
-                      :controller => 'attachments',
-                      :action => 'show',
-                      :id => attachment,
-                      :filename => attachment.filename%>
-      <% end %>
+        <% if attachment.is_text? %>
+            <%= link_to image_tag('magnifier.png'),
+                        :controller => 'attachments',
+                        :action => 'show',
+                        :id => attachment,
+                        :filename => attachment.filename%>
+        <% end %>
       </div>
       <div style="float:left;max-width:220px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<%= attachment.description%>">
-    <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
-  </div>
+        <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+      </div>
   <span class="size">(
     <%= number_to_human_size attachment.filesize %>)
   </span>
@@ -66,6 +66,16 @@
                           :class => 'delete delete-homework-icon',
                           :remote => true,
                           :title => l(:button_delete) %>
+          <% elsif attachment.container_type == 'Issue' %>
+              <% if User.current == attachment.author %>
+                  <%= link_to image_tag('delete.png'), attachment_path(attachment),
+                              :data => {:confirm => l(:text_are_you_sure)},
+                              :method => :delete,
+                              :class => 'delete',
+                              #:remote => true,
+                              #:id => "attachments_" + attachment.id.to_s,
+                              :title => l(:button_delete) %>
+              <% end %>
           <% else %>
               <%= link_to image_tag('delete.png'), attachment_path(attachment),
                           :data => {:confirm => l(:text_are_you_sure)},
@@ -89,13 +99,13 @@
       </p>
   <% end %>
   <div class="thumbnails">
-  <% if defined?(thumbnails) && thumbnails %>
-      <% images = attachments.select(&:thumbnailable?) %>
-      <% if images.any? %>
+    <% if defined?(thumbnails) && thumbnails %>
+        <% images = attachments.select(&:thumbnailable?) %>
+        <% if images.any? %>
             <% images.each do |attachment| %>
                 <div class="pro_pic fl " width="100" height="73"><%= thumbnail_issue_tag(attachment) %></div>
             <% end %>
-      <% end %>
-  <% end %>
+        <% end %>
+    <% end %>
   </div>
 </div>

app/views/courses/_course.html.erb

@@ -61,7 +61,7 @@
 
 	<!--gcm-->
 	<p class="stats">
-		<%= content_tag('span',  link_to("#{@course_activity_count[@course.id]}", course_path(@course)), :class => "info") %>
+		<%= content_tag('span',  link_to("#{course_activity_count @course}", course_path(@course)), :class => "info") %>
 		<%= content_tag('span',  l(:label_x_activity, :count => @course_activity_count[@course.id])) %>
 	</p>
 	<!--gcm-->

app/views/courses/_set_join.js.erb

@@ -1,10 +1,11 @@
 <% if object_id%>
     $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(course, user)) %>");
+    $("#try_join_course_link").replaceWith("<a href='<%=url_for(:controller => 'homework_common', :action => 'index',:course=>course.id, :host=>Setting.host_course)%>' target='_blank' class='blue_n_btn fr mt20'>提交作品</a>");
 <% end %>
 <% if @state %>
 	<% if @state == 0 %>
 		alert("加入成功");
-        hideModal($("#popbox"));
+        hideModal($("#popbox02"));
 	<% elsif @state == 1 %>
 		alert("密码错误");
 	<% elsif @state == 2 %>

app/views/homework_common/_homework_detail_programing_form.html.erb

@@ -87,16 +87,17 @@
             <div>
               <li>
                 <label class="label02">&nbsp;测试输入：&nbsp;</label>
-                <input type="text" class="fl h26 w200 mb10" name="input[<%= homework_test.id%>]" value="<%= homework_test.input%>"/>
+                <input type="text" class="fl h26 w190 mb10" name="input[<%= homework_test.id%>]" value="<%= homework_test.input%>"/>
               </li>
               <li >
                 <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-                <input type="text" class="fl h26 w200  mb10" name="output[<%= homework_test.id%>]" value="<%= homework_test.output%>"/>
+                <input type="text" class="fl h26 w190  mb10" name="output[<%= homework_test.id%>]" value="<%= homework_test.output%>"/>
               </li>
               <li>
                 <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
                 <a class="icon_remove" href="javascript:void(0);" title="删除测试" onclick="remove_programing_test($(this).parent().parent())"></a>
-                <!--span class="green_btn fl ml5 mt1">测试</span-->
+                <a class="blue_btn fl ml5 mt1" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">测试</a>
+                <input type="hidden"  id="test_result_<%= homework_test.id%>" name="result[<%= homework_test.id%>]"  />
               </li>
               <div class="cl"></div>
             </div>
@@ -105,19 +106,40 @@
         <div>
           <li>
             <label class="label02">&nbsp;测试输入：&nbsp;</label>
-            <input type="text" class="fl h26 w200 mb10" name="input[0]" />
+            <input type="text" class="fl h26 w190 mb10" name="input[0]" />
           </li>
           <li >
             <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-            <input type="text" class="fl h26 w200  mb10" name="output[0]" />
+            <input type="text" class="fl h26 w190  mb10" name="output[0]" />
           </li>
           <li>
             <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
             <a class="icon_remove" href="javascript:void(0);" title="删除测试" onclick="remove_programing_test($(this).parent().parent())"></a>
-            <!--span class="green_btn fl ml5 mt1">测试</span-->
+            <a class="blue_btn fl ml5 mt1" onclick="programing_test('0')" id="test_send_0">测试</a>
+            <input type="hidden"  id="test_result_0" name="result[0]"  />
           </li>
           <div class="cl"></div>
         </div>
     <% end %>
   </ul>
-</div>
+</div>
+
+<script type="text/javascript">
+
+    //点击测试，发送
+    function programing_test(obj) {
+        $.post(
+                '<%= programing_test_homework_common_index_path%>',
+                {
+                    src: $("textarea[name='standard_code']").val(),
+                    input: $("input[name='input[" + obj +"]']").val(),
+                    output: $("input[name='output[" + obj + "]']").val(),
+                    language: $("select[name='language']").val(),
+                    index: obj
+                },
+                function (data) {
+
+                }
+        );
+    }
+</script>

app/views/homework_common/index.html.erb

@@ -48,7 +48,7 @@
         </div>
         <div class="cl"></div>
 
-        <% if homework.homework_type == 2 && homework.homework_detail_programing%>
+        <% if homework.homework_type == 2 && homework.homework_detail_programing && @is_teacher%>
             <table class="border_ce" cellpadding="0" cellspacing="0">
               <tbody>
               <tr class="<%= cycle("", "b_grey") %>">

app/views/homework_common/new.html.erb

@@ -1,17 +1,27 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-<%= error_messages_for 'homework_common' %>
 <div class="project_r_h">
   <h2 class="project_h2">
     <%= l(:label_course_homework_new)%>
   </h2>
 </div>
-<div class="hwork_new">
-  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-      <%= hidden_field_tag "course",@course.id%>
-      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-      <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+<div class="hwork_new" id="hwork_new">
+  <%= form_for("new_homework_common",:url => next_step_homework_common_index_path) do |f|%>
+      <input type="hidden" name="course" value="<%= @course.id%>">
+      <h3 class="c_blue f16 mb10">
+        请选择将要发布的作业类型
+      </h3>
+      <input type="radio" class="mb10 fl" name="homework_common_type" value="1" id="homework_detail_manual_radio" checked/>
+      <span class="ml5 fl">
+          人工评分的作业（支持匿名互评、灵活设置评分比例）
+      </span>
+      <div class="cl"></div>
+      <input type="radio" class="mb20 fl" name="homework_common_type" value="2" id="homework_detail_programing_radio"/>
+      <span class="ml5 fl">
+          自动评测的编程作业（支持C/C++程序的自动评分）
+      </span>
+      <div class="cl"></div>
+      <a href="javascript:void(0);" class=" orange_btn" onclick="$(this).parent().submit();">
+        下一步
+      </a>
   <% end%>
 </div><!--hwork_new end-->
 <div class="cl"></div>

app/views/homework_common/next_step.html.erb

@@ -11,7 +11,7 @@
           <%= hidden_field_tag "course",@course.id%>
           <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
           <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-          <%= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
+          <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
           <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
       <% end%>
     </div><!--hwork_new end-->
@@ -22,7 +22,7 @@
           <%= hidden_field_tag "homework_common[homework_type]","2"%>
           <%= render :partial => 'homework_common/homework_detail_programing_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
           <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-          <%= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
+          <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
           <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
       <% end%>
     </div><!--hwork_new end-->

app/views/homework_common/programing_test.js.erb

@@ -0,0 +1,2 @@
+$("#test_send_<%= @index%>").replaceWith("<a class='<%= @result == 0 ? 'green_btn' : 'red_btn'%> fl ml5 mt1' onclick='programing_test(<%= @index%>)' id='test_send_<%= @index%>'><%= @result == 0 ? '正确' : '错误'%></a>");
+$("#test_result_<%= @index%>").val("<%= @result%>");

app/views/layouts/_user_watch_btn.html.erb

@@ -1,8 +1,11 @@
-<% if(User.current.logged? && User.current!=target)%>
-  <%if(target.watched_by?(User.current))%>
-    <a id="user_watch_id" href="<%= watch_path(:object_type=>
-                              'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr qx_btn mr10" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
-  <% else %>
-    <a id="user_watch_id" href="<%= watch_path(:object_type=>'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr gz_btn mr10" data-method="post" data-remote="true" title="添加关注">关注</a>
-  <% end %>
+<% if User.current.logged?%>
+    <% if User.current == target%>
+        <a href="<%= url_for(:controller => 'my', :action => 'account') %>" class="fr gz_btn mr10 ">编辑资料</a>
+    <%else%>
+        <%if(target.watched_by?(User.current))%>
+            <a id="user_watch_id" href="<%= watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr qx_btn mr10" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
+        <% else %>
+            <a id="user_watch_id" href="<%= watch_path(:object_type=>'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr gz_btn mr10" data-method="post" data-remote="true" title="添加关注">添加关注</a>
+        <% end %>
+    <% end%>
 <% end %>

app/views/layouts/_user_watch_list.html.erb

@@ -1,5 +1,5 @@
       <% watcher_count,watcher_list = get_watcher_users(user) %>
-      <div id="watcher_nav_list" class="leftbox mt10" style="display:<%= watcher_count==0 ? 'none' : 'block' %>">
+      <div id="watcher_nav_list" class="leftbox" style="display:<%= watcher_count==0 ? 'none' : 'block' %>">
         <h4 class="fl">关注</h4><a href="<%=url_for(:controller => 'users', :action => 'user_watchlist', :id=>user.id)%>" data-count="<%= watcher_count %>" style="display:<%= watcher_count>10 ? 'block' : 'block' %>" class="more fr mr10">更多</a>
         <div class="cl"></div>
         <div class="mt5">

app/views/layouts/base_users_new.html.erb

@@ -17,6 +17,7 @@
 <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','users', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
+<%= javascript_include_tag "avatars"%>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
 <%= yield :header_tags -%>
@@ -69,7 +70,7 @@
         <% end %>
       </div><!--uers_info end-->
 
-      <div class="leftbox mt10">
+      <div class="leftbox">
         <ul class="leftbox_ul_left">
           <li>最近登录&nbsp;:</li>   <!--加入时间修改为最近登录 -->
           <% if @user.user_extensions!=nil && @user.user_extensions.identity == 2 %>
@@ -126,27 +127,49 @@
         <div class="cl"></div>
       </div>
 
+      <div class="subNavBox ">
+        <div class="subNav ">
+          <a href="<%=url_for(:controller => 'users', :action => 'show',:id=>@user.id)%>" class=" f14 c_blue02">
+            动态
+          </a>
+        </div>
       <% if @center_flag %>
-        <div class="subNavBox ">
-          <div class="subNav "><a href="<%=url_for(:controller => 'users', :action => 'show',:id=>@user.id)%>" class=" f14 c_blue02">动态</a></div>
-          <div class="subNav  subNav_jiantou">
+            <div class="subNav">
             <a href="<%=url_for(:controller => 'users', :action => 'user_courses',:id=>@user.id)%>" class=" f14 c_blue02">
               我的课程
               <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.courses.count%>)</span>
             </a>
           </div>
-          <div class="subNav  subNav_jiantou">
+            <div class="subNav">
             <a href="<%=url_for(:controller => 'users', :action => 'user_projects',:id=>@user.id)%>" class=" f14 c_blue02">
               我的项目
               <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.projects.count%>)</span>
             </a>
           </div>
-          <div class="subNav "><a href="<%= url_for(:controller => 'my', :action => 'account') %>" class=" f14 c_blue02">编辑资料</a></div>
+
+        <% else%>
+            <div class="subNav">
+              <a href="<%=url_for(:controller => 'users', :action => 'user_courses',:id=>@user.id)%>" class=" f14 c_blue02">
+                TA的课程
+                <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.courses.visible.count%>)</span>
+              </a>
+            </div>
+            <div class="subNav">
+              <a href="<%=url_for(:controller => 'users', :action => 'user_projects',:id=>@user.id)%>" class=" f14 c_blue02">
+                TA的项目
+                <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.projects.visible.count%>)</span>
+              </a>
+            </div>
+        <% end %>
+        <div class="subNav ">
+          <%= link_to "留言",feedback_path(@user),:class => "f14 c_blue02"%>
+        </div>
         </div><!--侧导航 end-->
-      <% end %>
+
+
       <div class="cl"></div>
 
-      <div class="leftbox mt10">
+      <div class="leftbox">
         <ul class="leftbox_ul_left">
           <% if !@user.user_extensions.nil? && @user.user_extensions.identity == 0 %>
             <% if(get_create_course_count(@user)) == 0 %>
@@ -159,7 +182,7 @@
           <% if (get_join_course_count(@user) != 0) %>
               <li>加入课程&nbsp;:</li>
           <% end %>
-          <% if @user.user_extensions.identity == 0 %>
+          <% if @user.user_extensions.identity == 1 %>
             <li>参加匿评&nbsp;:</li>
           <% end %>
           <% if (get_projectandcourse_attachment_count(@user) != 0) %>
@@ -190,7 +213,7 @@
           <% if (get_join_course_count(@user) != 0) %>
             <li><%= get_join_course_count(@user) %></li>
           <% end %>
-          <% if @user.user_extensions.identity == 0 %>
+          <% if @user.user_extensions.identity == 1 %>
             <li><%= get_anonymous_evaluation_count(@user) %></li>
           <% end %>
           <% if (get_projectandcourse_attachment_count(@user) != 0) %>
@@ -214,11 +237,22 @@
 
       <div class="cl"></div>
 
+      <!-- tag模块 -->
+      <div class="project_Label">
+        <h4 class="mb5"><%= l(:label_tag)%>:</h4>
+        <div class="tag_h">
+          <div id="tags">
+            <%= render :partial => 'tags/project_tag', :locals => {:obj => @user,:object_flag => "1"}%>
+          </div>
+        </div>
+        <div class="cl"></div>
+      </div><!--项目标签 end-->
+
       <%= render :partial => 'layouts/user_watch_list', :locals => {:user => @user} %>
       <%= render :partial => 'layouts/user_fans_list', :locals => {:user => @user} %>
       <% visitor_count,visitor_list = get_visitor_users(@user) %>
       <% if(User.current.admin?) %>
-          <div class="leftbox mt10" style="display:<%= visitor_count==0 ? 'none' : 'block' %>">
+          <div class="leftbox" style="display:<%= visitor_count==0 ? 'none' : 'block' %>">
             <h4 class="fl">访客</h4><a href="<%=url_for(:controller => 'users', :action => 'user_visitorlist', :id=>@user.id)%>" data-count="<%= visitor_count %>" style="display:<%= visitor_count>10 ? 'block' : 'block' %>" class="more fr mr10">更多</a>
             <div class="cl"></div>
             <div class="mt5">
@@ -244,7 +278,9 @@
 <%= render :partial => 'layouts/new_feedback' %>
 
 <div id="ajax-modal" style="display:none;"></div>
-<%= javascript_include_tag '/javascripts/avatars.js' %>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
 <div id="nh_tx_dialog_html" class="white_content" style="display:none;">
   <div>
     <div><a href="javascript:hideModal();" class="box_close"></a></div>
@@ -291,5 +327,17 @@
   </div><!--floatbox end-->
 </div>
 
+<script type="text/javascript">
+    $(function(){
+        if($(".top_new").length==0){
+            $("#RSide").css("min-height",$("#LSide").height()-30);
+        }
+        else{
+            $("#RSide").css("min-height",$("#LSide").height()-87);
+        }
+
+    });
+</script>
+
 </body>
 </html>