Merge branch 'szzh' into develop

app/controllers/admin_controller.rb

@@ -395,4 +395,78 @@ class AdminController < ApplicationController
 
   end
 
+  #留言列表
+  def leave_messages
+    @jour = JournalsForMessage.find_by_sql("SELECT * FROM journals_for_messages AS j1
+    WHERE j1.jour_type IN ('Course','Principal') AND (j1.m_parent_id IS NULL OR (j1.m_parent_id IN (SELECT id FROM journals_for_messages WHERE jour_type IN ('Course','Principal')))) order by created_on desc")
+    @jour = paginateHelper @jour,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #帖子
+  def messages_list
+    @memo = Memo.reorder("created_at desc")
+    @memo = paginateHelper @memo,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #课程讨论区的帖子
+  def course_messages
+    @course_ms=Message.joins("join boards on messages.board_id=boards.id where boards.course_id is not NULL").reorder('created_on desc')
+    @course_ms = paginateHelper @course_ms,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #项目讨论区的帖子
+  def project_messages
+    @project_ms=Message.joins("join boards on messages.board_id=boards.id where boards.project_id != -1").reorder('created_on desc')
+    @project_ms = paginateHelper @project_ms,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #通知
+  def notices
+    @news = News.where('course_id is not NULL').order('created_on desc')
+    @news = paginateHelper @news,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #最近登录用户列表
+  def latest_login_users
+    scope = User.order('last_login_on desc')
+    scope = scope.where("last_login_on>= '#{params[:startdate]} 00:00:00'") if params[:startdate].present?
+    scope =scope.where("last_login_on <= '#{params[:enddate]} 23:59:59'") if params[:enddate].present?
+    @user = scope
+    @user = paginateHelper @user,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #作业
+  def homework
+    @homework = HomeworkCommon.order('end_time desc')
+    @homework = paginateHelper @homework,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
 end

app/controllers/courses_controller.rb

@@ -39,9 +39,14 @@ class CoursesController < ApplicationController
     else
       @state = 5 #未登录
     end
-    respond_to do |format|
+    # if @state == 1 || @state == 3
-      format.js { render :partial => 'set_join', :locals => {:user => user, :course => course, :object_id => params[:object_id]} }
+    #   respond_to course_path(course.id)
-    end
+    # else
+      respond_to do |format|
+        format.js { render :partial => 'set_join', :locals => {:user => user, :course => course, :object_id => params[:object_id]} }
+      end
+    #end
+
   rescue Exception => e
     @state = 4 #已经加入了课程
     respond_to do |format|
@@ -101,74 +106,17 @@ class CoursesController < ApplicationController
   # 课程搜索
   # add by nwb
   def search
-    courses_all = Course.all_course
+    if params[:name].empty?
-    name = params[:name]
+      courses = Course.visible
-    if name.blank?
+      @courses = paginateHelper courses,10
-      @courses = []
-      @courses_all = []
-      @course_count = 0
-      @course_pages = Paginator.new @course_count, per_page_option, params['page']
     else
-      @courses = courses_all.visible
+      courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'")
-      if params[:name].present?
+      @courses = paginateHelper courses,10
-        @courses_all = @courses.like(params[:name])
-      else
-        @courses_all =  @courses;
-      end
-      @course_count = @courses_all.count
-      @course_pages = Paginator.new @course_count, per_page_option, params['page']
-
-      # 课程的动态数
-      @course_activity_count=Hash.new
-      @courses_all.each do |course|
-        @course_activity_count[course.id]=0
-      end
-
-      case params[:course_sort_type]
-        when '0'
-          @courses =  @courses_all.order("created_at desc")
-          @s_type = 0
-          @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-          @course_activity_count=get_course_activity @courses,@course_activity_count
-
-        when '1'
-          @courses = @courses_all.order("course_ac_para desc")
-          @s_type = 1
-          @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-          @course_activity_count=get_course_activity @courses,@course_activity_count
-
-        when '2'
-          @courses = @courses_all.order("watchers_count desc")
-          @s_type = 2
-          @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-          @course_activity_count=get_course_activity @courses,@course_activity_count
-
-        when '3'
-          @course_activity_count=get_course_activity @courses_all,@course_activity_count_array
-          @courses=handle_course @courses_all,@course_activity_count
-          @s_type = 3
-          @courses =  @courses[@course_pages.offset, @course_pages.per_page]
-
-        else
-          @s_type = 0
-          @courses = @courses_all.order("created_at desc")
-          @courses =  @courses.offset(@course_pages.offset).limit(@course_pages.per_page)
-
-          @course_activity_count=get_course_activity @courses,@course_activity_count
-
-      end
     end
 
     respond_to do |format|
       format.html {
         render :layout => 'course_base'
-        scope = Course
-        unless params[:closed]
-          scope = scope.active
-        end
       }
       format.atom {
         courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
@@ -658,92 +606,9 @@ class CoursesController < ApplicationController
   end
 
   def show
-    if params[:jump] && redirect_to_course_menu_item(@course, params[:jump])
+    course_activities = @course.course_activities.order("created_at desc")
-      return
+    @canShowRealName = User.current.member_of_course? @course
-    end
+    @course_activities = paginateHelper course_activities,10
-    @users_by_role = @course.users_by_role
-    if(User.find_by_id(CourseInfos.find_by_course_id(@course.id).try(:user_id)))
-      @user = User.find_by_id(CourseInfos.find_by_course_id(@course.id).user_id)
-    end
-    @key = User.current.rss_key
-    #新增内容
-    @days = Setting.activity_days_default.to_i
-    if params[:from]
-      begin; @date_to = params[:from].to_date + 1; rescue; end
-    end
-    has = {
-        "show_course_files" => true,
-        "show_course_news" => true,
-        "show_course_messages" => true,
-        #"show_course_journals_for_messages" => true,
-        # "show_bids" => true,
-        # "show_homeworks" => true,
-        "show_polls" => true
-    }
-    @date_to ||= Date.today + 1
-    @date_from = (@date_to - @days) > @course.created_at.to_date ? (@date_to - @days) : @course.created_at.to_date
-    @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
-    if @author.nil?
-      # 显示老师和助教的活动
-      # @authors = searchTeacherAndAssistant(@course)
-      @authors = course_all_member(@course)
-      events = []
-      key = "course_events_#{@course.id}".to_sym
-      if Rails.env.production? && Setting.course_cahce_enabled?
-        events = Rails.cache.read(key) || []
-      end
-      if events.empty? 
-        @authors.each do |author|
-          @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
-                                                     :with_subprojects => false,
-                                                     :author => author.user)
-
-          @activity.scope_select {|t| has["show_#{t}"]}
-          # modify by nwb
-          # 添加私密性判断
-          if User.current.member_of_course?(@course)|| User.current.admin?
-            events += @activity.events(@days, @course.created_at)
-          else
-            events += @activity.events(@days, @course.created_at, :is_public => 1)
-          end
-        end
-        Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
-      end
-    else
-    # @author = @course.teacher
-      @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
-                                                 :with_subprojects => false,
-                                                 :author => @author)
-
-      @activity.scope_select {|t| has["show_#{t}"]}
-      # modify by nwb
-      # 添加私密性判断
-      if User.current.member_of_course?(@course)|| User.current.admin?
-        events = @activity.events(@days, @course.created_at)
-      else
-        events = @activity.events(@days, @course.created_at, :is_public => 1)
-      end
-    end
-
-    # 无新动态时，显示老动态
-    if events.count == 0
-      if User.current.member_of_course?(@course)|| User.current.admin?
-        events = @activity.events
-      else
-        events = @activity.events(:is_public => 1)
-      end
-    end
-    @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
-    if(User.find_by_id(CourseInfos.find_by_course_id(@course.id).try(:user_id)))
-      @user = User.find_by_id(CourseInfos.find_by_course_id(@course.id).user_id)
-    end
-
-    sorted_events = sort_activity_events_course(events)
-    events = paginateHelper sorted_events,10
-    @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
-    #  documents
-
-
     respond_to do |format|
       format.html{render :layout => 'base_courses'}
       format.api

app/controllers/files_controller.rb

@@ -177,11 +177,11 @@ class FilesController < ApplicationController
   def index
     @flag = params[:flag] || false
     #sort_init 'filename', 'asc'
-    sort_init 'created_on', 'desc' 
+    # sort_init 'created_on', 'desc'
-    sort_update   'created_on' => "#{Attachment.table_name}.created_on", 
+    # sort_update   'created_on' => "#{Attachment.table_name}.created_on",
-                  'filename' => "#{Attachment.table_name}.filename",
+    #               'filename' => "#{Attachment.table_name}.filename",
-                  'size' => "#{Attachment.table_name}.filesize",
+    #               'size' => "#{Attachment.table_name}.filesize",
-                  'downloads' => "#{Attachment.table_name}.downloads"
+    #               'downloads' => "#{Attachment.table_name}.downloads"
     sort = ""
     @sort = ""
     @order = ""

app/controllers/homework_common_controller.rb

@@ -19,28 +19,28 @@ class HomeworkCommonController < ApplicationController
   end
 
   def new
-    # @homework_type = "1"
+    @homework_type = "1"
-    #
+
-    # @homework = HomeworkCommon.new
+    @homework = HomeworkCommon.new
-    # @homework.safe_attributes = params[:homework_common]
+    @homework.safe_attributes = params[:homework_common]
-    # @homework.late_penalty = 0
+    @homework.late_penalty = 2
-    # @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    # @homework.publish_time = Time.now.strftime('%Y-%m-%d')
+    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-    #
+
-    # if @homework_type == "1"
+    if @homework_type == "1"
-    #   #匿评作业相关属性
+      #匿评作业相关属性
-    #   @homework_detail_manual = HomeworkDetailManual.new
+      @homework_detail_manual = HomeworkDetailManual.new
-    #   @homework_detail_manual.ta_proportion = 0.6
+      @homework_detail_manual.ta_proportion = 0.6
-    #   @homework_detail_manual.absence_penalty = 0
+      @homework_detail_manual.absence_penalty = 2
-    #   @homework_detail_manual.evaluation_num = 3
+      @homework_detail_manual.evaluation_num = 3
-    #   @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
+      @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_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    #   @homework.homework_detail_manual = @homework_detail_manual
+      @homework.homework_detail_manual = @homework_detail_manual
-    # elsif @homework_type == "2"
+    elsif @homework_type == "2"
-    #   #编程作业相关属性
+      #编程作业相关属性
-    #   @homework_detail_programing = HomeworkDetailPrograming.new
+      @homework_detail_programing = HomeworkDetailPrograming.new
-    #   @homework.homework_detail_programing = @homework_detail_programing
+      @homework.homework_detail_programing = @homework_detail_programing
-    # end
+    end
     respond_to do |format|
       format.html
     end
@@ -52,7 +52,7 @@ class HomeworkCommonController < ApplicationController
 
     @homework = HomeworkCommon.new
     @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 0
+    @homework.late_penalty = 2
     @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
     @homework.publish_time = Time.now.strftime('%Y-%m-%d')
 
@@ -60,7 +60,7 @@ class HomeworkCommonController < ApplicationController
       #匿评作业相关属性
       @homework_detail_manual = HomeworkDetailManual.new
       @homework_detail_manual.ta_proportion = 0.6
-      @homework_detail_manual.absence_penalty = 0
+      @homework_detail_manual.absence_penalty = 2
       @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')
@@ -107,6 +107,7 @@ class HomeworkCommonController < ApplicationController
               homework_test.input = v
               homework_test.output = params[:output][k]
               homework_test.result = params[:result][k]
+              homework_test.error_msg = params[:error_msg]
               homework.homework_tests << homework_test
               question[:input] << homework_test.input
               question[:output] << homework_test.output
@@ -223,17 +224,21 @@ class HomeworkCommonController < ApplicationController
         homework_test = HomeworkTest.find id
         homework_test.destroy if homework_test
       end
-      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.find_by_id k
             if homework_test #已存在的测试，修改
               homework_test.input = v
               homework_test.output = params[:output][k]
+              homework_test.result = params[:result][k]
+              homework_test.error_msg = params[:error_msg]
             else #不存在的测试，增加
               homework_test = HomeworkTest.new
               homework_test.input = v
               homework_test.output = params[:output][k]
+              homework_test.result = params[:result][k]
+              homework_test.error_msg = params[:error_msg]
               homework_test.homework_common = @homework
             end
             homework_test.save
@@ -365,6 +370,7 @@ class HomeworkCommonController < ApplicationController
       client.request(request)
     end
     result = JSON.parse(res.body)
+    @err_msg = result["compile_error_msg"]
     result["results"].each do |re|
       @result = re["status"]
     end

app/controllers/issues_controller.rb

@@ -112,7 +112,19 @@ class IssuesController < ApplicationController
   end
 
   def show
-
+    # 当前用户查看指派给他的缺陷消息，则设置消息为已读
+    query = @issue.forge_messages
+    if User.current.id == @issue.assigned_to_id
+      query.update_all(:viewed => true)
+    end
+    # 缺陷状态更新
+    query_journals = @issue.journals
+    if User.current.id == @issue.author_id
+      query_journals.each do |query_journal|
+        query_journal.forge_messages.update_all(:viewed => true)
+      end
+    end
+    #
     @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
     @journals.each_with_index {|j,i| j.indice = i+1}
     @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)

app/controllers/news_controller.rb

@@ -72,7 +72,7 @@ class NewsController < ApplicationController
 
         @news_count = scope.count
         @q = params[:subject]
-        if params[:subject].nil?
+        if params[:subject].nil? || params[:subject].blank?
           scope_order = scope.all(:include => [:author, :course],
                                   :order => "#{News.table_name}.created_on DESC")
         else

app/controllers/poll_controller.rb

@@ -1,3 +1,4 @@
+#encoding utf-8
 class PollController < ApplicationController
   before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result,:close_poll,:export_poll]
   before_filter :find_container, :only => [:new,:create, :index]
@@ -410,6 +411,70 @@ class PollController < ApplicationController
     end
   end
 
+  # 将其他地方的问卷导出来
+  def other_poll
+    # 查作者是我，或者作者是当前课程的老师，且不在当前课程内的问卷 进行导入
+    tea_ids = '('
+    tea_ids << Course.find(params[:polls_group_id]).tea_id.to_s << ','<< User.current.id.to_s << ')'
+    @polls = Poll.where("user_id in #{tea_ids} and polls_type = 'course'  and polls_group_id != #{params[:polls_group_id]}")
+    @polls_group_id = params[:polls_group_id]
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 将问卷导入本课程
+  def import_other_poll
+    course_id = params[:course_id]
+    @course = Course.find(course_id)
+    params[:polls].each_with_index  do |p,i|
+      poll = Poll.find(p)
+      option = {
+          :polls_name => poll.polls_name ||  l(:label_poll_new),
+          :polls_type => 'Course',
+          :polls_group_id => course_id,
+          :polls_status => 1,
+          :user_id => User.current.id,
+          :published_at => Time.now,
+          :closed_at => Time.now,
+          :show_result => 1,
+          :polls_description => poll.polls_description
+      }
+      @poll = Poll.create option
+
+      poll.poll_questions.each do | q|
+        #question_title = params[:poll_questions_title].nil? || params[:poll_questions_title].empty? ? l(:label_enter_single_title) : params[:poll_questions_title]
+        option = {
+            :is_necessary => q[:is_necessary],
+            :question_title => q[:question_title],
+            :question_type => q[:question_type] || 1,
+            :question_number => q[:question_number]
+        }
+        @poll_questions = @poll.poll_questions.new option
+
+          for i in 1..q.poll_answers.count
+            answer = q.poll_answers[i-1].nil?  ? l(:label_new_answer) : q.poll_answers[i-1][:answer_text]
+            question_option = {
+                :answer_position => i,
+                :answer_text => answer
+            }
+            @poll_questions.poll_answers.new question_option
+          end
+      end
+      @poll.save
+    end
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    if @is_teacher
+      polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+    else
+      polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status = 2")
+    end
+    @polls = paginateHelper polls,20 #分页
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]

app/controllers/projects_controller.rb

@@ -86,8 +86,14 @@ class ProjectsController < ApplicationController
       @project_pages = Project.project_entities.visible.like(params[:name]).page(params[:page]).per(10)
     else
       @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
+      @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
     end
     @projects =   @project_pages.order("created_on desc")
+    @limit = 10#per_page_option
+
+    @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
+    @project_pages = Paginator.new @project_count, @limit, params['page']
+
     respond_to do |format|
       format.html {
         render :layout => 'base'

app/controllers/student_work_controller.rb

@@ -387,8 +387,8 @@ class StudentWorkController < ApplicationController
     if stundet_work && params[:results] && params[:results].class.to_s == "Array"
       homework_common = stundet_work.homework_common
       params[:results].each do |result|
-        homework_test = homework_common.homework_tests.where("input = '#{result[:input]}' AND output = '#{result[:output]}'").first
+        homework_tests = homework_common.homework_tests.where("input = '#{result[:input]}' AND output = '#{result[:output]}'")
-        if homework_test
+        homework_tests.each do |homework_test|
           student_work_test = StudentWorkTest.new
           student_work_test.student_work = stundet_work
           student_work_test.homework_test = homework_test

app/controllers/users_controller.rb

@@ -28,6 +28,7 @@ class UsersController < ApplicationController
   # menu_item :requirement_focus, :only => :watch_bids
   menu_item :requirement_focus, :only => :watch_contests
   menu_item :user_newfeedback, :only => :user_newfeedback
+  menu_item :user_messages, :only => :user_messages
 
 
   #Ended by young
@@ -40,14 +41,14 @@ class UsersController < ApplicationController
     :user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score, :topic_score_index, :project_score_index,
     :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
     :activity_new_score_index, :influence_new_score_index, :score_new_index,:update_score,:user_activities,:user_projects_index,
-    :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist]
+    :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages]
   #edit has been deleted by huang, 2013-9-23
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
                                   :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
                                   :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
                                   :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                   :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,
-                                  :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist]
+                                  :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -95,6 +96,87 @@ class UsersController < ApplicationController
     end
   end
 
+  # 用户消息
+  # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复
+  # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
+  def user_messages
+    unless User.current.logged?
+      render_403
+      return
+    end
+    # 当前用户查看消息，则设置消息为已读
+    course_querys = @user.course_messages
+    forge_querys = @user.forge_messages
+    user_querys = @user.user_feedback_messages
+    forum_querys = @user.memo_messages
+    if User.current.id == @user.id
+      course_querys.update_all(:viewed => true)
+      forge_querys.update_all(:viewed => true)
+      user_querys.update_all(:viewed => true)
+      forum_querys.update_all(:viewed => true)
+    end
+    @new_message_count = @user.forge_messages.count + @user.memo_messages.count + @user.course_messages.count + @user.user_feedback_messages.count
+    case params[:type]
+      when nil
+        @user_course_messages = CourseMessage.where("user_id =?",@user).order("created_at desc")
+        @user_forge_messages = ForgeMessage.where("user_id =?",@user).order("created_at desc")
+        @user_memo_messages = MemoMessage.where("user_id =?",@user).order("created_at desc")
+        @user_feedback_messages = UserFeedbackMessage.where("user_id =?",@user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+        @user_forge_messages_count = @user_forge_messages.count
+        @user_memo_messages_count = @user_memo_messages.count
+        @user_feedback_messages_count = @user_feedback_messages.count
+      when 'homework'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'course_message'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'forge_message'
+        @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+        @user_forge_messages_count = @user_forge_messages.count
+      when 'course_news'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "News", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'forge_news'
+        @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
+        @user_forge_messages_count = @user_forge_messages.count
+      when 'course_news_reply'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'forge_news_reply'
+        @user_forge_messages = ForgeMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
+        @user_forge_messagess_count = @user_forge_messages.count
+      when 'poll'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'works_reviewers'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'works_reply'
+        @user_course_messages = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
+        @user_course_messages_count = @user_course_messages.count
+      when 'issue'
+        @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc")
+        @user_forge_messages_count = @user_forge_messages.count
+      when 'issue_update' # 缺陷状态更新、留言
+        @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
+        @user_forge_messages_count = @user_forge_messages.count
+      when 'forum'
+        @user_memo_messages = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc")
+        @user_memo_messages_count = @user_memo_messages.count
+      when 'user_feedback'
+        @user_feedback_messages = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "Principal", @user).order("created_at desc")
+        @user_feedback_messages_count = @user_feedback_messages.count
+      else
+        render_404
+        return
+    end
+    respond_to do |format|
+      format.html{render :layout=>'base_users_new'}
+    end
+  end
+
   def user_projects_index
     if User.current.admin?
       memberships = @user.memberships.all(conditions: "projects.project_type = #{Project::ProjectType_project}").first
@@ -118,7 +200,7 @@ class UsersController < ApplicationController
         return
       end
     end
-    projects = @user.projects.visible.order("updated_on desc")
+    projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc")
     if(params[:status] == '1')
       projects = projects.where("projects.user_id = ?",@user.id)
     elsif(params[:status] == '2')
@@ -248,7 +330,7 @@ class UsersController < ApplicationController
         return
       end
     end
-    courses = @user.courses.visible.order("created_at desc")
+    courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc")
     if(params[:status] == '1')
       courses = courses.where("endup_time >= ? or endup_time is null or endup_time=''",Time.now)
     elsif(params[:status] == '2')
@@ -262,9 +344,11 @@ class UsersController < ApplicationController
 # 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)
+    if User.current == @user
-    jours.each do |journal|
+      jours.update_all(:is_readed => true, :status => false)
-      fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
+      jours.each do |journal|
+        fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
+      end
     end
     @jour = paginateHelper jours,10
     @state = false

app/helpers/application_helper.rb

@@ -1812,7 +1812,7 @@ module ApplicationHelper
   #获取用户未过期的课程
   def get_user_course user
     courses_doing = []
-    user.courses.each do |course|
+    user.courses.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").each do |course|
       if !course_endTime_timeout?(course)
         courses_doing.push course
       end
@@ -2378,4 +2378,98 @@ module ApplicationHelper
     end
     notice.html_safe
   end
+
+  #老师C语言的标准代码
+  def c_stantard_code_teacher
+    "// 老师您好！这是一个C语言的样例程序
+// 程序功能：输入两个整数，输出两者之和
+// 测试集合：老师可以给出多组测试集，例如：
+//                 输入1和2，输出3
+//                 输入3和4，输出7
+//                 ... ...
+//                 系统将根据您给出的测试集对学生代码进行自动评分
+
+// 特别提醒：程序采用命令行传参方式，输入通过argv传入
+//                 否则您的作业标准代码将不能通过测试
+
+#include <stdio.h> //引用必须头文件
+int main(int argc, char** argv) {
+    int a = atoi(argv[1]);  //将第一个输入转成整型
+    int b = atoi(argv[2]);  //将第二个输入转换为整型
+
+    printf(\"%d\",a+b);      //输出a+b
+    return 0;
+}".html_safe
+  end
+
+  #老师C++语言的标准代码
+  def c_stantard_code_teacher_
+    "// 老师您好！这是一个C++语言的样例程序
+// 程序功能：输入两个整数，输出两者之和
+// 测试集合：老师可以给出多组测试集，例如：
+//                 输入1和2，输出3
+//                 输入3和4，输出7
+//                 ... ...
+//                 系统将根据您给出的测试集对学生代码进行自动评分
+
+// 特别提醒：程序采用命令行传参方式，输入通过argv传入
+//                 否则您的作业标准代码将不能通过测试
+
+#include <iostream> //引用必须头文件
+#include <cstdlib>
+using namespace std;
+int main(int argc, char** argv){
+  int a = atoi(argv[1]); //将第一个输入转成整型
+  int b = atoi(argv[2]); //将第二个输入转换为整型
+  cout<<a+b;   //输出a+b
+  return 0;
+}".html_safe
+  end
+
+  #学生C语言的标准代码
+  def c_stantard_code_student
+    "// 同学好！这是一个C语言的样例程序
+// 程序功能：输入两个整数，输出两者之和
+// 测试集合：老师可以给出多组测试集，例如：
+//                 输入1和2，输出3
+//                 输入3和4，输出7
+//                 ... ...
+//                 系统将根据您给出的测试集对学生代码进行自动评分
+
+// 特别提醒：程序采用命令行传参方式，输入通过argv传入
+//                 否则您的作业标准代码将不能通过测试
+
+#include <stdio.h> //引用必须头文件
+int main(int argc, char** argv) {
+    int a = atoi(argv[1]);  //将第一个输入转成整型
+    int b = atoi(argv[2]);  //将第二个输入转换为整型
+
+    printf(\"%d\",a+b);      //输出a+b
+    return 0;
+}".html_safe
+  end
+
+  #学生C++语言的标准代码
+  def c_stantard_code_student_
+    "// 同学好！这是一个C++语言的样例程序
+// 程序功能：输入两个整数，输出两者之和
+// 测试集合：老师可以给出多组测试集，例如：
+//                 输入1和2，输出3
+//                 输入3和4，输出7
+//                 ... ...
+//                 系统将根据您给出的测试集对学生代码进行自动评分
+
+// 特别提醒：程序采用命令行传参方式，输入通过argv传入
+//                 否则您的作业标准代码将不能通过测试
+
+#include <iostream> //引用必须头文件
+#include <cstdlib>
+using namespace std;
+int main(int argc, char** argv){
+  int a = atoi(argv[1]); //将第一个输入转成整型
+  int b = atoi(argv[2]); //将第二个输入转换为整型
+  cout<<a+b;   //输出a+b
+  return 0;
+}".html_safe
+  end
 end

app/helpers/courses_helper.rb

@@ -676,4 +676,61 @@ module CoursesHelper
     end
     result
   end
+
+  #生成课程相关动态的链接
+  def course_activity_link activity
+    # activity = CourseActivity.first
+    title = ""
+    url = ""
+    if activity.course_act
+      case activity.course_act_type
+        when "Course"
+          title = activity.course_act.name
+          url = course_path activity.course
+        when "HomeworkCommon"
+          title = "作业 " + activity.course_act.name
+          url = student_work_index_path(:homework => activity.course_act.id)
+        when "News"
+          title = "通知公告 " + activity.course_act.title
+          url = course_news_index_path(activity.course)
+        when "Attachment"
+          title = "课件 " + activity.course_act.filename
+          url = course_files_path(activity.course)
+        when "Message"
+          title = "课程讨论区 " + activity.course_act.subject
+          url = course_boards_path(activity.course,:parent_id => activity.course_act.parent_id ? activity.course_act.parent_id : activity.course_act.id, :topic_id => activity.course_act.id)
+        when "JournalsForMessage"
+          title = "留言 " + activity.course_act.notes
+          url = course_feedback_path(activity.course)
+        when "Poll"
+          title = "问卷 " + activity.course_act.polls_name
+          url = poll_path(activity.course_act_id)
+      end
+    end
+    link_to title.gsub(/<(?!img)[^>]*>/,'').html_safe, url, :class => "problem_tit c_dblue fl fb"
+  end
+
+  #课程动态的描述
+  def course_activity_desc activity
+    desc = ""
+    if activity.course_act
+      case activity.course_act_type
+        when "Course"
+          desc = ""
+        when "HomeworkCommon"
+          desc = activity.course_act.description
+        when "News"
+          desc = activity.course_act.description
+        when "Attachment"
+          desc = ""
+        when "Message"
+          desc = activity.course_act.content
+        when "JournalsForMessage"
+          desc = ""
+        when "Poll"
+          desc = activity.course_act.polls_description
+      end
+    end
+    desc.html_safe
+  end
 end

app/helpers/homework_common_helper.rb

@@ -66,4 +66,31 @@ module HomeworkCommonHelper
     link
   end
 
+  #将状态转换为错误信息
+  def status_to_err_msg status
+    case status.to_i
+      when -1
+        '编译出错'
+      when -2
+        '输入和输出不匹配'
+      when -3
+        '输入和输出不匹配'
+      when 1
+        '运行出错'
+      when 2
+        '超时'
+      when 3
+        '内存超出'
+      when 4
+        '输出超出'
+      when 5
+        '禁用函数'
+      when 6
+        '其他错误'
+      when 0
+        '成功'
+      else
+        '未知错误'
+    end
+  end
 end

app/helpers/poll_helper.rb

@@ -74,4 +74,13 @@ module PollHelper
     end
   end
 
+  #带勾选框的问卷列表
+  def poll_check_box_tags(name,polls,current_poll)
+    s = ''
+    polls.each do |poll|
+        s << "<label>#{ check_box_tag name, poll.id, false, :id => nil } #{h poll.polls_name.blank? ? l(:label_poll_new) : poll.polls_name } [#{ h Course.find(poll.polls_group_id).name}]</label><br/>"
+    end
+    s.html_safe
+  end
+
 end

app/helpers/users_helper.rb

@@ -333,40 +333,45 @@ module UsersHelper
   end
 
   def get_create_course_count(user)
-    if user == User.current
+    user.courses.visible.where("tea_id = ?",user.id).count
-      user.courses.count
-    else
-      user.courses.where("is_public = 1").count
-    end
   end
 
+  #获取加入课程数
   def get_join_course_count(user)
-    user.coursememberships.count - get_create_course_count(user)
+    user.courses.visible.count - get_create_course_count(user)
   end
 
+  #发布作业数
   def get_homework_commons_count(user)
     HomeworkCommon.where("user_id = ?",user.id).count
   end
 
+  #资源数
   def get_projectandcourse_attachment_count(user)
     Attachment.where("author_id = ? and container_type in ('Project','Course')",user.id).count
   end
+
+  #创建项目数
   def get_create_project_count(user)
-    Project.where("user_id = ? and project_type = ?",user.id,Project::ProjectType_project).count
+    user.projects.visible.where("projects.user_id=#{user.id}").count
   end
 
+  #加入项目数
   def get_join_project_count(user)
-    user.memberships.count(conditions: "projects.project_type = #{Project::ProjectType_project}") - get_create_project_count(user)
+    user.projects.visible.count - get_create_project_count(user)
   end
 
+  #创建缺陷数
   def get_create_issue_count(user)
     Issue.where("author_id = ?",user.id).count
   end
 
+  #解决缺陷数
   def get_resolve_issue_count(user)
     Issue.where("assigned_to_id = ? and status_id=3",user.id).count
   end
 
+  #参与匿评数
   def get_anonymous_evaluation_count(user)
     StudentWorksScore.where("user_id = ? and reviewer_role=3",user.id).count
   end
@@ -397,6 +402,14 @@ module UsersHelper
     return str.html_safe
   end
 
+  def get_issue_des_update(journal)
+    arr = details_to_strings(journal.details,true)
+    arr << journal.notes
+    str = ''
+    arr.each { |item| str = str+item }
+    return str
+  end
+
   def get_activity_act_showname(activity)
     case activity.act_type
       when "HomeworkCommon"

app/models/attachment.rb

@@ -27,6 +27,8 @@ class Attachment < ActiveRecord::Base
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"
   # 被ForgeActivity虚拟关联
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
   include UserScoreHelper
 
@@ -71,8 +73,8 @@ class Attachment < ActiveRecord::Base
   cattr_accessor :thumbnails_storage_path
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
-  before_save :files_to_final_location
+  before_save :files_to_final_location,:act_as_course_activity
-  after_create :office_conver, :be_user_score,:act_as_forge_activity# user_score
+  after_create :office_conver, :be_user_score,:act_as_forge_activity
   after_update :office_conver, :be_user_score
   after_destroy :delete_from_disk,:down_user_score
 
@@ -552,4 +554,10 @@ class Attachment < ActiveRecord::Base
     end
   end
 
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.container_type == "Course" && self.course_acts.empty?
+      self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id)
+    end
+  end
 end

app/models/comment.rb

@@ -21,6 +21,10 @@ class Comment < ActiveRecord::Base
   has_many_kindeditor_assets :assets, :dependent => :destroy
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
+  # 课程/项目 消息
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
+  #end
   acts_as_event :datetime => :updated_on,
                 :description => :comments,
                 :type => 'news',
@@ -31,7 +35,19 @@ 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
+  after_create :send_mail, :act_as_system_message
+
+  def act_as_system_message
+    if self.commented.course
+      if self.author_id != self.commented.author_id
+        self.course_messages << CourseMessage.new(:user_id => self.commented.author_id, :course_id => self.commented.course.id, :viewed => false)
+      end
+    else  # 项目相关
+      if self.author_id != self.commented.author_id
+        self.forge_messages << ForgeMessage.new(:user_id => self.commented.author_id, :project_id => self.commented.project.id, :viewed => false)
+      end
+    end
+  end
 
   def send_mail
     if self.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added')

app/models/course.rb

@@ -33,6 +33,11 @@ class Course < ActiveRecord::Base
   has_many :student_works, :through => :homework_commons, :dependent => :destroy
 
   has_many :course_groups, :dependent => :destroy
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
+
+  has_many :course_activities
+  has_many :course_messages
 
   acts_as_taggable
   acts_as_nested_set :order => 'name', :dependent => :destroy
@@ -44,7 +49,7 @@ class Course < ActiveRecord::Base
   validates_format_of  :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/
   validates_length_of :description, :maximum => 10000
   before_save :self_validate
-  after_create :create_board_sync
+  after_create :create_board_sync, :act_as_course_activity
   before_destroy :delete_all_members
 
   safe_attributes 'extra',
@@ -310,6 +315,11 @@ class Course < ActiveRecord::Base
     end
   end
 
+  #课程动态公共表记录
+  def act_as_course_activity
+    self.course_acts << CourseActivity.new(:user_id => self.tea_id,:course_id => self.id)
+  end
+
   #项目与课程分离后，很多课程的名称等信息为空，这些数据信息存储在项目表中！！就是数据兼容的问题
   #def name
   #  read_attribute('name') || Project.find_by_identifier(self.extra).try(:name)

app/models/course_activity.rb

@@ -0,0 +1,7 @@
+class CourseActivity < ActiveRecord::Base
+  attr_accessible :user_id, :course_act_id,:course_act_type,:course_id
+  # 虚拟关联
+  belongs_to :course_act ,:polymorphic => true
+  belongs_to :course
+  belongs_to :user
+end

app/models/course_message.rb

@@ -0,0 +1,12 @@
+class CourseMessage < ActiveRecord::Base
+  attr_accessible :course_id, :course_message_id, :course_message_type, :user_id, :viewed
+
+  # 多态 虚拟关联
+  belongs_to :course_message ,:polymorphic => true
+  belongs_to :course
+  belongs_to :user
+  validates :user_id,presence: true
+  validates :course_id,presence: true
+  validates :course_message_id,presence: true
+  validates :course_message_type, presence: true
+end

app/models/forge_message.rb

@@ -0,0 +1,20 @@
+class ForgeMessage < ActiveRecord::Base
+  # 公共表中活动类型,命名规则:TYPE_OF_{类名}_ACT
+  TYPE_OF_ISSUE_ACT = "Issue"
+  TYPE_OF_MESSAGE_ACT = "Message"
+  TYPE_OF_ATTACHMENT_ACT = "Attachment"
+  TYPE_OF_DOCUMENT_ACT = "Document"
+  TYPE_OF_JOURNAL_ACT = "Journal"
+  TYPE_OF_WIKI_ACT = "Wiki"
+  TYPE_OF_NEWS_ACT = "News"
+
+  attr_accessible :forge_message_id, :forge_message_type, :project_id, :user_id, :viewed
+
+  belongs_to :forge_message ,:polymorphic => true
+  belongs_to :project
+  belongs_to :user
+  validates :user_id,presence: true
+  validates :project_id,presence: true
+  validates :forge_message_id,presence: true
+  validates :forge_message_type, presence: true
+end

app/models/forum.rb

@@ -39,6 +39,7 @@ class Forum < ActiveRecord::Base
     logger.debug "send mail for forum add."
       Mailer.run.forum_add(self) if Setting.notified_events.include?('forum_add')
   end
+
   # Updates topic_count, memo_count and last_memo_id attributes for +board_id+
   def self.reset_counters!(forum_id)
     forum_id = forum_id.to_i

app/models/homework_common.rb

@@ -13,17 +13,40 @@ class HomeworkCommon < ActiveRecord::Base
   has_many :student_works, :dependent => :destroy
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
+  # 课程消息
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
   acts_as_attachable
   acts_as_event :title => Proc.new {|o| "#{l(:label_course_homework)} ##{o.id}: #{o.name}" },
                 :description => :description,
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
-  after_create :act_as_activity, :send_mail
+  after_create :act_as_activity, :send_mail, :act_as_course_activity, :act_as_course_message
   after_destroy :delete_kindeditor_assets
 
   def act_as_activity
     self.acts << Activity.new(:user_id => self.user_id)
   end
+
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.course
+      self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.course_id)
+    end
+  end
+
+  #课程作业消息记录
+  def act_as_course_message
+    if self.course
+      self.course.members.each do |m|
+        if m.user_id != self.user_id
+          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+        end
+      end
+    end
+  end
+
   #删除对应的图片
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::HOMEWORKCOMMON

app/models/homework_test.rb

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

app/models/issue.rb

@@ -49,6 +49,8 @@ class Issue < ActiveRecord::Base
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # end
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  # ForgeMessage虚拟关联(多态)
+  has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
 
 
   acts_as_nested_set :scope => 'root_id', :dependent => :destroy
@@ -80,8 +82,8 @@ class Issue < ActiveRecord::Base
   attr_reader :current_journal
   
   # fq
-  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity
+  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message
-  after_update :be_user_score
+  after_update :be_user_score, :act_as_forge_message_update
   after_destroy :down_user_score
   # after_create :be_user_score
   # end
@@ -138,6 +140,25 @@ class Issue < ActiveRecord::Base
                                            :project_id => self.project_id)
   end
   # end
+
+  # 发布缺陷forge_messages中添加记录
+  def act_as_forge_message
+    # 指派给自己的缺陷不提示消息
+    unless self.author_id == self.assigned_to_id
+      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id,
+                                              :project_id => self.project_id,
+                                              :viewed => false)
+    end
+  end
+
+  # 更新缺陷
+  def act_as_forge_message_update
+    unless self.author_id == self.assigned_to_id
+      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id,
+                                                 :project_id => self.project_id,
+                                                 :viewed => false)
+    end
+  end
   
   
   # Returns a SQL conditions string used to find all issues visible by the specified user

app/models/journal.rb

@@ -29,6 +29,8 @@ class Journal < ActiveRecord::Base
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   # 被ForgeActivity虚拟关联
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # 被ForgeMessage虚拟关联
+  has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
   # end
   attr_accessor :indice
 
@@ -48,7 +50,7 @@ class Journal < ActiveRecord::Base
   before_create :split_private_notes
   
   # fq
-  after_save :act_as_activity,:be_user_score,:act_as_forge_activity
+  after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message
   # end
   #after_destroy :down_user_score
   #before_save :be_user_score
@@ -163,10 +165,19 @@ class Journal < ActiveRecord::Base
   # Description 公共表中需要保存一份该记录
   def act_as_forge_activity
     self.forge_acts << ForgeActivity.new(:user_id => self.user_id,
-                                           :project_id => self.issue.project.id)
+                                            :project_id => self.issue.project.id)
 
   end
 
+  # 缺陷状态更改，消息提醒
+  def act_as_forge_message
+    if self.user_id != self.issue.author_id
+      self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id,
+                                              :project_id => self.issue.project_id,
+                                              :viewed => false)
+    end
+  end
+
   # 更新用户分数     -by zjc
   def be_user_score
       #新建了缺陷留言且留言不为空，不为空白

app/models/journals_for_message.rb

@@ -56,9 +56,14 @@ class JournalsForMessage < ActiveRecord::Base
   acts_as_attachable
 
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
+  # 消息关联
+  has_many :course_messages, :class_name => 'CourseMessage',:as =>:course_message ,:dependent => :destroy
+  has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:user_feeback_message, :dependent => :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity #huang
+  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message
   after_create :reset_counters!
   after_destroy :reset_counters!
   after_save :be_user_score
@@ -177,4 +182,61 @@ class JournalsForMessage < ActiveRecord::Base
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,7
   end
+
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.jour_type == 'Course'
+      self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.jour_id)
+    end
+  end
+
+  # 课程作品留言消息通知
+  def act_as_course_message
+    if self.jour_type == 'StudentWorksScore'
+      if self.user_id != self.jour.user_id
+        self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.student_work.homework_common.course.id, :viewed => false)
+      end
+    end
+  end
+
+  # 用户留言消息通知
+  def act_as_user_feedback_message
+    # 主留言
+    receivers = []
+    if self.reply_id == 0
+      if self.user_id != self.jour_id  # 过滤自己给自己的留言消息
+        receivers << self.jour
+      end
+    else # 留言回复
+      reply_to = User.find(self.reply_id)
+      if self.user_id != self.parent.user_id
+        receivers << reply_to
+        if self.reply_id != self.parent.user_id
+          receivers << self.parent.user
+        end
+      else
+        receivers << reply_to
+      end
+
+      # 添加留言回复人
+      #reply_to = User.find(self.reply_id)
+      #if self.user_id != self.parent.user_id && self.user_id != self.parent.jour_id  # 如果回帖人不是用户自己
+      #  receivers << self.parent.user
+      #  if self.reply_id != self.parent.user_id
+      #    receivers << reply_to
+      #  end
+      #else # 用户自己回复别人的，别人收到消息通知
+      #  if self.user_id != self.reply_id # 过滤掉自己回复自己的
+      #    receivers << reply_to
+      #  end
+      #end
+    end
+    if self.jour_type == 'Principal'
+
+        receivers.each do |r|
+          self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
+        end
+
+    end
+  end
 end

app/models/memo.rb

@@ -16,6 +16,9 @@ class Memo < ActiveRecord::Base
 	acts_as_attachable
   has_many :user_score_details,  :class_name => 'UserScoreDetails',:as => :score_changeable_obj
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  # 消息
+  has_many :memo_messages, :class_name =>'MemoMessage', :dependent => :destroy
+  # end
 	belongs_to :last_reply, :class_name => 'Memo', :foreign_key => 'last_reply_id'
 	# acts_as_searchable :column => ['subject', 'content'],
 	# 					#:include => { :forum => :p}
@@ -44,7 +47,7 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters!, :send_mail
+	after_create :add_author_as_watcher, :reset_counters!, :send_mail, :send_message
 	# after_update :update_memos_forum
 	after_destroy :reset_counters!,:delete_kindeditor_assets#,:down_user_score  -- 公共区发帖暂不计入得分
 	# after_create :send_notification
@@ -59,6 +62,32 @@ class Memo < ActiveRecord::Base
       Mailer.run.forum_message_added(self) if Setting.notified_events.include?('forum_message_added')
   end
 
+  # 公共贴吧消息记录
+  # 原则：贴吧创始人；发帖人，wanglingchun（特殊用户）
+  def send_message
+    receivers = []
+    u = User.find(6)
+    receivers << u
+    # 主贴
+    if self.parent_id.nil?
+      if self.author_id != self.forum.creator_id # 发帖人不是吧主
+        receivers << self.forum.creator
+      end
+    else # 回帖
+      # 添加吧主
+      if self.author_id != self.forum.creator_id
+        receivers << self.forum.creator
+      end
+      # 添加发帖人
+      if  self.forum.creator_id != self.parent.author_id
+        receivers << self.parent.author
+      end
+    end
+    receivers.each do |r|
+      self.memo_messages << MemoMessage.new(:user_id => r.id, :forum_id => self.forum_id, :memo_id => self.id, :memo_type => "Memo", :viewed => false)
+    end
+  end
+
 	def cannot_reply_to_locked_topic
 		errors.add :base, l(:label_memo_locked) if root.locked? && self != root
 	end

app/models/memo_message.rb

@@ -0,0 +1,11 @@
+class MemoMessage < ActiveRecord::Base
+  attr_accessible :forum_id, :memo_id, :memo_type, :user_id, :viewed
+
+  belongs_to :memo
+  belongs_to :user
+
+  validates :user_id,presence: true
+  validates :forum_id,presence: true
+  validates :memo_id,presence: true
+  validates :memo_type, presence: true
+end

app/models/message.rb

@@ -32,7 +32,13 @@ class Message < ActiveRecord::Base
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   # 被ForgeActivity虚拟关联
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
+  # 课程/项目 消息
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
+  #end
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
 
@@ -68,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,:be_user_score,:act_as_forge_activity, :send_mail
+  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -185,11 +191,56 @@ class Message < ActiveRecord::Base
                                              :project_id => self.board.project.id)
     end
   end
+
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.course
+      self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.board.course_id)
+    end
+  end
+
+  # 课程讨论区添加消息:
+  # 老师发帖所有人都能收到消息
+  # 学生发帖，有人回复则给该学生消息，没回复则不给其它人发送消息
+  # 帖子被回复的可以收到消息通知
+  # 项目讨论区添加消息：
+  # 主贴项目成员都能收到
+  # 回帖：帖子的发布人收到
+  def act_as_system_message
+    if self.course
+      if self.parent_id.nil?   # 主贴
+        self.course.members.each do |m|
+          if self.author.allowed_to?(:as_teacher, self.course) &&  m.user_id != self.author_id   # 老师 自己的帖子不给自己发送消息
+            self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
+          end
+        end
+      else    # 回帖
+        self.course.members.each do |m|
+          if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
+            self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
+          end
+        end
+      end
+    else  # 项目相关
+      if self.parent_id.nil?   # 主贴
+        self.project.members.each do |m|
+          if  m.user_id != self.author_id
+            self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
+          end
+        end
+      else    # 回帖
+        self.project.members.each do |m|
+          if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
+            self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
+          end
+        end
+      end
+    end
+  end
   
   #更新用户分数     -by zjc
   def be_user_score
     #新建message且无parent的为发帖
-
     if self.parent_id.nil? && !self.board.project.nil?
       UserScore.joint(:post_message, self.author,nil,self, { message_id: self.id })
       update_memo_number(self.author,1)

app/models/news.rb

@@ -23,12 +23,18 @@ class News < ActiveRecord::Base
   #added by nwb
   belongs_to :course
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
+  has_many :comments, :as => :commented, :dependent => :destroy, :order => "created_on"
   # fq
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   # 被ForgeActivity虚拟关联
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
+  # 课程/项目消息关联
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
+  #end
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
 
@@ -49,7 +55,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity,:add_author_as_watcher, :send_mail
+  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail
 
   after_destroy :delete_kindeditor_assets
 
@@ -121,6 +127,33 @@ class News < ActiveRecord::Base
     end
   end
 
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.course
+      self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.course_id)
+    end
+  end
+
+  #课程/项目通知 消息发送
+  #消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒
+  def act_as_system_message
+    if self.course
+      self.course.members.each do |m|
+        if m.user_id != self.author_id
+          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+        end
+      end
+    else
+      if !self.project.nil?
+        self.project.members.each do |m|
+          if m.user_id != self.author_id
+            self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+          end
+        end
+      end
+    end
+  end
+
   # Time 2015-03-31 13:50:54
   # Author lizanle
   # Description 删除news后删除对应的资源
@@ -132,4 +165,4 @@ class News < ActiveRecord::Base
     Mailer.run.news_added(self) if Setting.notified_events.include?('news_added')
   end
 
-end
+end

app/models/poll.rb

@@ -8,7 +8,12 @@ class Poll < ActiveRecord::Base
   has_many :users, :through => :poll_users #该文件被哪些用户提交答案过
   # 添加课程的poll动态
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
-  after_create :act_as_activity
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
+  after_create :act_as_activity, :act_as_course_activity
+  # 课程消息
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  after_save :act_as_course_message, :act_as_activity, :act_as_course_activity
 
   acts_as_event :title => Proc.new {|o| "#{l(:label_course_poll)}: #{o.polls_name}" },
                :description => :polls_description,
@@ -27,4 +32,30 @@ class Poll < ActiveRecord::Base
      self.acts << Activity.new(:user_id => self.user_id)
   end
 
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.polls_type == "Course"
+      if self.polls_status == 2 #问卷是发布状态
+        self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id)
+      elsif self.polls_status == 1 #问卷是新建状态
+        self.course_acts.destroy_all
+      end
+    end
+  end
+
+  # 发布问卷，出了发布者外，其他人都能收到消息通知
+  def act_as_course_message
+    if self.polls_type == "Course"
+      if self.polls_status == 2 #问卷是发布状态
+        Course.find(self.polls_group_id).members.each do |m|
+          if m.user_id != self.user_id
+            self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.polls_group_id, :viewed => false)
+          end
+        end
+      elsif self.polls_status == 1 #问卷是新建状态
+        self.course_messages.destroy_all
+      end
+    end
+  end
+
 end

app/models/project.rb

@@ -91,6 +91,8 @@ class Project < ActiveRecord::Base
                             
   has_many :tags, :through => :project_tags, :class_name => 'Tag'
   has_many :project_tags, :class_name => 'ProjectTags'
+  # 关联虚拟表
+  has_many :forge_messages
 
   belongs_to :organization
 

app/models/student_works_score.rb

@@ -5,6 +5,17 @@ class StudentWorksScore < ActiveRecord::Base
   belongs_to :user
   belongs_to :student_work
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
 
   acts_as_attachable
+
+  after_create :act_as_course_message
+
+  # 评阅作品消息提示
+  def act_as_course_message
+    if self.student_work
+      receiver = self.student_work.user
+        self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, :viewed => false)
+    end
+  end
 end

app/models/user.rb

@@ -109,7 +109,6 @@ class User < Principal
   has_many :contests, :foreign_key => 'author_id', :dependent => :destroy
   has_many :softapplications, :foreign_key => 'user_id', :dependent => :destroy
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
-  has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
   has_many :journal_replies, :dependent => :destroy
   has_many :activities, :dependent => :destroy
   has_many :students_for_courses
@@ -128,8 +127,16 @@ class User < Principal
   has_many :messages, :foreign_key => 'author_id'
   has_one :user_score, :dependent => :destroy
   has_many :documents # 项目中关联的文档再次与人关联
-# end
+# 关联消息表
+  has_many :forge_messages
+  has_many :course_messages
+  has_many :memo_messages
+  has_many :user_feedback_messages
 
+# 虚拟转换
+  has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
+  has_many :issue_assigns, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Issue"'
+  has_many :status_updates, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Journal"'
   # 邮件邀请状态
   # has_many :invite_lists
   # end
@@ -235,6 +242,32 @@ class User < Principal
 
   # ======================================================================
 
+  # 查询用户未读过的记录
+  # 用户留言记录
+  def count_new_jour
+    count = self.new_jours.count
+    # count = self.journals_for_messages(:conditions => ["status=?  and is_readed = ? " ,1, 0]).count
+  end
+
+  # 查询指派给我的缺陷记录
+  def count_new_issue_assign_to
+    self.issue_assigns
+  end
+
+  # 新消息统计
+  def count_new_message
+    course_count = CourseMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+  end
+  # 查询指派给我的缺陷记录
+  def issue_status_update
+    self.status_updates
+  end
+  # end
+
   def extensions
     self.user_extensions ||= UserExtensions.new
   end
@@ -258,7 +291,7 @@ class User < Principal
    ###添加留言   fq
   def add_jour(user, notes, reference_user_id = 0, options = {})
     if options.count == 0
-      self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id, :status => true)
+      self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id, :status => true, :is_readed => false)
     else 
       jfm = self.journals_for_messages.build(options)
       jfm.save
@@ -291,11 +324,7 @@ class User < Principal
     name
   end
   ## end
-  
+
-  def count_new_jour
-    count = self.new_jours.count
-  end
-  
   #added by nie
   def count_new_journal_reply
     count = self.journal_reply.count
@@ -418,7 +447,7 @@ class User < Principal
   end
 
   def nickname(formatter = nil)
-    login
+    login.nil? || (login && login.empty?) ? "AnonymousUser" : login
   end
 
   def name(formatter = nil)

app/models/user_feedback_message.rb

@@ -0,0 +1,10 @@
+class UserFeedbackMessage < ActiveRecord::Base
+  attr_accessible :journals_for_message_id, :journals_for_message_type, :user_id, :viewed
+
+  belongs_to :journals_for_message
+  belongs_to :user
+
+  validates :user_id,presence: true
+  validates :journals_for_message_id,presence: true
+  validates :journals_for_message_type, presence: true
+end

app/views/admin/_tab_messages.erb

@@ -0,0 +1,8 @@
+<div class="tabs">
+  <ul>
+    <li><%= link_to l(:label_forum), {:action => 'messages_list'},   class: "#{current_page?(messages_list_path)? 'selected' : nil }" %></li>
+    <li><%= link_to l(:label_borad_course),  {:action => 'course_messages'},  class: "#{current_page?(course_messages_path)? 'selected' : nil }" %></li>
+    <li><%= link_to l(:label_borad_project),  {:action => 'project_messages'},  class: "#{current_page?(project_messages_path)? 'selected' : nil }" %></li>
+
+  </ul>
+</div>

app/views/admin/course_messages.html.erb

@@ -0,0 +1,69 @@
+<h3>
+  <%=l(:label_message_plural)%>
+</h3>
+
+<%= render 'tab_messages' %>
+<h4><%=l(:label_borad_course) %></h4>
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 30px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(课程ID)">
+        来源(课程ID)
+      </th>
+      <th style="width: 50px;">
+        作者
+      </th>
+      <th style="width: 70px;">
+        时间
+      </th>
+      <th style="width: 120px;">
+        标题
+      </th>
+      <th style="width: 30px;">
+        回复数
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @count=@page*30%>
+    <% for course in @course_ms -%>
+
+        <% @count=@count + 1 %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: center;">
+            <%= @count %>
+          </td>
+          <td align="center">
+            <%= Board.where('id=?',course.board_id).first.course_id %>
+          </td>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if course.try(:author).try(:realname) == ' '%><%= course.try(:author)%><% else %><%=course.try(:author).try(:realname) %><% end %>'>
+            <% if course.try(:author).try(:realname) == ' '%>
+                <%= link_to(course.try(:author), user_path(course.author)) %>
+            <% else %>
+                <%= link_to(course.try(:author).try(:realname), user_path(course.author)) %>
+            <% end %>
+          </td>
+          <td class="center">
+            <%= format_date(course.created_on) %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=course.subject %>'>
+            <%= link_to(course.subject, course_boards_path(Board.where('id=?',course.board_id).first.course_id)) %>
+          </td>
+          <td class="center">
+            <%= link_to(course.replies_count, course_boards_path(Board.where('id=?',course.board_id).first.course_id)) %>
+          </td>
+        </tr>
+
+    <% end %>
+    </tbody>
+  </table>
+</div>
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_message_plural)) -%>

app/views/admin/homework.html.erb

@@ -0,0 +1,66 @@
+<h3>
+  <%=l(:label_user_homework)%>
+</h3>
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 120px;">
+        作业名称
+      </th>
+      <th style="width: 120px;">
+        课程名称
+      </th>
+      <th style="width: 50px;">
+        作者
+      </th>
+      <th style="width: 50px;">
+        提交作品数
+      </th>
+      <th style="width: 70px;">
+        提交截止日期
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+      <%@count=@page*30 %>
+      <% for homework in @homework do %>
+          <% @count+=1 %>
+          <tr>
+            <td align="center">
+              <%=@count %>
+            </td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.name%>'>
+              <%=link_to(homework.name, student_work_index_path(:homework => homework.id))%>
+            </td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.course.name%>'>
+              <%= link_to(homework.course.name, course_path(homework.course.id)) %>
+            </td>
+            <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if homework.try(:user).try(:realname) == ' '%><%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'>
+              <% if homework.try(:user).try(:realname) == ' '%>
+                  <%= link_to(homework.try(:user), user_path(homework.user_id)) %>
+              <% else %>
+                  <%= link_to(homework.try(:user).try(:realname), user_path(homework.user_id)) %>
+              <% end %>
+            </td>
+            <td align="center">
+              <%=link_to(StudentWork.where('homework_common_id=?',homework.id).count, student_work_index_path(:homework => homework.id))%>
+            </td>
+            <td align="center">
+              <%=format_date(homework.end_time) %>
+            </td>
+          </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_user_homework)) -%>

app/views/admin/latest_login_users.html.erb

@@ -0,0 +1,96 @@
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %>
+<h3>
+  <%=l(:label_latest_login_user_list)%>
+</h3>
+
+<%= form_tag({}, :method => :get) do %>
+    <fieldset>
+      <legend>
+        <%= l(:label_filter_plural) %>
+      </legend>
+      <label style="float:left">开始日期：</label>
+      <%= text_field_tag 'startdate', params[:startdate], :size => 15, :onchange=>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('startdate')%><span style="float: left ">&nbsp;&nbsp;&nbsp;</span>
+      <label style="float:left">结束日期：</label>
+      <%= text_field_tag 'enddate', params[:enddate], :size => 15, :onchange =>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('enddate')%> &nbsp;
+      <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'latest_login_users'}, :class => 'icon icon-reload' %>
+    </fieldset>
+<% end %>
+&nbsp;
+
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 70px;">
+        登录时间
+      </th>
+      <th style="width: 30px;">
+        用户id
+      </th>
+      <th style="width: 50px;">
+        用户姓名
+      </th>
+      <th style="width: 50px;">
+        用户昵称
+      </th>
+      <th style="width: 50px;">
+        用户身份
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+        <% @count=@page * 30 %>
+        <% for user in @user do %>
+            <tr>
+              <% @count +=1 %>
+              <td align="center">
+                <%=@count %>
+              </td>
+              <td align="center">
+                <%=format_date(user.last_login_on) %>
+              </td>
+              <td align="center">
+                <%=user.id %>
+              </td>
+              <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if user.try(:realname) == ' '%><%= user.login%><% else %><%=user.try(:realname) %><% end %>'>
+                <% if user.try(:realname) == ' '%>
+                    <%= link_to(user.login, user_path(user)) %>
+                <% else %>
+                    <%= link_to(user.try(:realname), user_path(user)) %>
+                <% end %>
+              </td>
+              <td align="center">
+                <%=link_to(user.login, user_path(user)) %>
+              </td>
+              <td align="center">
+                <% case user.user_extensions.identity %>
+                <% when 0 %>
+                <%='老师' %>
+                <% when 1 %>
+                <%='学生' %>
+                <% when 2 %>
+                <%='企业' %>
+                <% when 3 %>
+                <%='开发者' %>
+                <% else %>
+                <%='未知身份' %>
+                <% end %>
+              </td>
+            </tr>
+        <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_latest_login_user_list)) -%>

app/views/admin/leave_messages.html.erb

@@ -0,0 +1,96 @@
+<h3>
+  <%=l(:label_leave_message_list)%>
+</h3>
+
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 50px;">
+        类型
+      </th>
+      <th style="width: 30px; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(课程或用户ID)">
+        来源(课程或用户ID)
+      </th>
+      <th style="width: 50px;">
+        留言人
+      </th>
+      <th style="width: 70px;">
+        留言时间
+      </th>
+      <th style="width: 120px;">
+        留言内容
+      </th>
+      <th style="width: 30px;">
+        回复数
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @count = @page * 30 %>
+    <% for journal in @jour -%>
+        <% @count=@count + 1 %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: center;">
+            <%= @count %>
+          </td>
+          <td align="center">
+            <%case journal.jour_type %>
+            <% when 'Principal' %>
+            <%='用户主页' %>
+            <% when 'Course' %>
+            <%='课程' %>
+            <% end %>
+          </td>
+          <td align="center">
+            <%= journal.jour_id %>
+          </td>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<% if journal.try(:user).try(:realname) == ' '%><%= journal.try(:user)%><% else %><%=journal.try(:user).try(:realname) %><% end %>'>
+            <% if journal.try(:user).try(:realname) == ' '%>
+                <%= link_to(journal.try(:user), user_path(journal.user)) %>
+            <% else %>
+                <%= link_to(journal.try(:user).try(:realname), user_path(journal.user)) %>
+            <% end %>
+          </td>
+          <td class="center">
+            <%= format_date(journal.created_on) %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=journal.notes %>'>
+            <%case journal.jour_type %>
+            <% when 'Principal' %>
+                <%= link_to(journal.notes.html_safe, feedback_path(journal.jour_id)) %>
+            <% when 'Course' %>
+                <%= link_to(journal.notes.html_safe, course_feedback_path(journal.jour_id)) %>
+            <% end %>
+          </td>
+          <td class="center">
+            <% if(journal.m_reply_count) %>
+                <%case journal.jour_type %>
+                <% when 'Principal' %>
+                    <%= link_to(journal.m_reply_count, feedback_path(journal.jour_id)) %>
+                <% when 'Course' %>
+                    <%= link_to(journal.m_reply_count, course_feedback_path(journal.jour_id)) %>
+                <% end %>
+            <% else %>
+                <%case journal.jour_type %>
+                <% when 'Principal' %>
+                    <%= link_to(0, feedback_path(journal.jour_id)) %>
+                <% when 'Course' %>
+                    <%= link_to(0, course_feedback_path(journal.jour_id)) %>
+                <% end %>
+            <% end %>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_leave_message_list)) -%>

app/views/admin/messages_list.html.erb

@@ -0,0 +1,71 @@
+<h3>
+  <%=l(:label_message_plural)%>
+</h3>
+
+<%= render 'tab_messages' %>
+<h4><%=l(:label_forum) %></h4>
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 30px; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(贴吧ID)">
+        来源(贴吧ID)
+      </th>
+      <th style="width: 50px;">
+        作者
+      </th>
+      <th style="width: 70px;">
+        时间
+      </th>
+      <th style="width: 120px;">
+        标题
+      </th>
+      <th style="width: 30px;">
+        回复数
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @count=@page * 30%>
+    <% for memo in @memo -%>
+        <% @count=@count + 1 %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: center;">
+            <%= @count %>
+          </td>
+          <td align="center">
+            <%= memo.forum_id %>
+          </td>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if memo.try(:author).try(:realname) == ' '%><%= memo.try(:author)%><% else %><%=memo.try(:author).try(:realname) %><% end %>'>
+            <% if memo.try(:author).try(:realname) == ' '%>
+                <%= link_to(memo.try(:author), user_path(memo.author)) %>
+            <% else %>
+                <%= link_to(memo.try(:author).try(:realname), user_path(memo.author)) %>
+            <% end %>
+          </td>
+          <td class="center">
+            <%= format_date(memo.created_at) %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=memo.subject %>'>
+            <% if memo.parent_id.nil? || memo.subject.starts_with?('RE:')%>
+                <%= link_to(memo.subject, forum_memo_path(memo.forum, memo)) %>
+            <% else %>
+                <%= link_to("RE:"+memo.subject, forum_memo_path(memo.forum, memo)) %>
+            <% end %>
+          </td>
+          <td class="center">
+            <%= link_to(memo.replies_count, forum_memo_path(memo.forum, memo)) %>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_message_plural)) -%>

app/views/admin/notices.html.erb

@@ -0,0 +1,78 @@
+<h3>
+  <%=l(:label_notification_list)%>
+</h3>
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 30px;">
+        课程id
+      </th>
+      <th style="width: 120px;">
+        课程名称
+      </th>
+      <th style="width: 50px;">
+        主讲老师
+      </th>
+      <th style="width: 50px;">
+        作者
+      </th>
+      <th style="width: 70px;">
+        时间
+      </th>
+      <th style="width: 120px;">
+        标题
+      </th>
+      <th style="width: 30px;">
+        回复数
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @count=@page * 30%>
+    <% for news in @news -%>
+        <% @count=@count + 1 %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: center;">
+            <%= @count %>
+          </td>
+          <td align="center">
+            <%=news.course_id  %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title="<%=news.course.name %>">
+            <%=link_to(news.course.name, course_path(news.course)) %>
+          </td>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title="<%=news.course.try(:teacher).try(:realname) %>">
+            <%=link_to(news.course.try(:teacher).try(:realname), user_path(news.course.teacher))  %>
+          </td>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if news.try(:author).try(:realname) == ' '%><%= news.try(:author)%><% else %><%=news.try(:author).try(:realname) %><% end %>'>
+            <% if news.try(:author).try(:realname) == ' '%>
+                <%= link_to(news.try(:author), user_path(news.author)) %>
+            <% else %>
+                <%= link_to(news.try(:author).try(:realname), user_path(news.author)) %>
+            <% end %>
+          </td>
+          <td class="center">
+            <%= format_date(news.created_on) %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=news.title %>'>
+            <%= link_to(news.title, news_path(news)) %>
+          </td>
+          <td class="center">
+            <%= link_to(news.comments_count, news_path(news)) %>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_notification_list)) -%>

app/views/admin/project_messages.html.erb

@@ -0,0 +1,70 @@
+<h3>
+  <%=l(:label_message_plural)%>
+</h3>
+
+<%= render 'tab_messages' %>
+<h4><%=l(:label_borad_project) %></h4>
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 30px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(项目ID)">
+        来源(项目ID)
+      </th>
+      <th style="width: 50px;">
+        作者
+      </th>
+      <th style="width: 70px;">
+        时间
+      </th>
+      <th style="width: 120px;">
+        标题
+      </th>
+      <th style="width: 30px;">
+        回复数
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @count=@page * 30 %>
+    <% for project in @project_ms -%>
+
+        <% @count=@count + 1 %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: center;">
+            <%= @count %>
+          </td>
+          <td align="center">
+            <%= Board.where('id=?',project.board_id).first.project_id %>
+          </td>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if project.try(:author).try(:realname) == ' '%><%= project.try(:author)%><% else %><%=project.try(:author).try(:realname) %><% end %>'>
+            <% if project.try(:author).try(:realname) == ' '%>
+                <%= link_to(project.try(:author), user_path(project.author)) %>
+            <% else %>
+                <%= link_to(project.try(:author).try(:realname), user_path(project.author)) %>
+            <% end %>
+          </td>
+          <td class="center">
+            <%= format_date(project.created_on) %>
+          </td>
+          <td title='<%=project.subject %>' style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name">
+            <%= link_to(project.subject, project_boards_path(Board.where('id=?',project.board_id).first.project_id)) %>
+          </td>
+          <td class="center">
+            <%= link_to(project.replies_count, project_boards_path(Board.where('id=?',project.board_id).first.project_id)) %>
+          </td>
+        </tr>
+
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_message_plural)) -%>

app/views/boards/_form.html.erb

@@ -1,7 +1,7 @@
 <%= error_messages_for @board %>
 
 <div class="box tabular">
-<p style="width:666;">
+<p style="width:666px;">
   <%= f.text_field :name, :required => true %>
 </p><!--by young-->
 <p>

app/views/boards/show.html.erb

@@ -1,12 +1,5 @@
 <style type="text/css">
     div.talk_new .ke-container{margin-left:2px;}
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    div.ke-toolbar .ke-outline{border:none;}*/
     .break_word {width:100%;}
 </style>
 <script type="text/javascript">
@@ -16,14 +9,14 @@
         for (var i=0; i<menuids.length; i++){
             var div = document.getElementById(menuids[i]);
             if(div == undefined)continue;
-            var ultags=div.getElementsByTagName("ul")
+            var ultags=div.getElementsByTagName("ul");
             for (var t=0; t<ultags.length; t++){
-                ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle"
+                ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle";
                 ultags[t].parentNode.onmouseover=function(){
-                    this.getElementsByTagName("ul")[0].style.display="block"
+                    this.getElementsByTagName("ul")[0].style.display="block";
                 }
                 ultags[t].parentNode.onmouseout=function(){
-                    this.getElementsByTagName("ul")[0].style.display="none"
+                    this.getElementsByTagName("ul")[0].style.display="none";
                 }
             }
         }
@@ -46,46 +39,6 @@
 
 <script type="text/javascript">//侧导航
 
-//window.onload = function () {
-//    var topic_id = getParam('topic_id');
-//    document.getElementById(topic_id).focus();
-//}
-//
-//var getParam = function(name){
-//    var search = document.location.search;
-//    var pattern = new RegExp("[?&]"+name+"\=([^&]+)", "g");
-//    var matcher = pattern.exec(search);
-//    var items = null;
-//    if(null != matcher){
-//        try{
-//            items = decodeURIComponent(decodeURIComponent(matcher[1]));
-//        }catch(e){
-//            try{
-//                items = decodeURIComponent(matcher[1]);
-//            }catch(e){
-//                items = matcher[1];
-//            }
-//        }
-//    }
-//    return items;
-//};
-//
-//function show_newtalk()
-//{
-//    $("#about_newtalk").toggle();
-//
-//
-//
-//}
-//
-//function show_newtalk1(id)
-//{
-//    $(id).toggle();
-//    $(id).focus();
-//
-//
-//}
-
 function nh_check_field(params){
     var result=true;
     if(params.subject!=undefined){

app/views/courses/_course.html.erb

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

app/views/courses/_new_groups_name.html.erb

@@ -21,7 +21,7 @@
                       <img src="/images/pic_del.gif" width="11" height="12" alt="删除班级" title="删除该班级" />
                     </a>
                 <% end%>
-                <a href="javascript:void(0)" class="f_l" style="padding-left: 5px;" onclick="$('#group_name_<%= group.id %>').val('');$('#edit_group_<%= group.id %>').slideToggle();$('#new_group_name').hide();">
+                <a href="javascript:void(0)" class="f_l" style="padding-left: 5px;" onclick="$('#group_name_<%= group.id %>').val('<%= group.name%>');$('#edit_group_<%= group.id %>').slideToggle();$('#new_group_name').hide();">
                   <img src="/images/pic_edit.png" width="14" height="15" alt="编辑班级" />
                 </a>
             <% end %>

app/views/courses/_set_join.js.erb

@@ -1,17 +1,19 @@
 <% 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($("#popbox02"));
+        $("#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>");
+        window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= course.id%>"
 	<% elsif @state == 1 %>
 		alert("密码错误");
 	<% elsif @state == 2 %>
 		alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
 	<% elsif @state == 3 %>
         alert("您已经加入了课程");
+        window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= course.id%>"
     <% elsif @state == 4 %>
         alert("您加入的课程不存在");
     <% elsif @state == 5 %>

app/views/courses/search.html.erb

@@ -39,17 +39,17 @@
 	<% end %>
 </div>	
 
-<% if @courses.size == 0 %>
+<% if @courses && !@courses.empty? %>
-<%= render :partial => 'layouts/no_content'%>
+    <div id="courses-index">
+        <%= render_course_hierarchy(@courses)%>
+    </div>
 <% else %>
-<div id="courses-index">
+    <%= render :partial => 'layouts/no_content'%>
-	<%= render_course_hierarchy(@courses)%>
-</div>
 <% end %>
 
 <div class="pagination">
 	<ul>
-		<%= pagination_links_full @course_pages %>
+		<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
 	</ul>
 </div>
 

app/views/courses/show.html.erb

@@ -1,83 +1,37 @@
 <div class="project_r_h">
-<% if @controller_name=='ActivityNotifys' %>
-  <a class="fl about_me" style="width:80px;" href="<%=course_path(@course)%>"><%= l(:label_activity)%></a>
-  <h2 class="fl project_h2" style="width:100px;">与我相关
-    <span class="c_orange f12" style="display:none;">(<font id="new_notify_count"><%=get_new_notify_count(@course,'Course')%></font>)</span>
-  </h2>
-  <div class="fr mt10 mr5 c_grey02">
-    <a class="c_dblue">
-      <label class="mr5" style="cursor:pointer;" data-href="<%= course_activity_notifys_path(@course) %>/chang_read_flag" nhname='nh_act_link_all'>全部标为已读</label>
-    </a>
-  </div>
-<% else %>
   <h2 class="fl project_h2"><%= l(:label_activity)%></h2>
-  <% if User.current.logged? %>
-  <a class="fl about_me" href="<%=course_activity_notifys_path(@course)%>">与我相关
-    <span class="c_orange f12" style="display:none;">(<font id="new_notify_count"><%=get_new_notify_count(@course,'Course')%></font>)</span>
-  </a>
-  <% end %>
-<% end %>
 </div>
 
-<% if @events_by_day != nil && @events_by_day.size >0 %>
+<%@course_activities.each do |activity|%>
-    <% @events_by_day.keys.sort.reverse.each do |day| %>
+    <div class="problem_main" nhname="container">
-        <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
+      <a class="problem_pic fl">
-            <div class="problem_main" nhname="container">
+        <%= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %>
-              <a class="problem_pic fl">
+      </a>
-                <%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %>
+      <div class="problem_txt fl mt5 upload_img">
-              </a>
+        <%= link_to_user_header(activity.user,false,:class => 'problem_name c_orange fl') %>
-              <div class="problem_txt fl mt5 upload_img">
+        <span class="fl"> &nbsp;</span>
-                <%= link_to_user_header(e.event_author,false,:class => 'problem_name c_orange fl') if e.respond_to?(:event_author) %>
+        <span class="fl"> <%= activity.course_act_type == "Course" ? "创建了课程" : l(:label_new_activity) %>：</span>
-                <%= link_to_user_header("(#{e.event_author})", @canShowRealName,:class => 'problem_name c_orange fl') if @canShowRealName && e.respond_to?(:event_author) %>
+        <%#= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), link,
-                <span class="fl"> &nbsp;</span>
+                    :class => "problem_tit c_dblue fl fb",'data-type'=>e.event_type,
-                <span class="fl"> <%= l(:label_new_activity) %>：</span>
+                    'data-notify-id'=>(e.respond_to?('get_notify_id') ? e.get_notify_id : ''),:nhname=>"nh_act_link",
-                <%
+                    'data-href'=>(course_activity_notifys_path(@course)+"/chang_read_flag?an_id="+(e.respond_to?('get_notify_id') ? e.get_notify_id : '').to_s)%>
-                     link = (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) :
+        <%#if @controller_name=='ActivityNotifys' && e.get_notify_is_read!=1%>
-                                (e.event_type.eql?("bid") ? homework_course_path(@course) :
+            <!--span nhname="nh_act_flag" class="ml10 fl"><img src="/images/new.png" width="35" height="15"/></span-->
-                                         (e.event_type.eql?("message") || e.event_type.eql?("reply")  ?
+        <%#end%>
-                                                course_boards_path(@course,:topic_id => e.id,:parent_id=>(e.parent_id ? e.parent_id : e.id)) : e.event_url))
+        <%= link_to course_activity_link activity%>
-                %>
+        <div class="cl"></div>
-                <%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), link,
+        <p class="mt5 break_word">
-                            :class => "problem_tit c_dblue fl fb",'data-type'=>e.event_type,
+          <%= course_activity_desc activity%>
-                            'data-notify-id'=>(e.respond_to?('get_notify_id') ? e.get_notify_id : ''),:nhname=>"nh_act_link",
+          <br />
-                            'data-href'=>(course_activity_notifys_path(@course)+"/chang_read_flag?an_id="+(e.respond_to?('get_notify_id') ? e.get_notify_id : '').to_s)%>
+            <div class="cl"></div>
-                <%if @controller_name=='ActivityNotifys' && e.get_notify_is_read!=1%>
+            <%= activity.course_act_type == "Course" ? l(:label_create_time) : l(:label_activity_time)  %> ： <%= format_time(activity.created_at) %>
-                <span nhname="nh_act_flag" class="ml10 fl"><img src="/images/new.png" width="35" height="15"/></span>
+        </p>
-                <%end%>
+        <%= link_to_attachments_course(activity.course_act) if activity.course_act_type.to_s == "News" %>
-                <br />
+      </div>
-                <p class="mt5 break_word"><%= e.event_description.html_safe %>
+      <div class="cl"></div>
-                  <br />
+    </div><!--课程动态 end-->
-                <div class="cl"></div>
-                  <%= l :label_activity_time %> ：  <%= format_activity_day(day) %>&nbsp;<%= format_time(e.event_datetime, false) %>
-                </p>
-                <%= link_to_attachments_course(e) if e.class.to_s == "News" %>
-              </div>
-              <div class="cl"></div>
-            </div><!--课程动态 end-->
-        <% end%>
-    <% end%>
-<% elsif @controller_name=='ActivityNotifys' %>
-    <p class="nodata"><%= l(:label_no_data) %></p>
-<% end%>
-<% if @obj_pages.next_page.nil? && @controller_name!='ActivityNotifys' %>
-<div class="problem_main">
-  <a class="problem_pic fl">
-    <%= image_tag(url_to_avatar(@user), :width => "42", :height => "42") %>
-  </a>
-  <div class="problem_txt fl mt5">
-    <%= link_to_user_header(@user,false,:class => 'problem_name c_orange fl') %>
-    <%= link_to_user_header("(#{@user})", @canShowRealName,:class => 'problem_name c_orange fl') if @canShowRealName %>
-    <span class="fl"> <%= l(:label_user_create_project) %>：</span>
-    <%= link_to @course.name,course_path(@course),:class => "problem_tit c_dblue fl fb"%>
-    <br />
-    <p class="mt5">
-      <br />
-      <%= l :label_create_time %> ：  <%= format_time(@course.created_at) %>
-    </p>
-  </div>
-  <div class="cl"></div>
-</div><!--课程动态 end-->
 <% end%>
+
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>

app/views/homework_common/_homework_detail_manual_form.html.erb

@@ -48,11 +48,12 @@
     <ul class="ml10">
       <li>
         <label class="label02">迟交扣分：&nbsp;</label>
-        <%= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
+        <%#= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
+        <input type="number" value="<%= homework.late_penalty%>" min="0" max="50" class="fl mb10 h26 w70" name="late_penalty" onkeyup="check_late_penalty()">
         <span class="fl mt5">&nbsp;分</span>
         <div class="cl"></div>
       </li>
-      <li >
+      <li style="display: none;">
         <label class="label02" >是否匿评：&nbsp;</label>
         <%= f.check_box :homework_type, :class => "mb10 mt5 fl" %>
         <div class="cl"></div>

app/views/homework_common/_homework_detail_programing_form.html.erb

@@ -43,7 +43,8 @@
 
   <li>
     <label class="label02">迟交扣分：&nbsp;</label>
-    <%= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
+    <%#= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
+    <input type="number" value="<%= homework.late_penalty%>" min="0" max="50" class="fl mb10 h26 w70" name="late_penalty" onkeyup="check_late_penalty()">
     <span class="fl mt5">&nbsp;分</span>
     <div class="cl"></div>
   </li>
@@ -56,7 +57,7 @@
   <ul>
     <li >
       <label class="label02">&nbsp;开发语言：&nbsp;</label>
-      <%= select_tag :language,options_for_select(programing_languages_options,homework.homework_detail_programing.language.to_i), {:class => "fl mb10 h26 w70"}  %>
+      <%= select_tag :language,options_for_select(programing_languages_options,homework.homework_detail_programing.language.to_i), {:class => "fl mb10 h26 w70",:onchange => "homework_language_change($(this));"}  %>
       <div class="cl"></div>
     </li>
 
@@ -78,7 +79,7 @@
 
     <li >
       <label class="label02">&nbsp;标准代码：&nbsp;</label>
-      <textarea  name="standard_code"  class=" w547 h150 mb10 fl"><%= homework.homework_detail_programing.standard_code%></textarea>
+      <textarea  name="standard_code"  class=" w547 h400 mb10 fl" oninput="init_programing_test();" onpropertychange="init_programing_test()"><%= homework.homework_detail_programing.standard_code || c_stantard_code_teacher%></textarea>
       <div class="cl"></div>
     </li>
 
@@ -96,8 +97,16 @@
               <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>
-                <a class="blue_btn fl ml5 mt1" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">测试</a>
+                <% if homework_test.result && !homework_test.result.to_s.empty?%>
-                <input type="hidden"  id="test_result_<%= homework_test.id%>" name="result[<%= homework_test.id%>]"  />
+                    <% if homework_test.result == 0%>
+                        <a class="green_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">正确</a>
+                    <% else%>
+                        <a class="red_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">错误</a>
+                    <% end%>
+                <% else%>
+                    <a class="blue_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">测试</a>
+                <% end%>
+                <input type="hidden"  id="test_result_<%= homework_test.id%>" name="result[<%= homework_test.id%>]"  value="<%= homework_test.result%>"/>
               </li>
               <div class="cl"></div>
             </div>
@@ -106,21 +115,36 @@
         <div>
           <li>
             <label class="label02">&nbsp;测试输入：&nbsp;</label>
-            <input type="text" class="fl h26 w190 mb10" name="input[0]" />
+            <input type="text" class="fl h26 w190 mb10" name="input[0]" value="1 2"/>
           </li>
           <li >
             <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-            <input type="text" class="fl h26 w190  mb10" name="output[0]" />
+            <input type="text" class="fl h26 w190  mb10" name="output[0]" value="3"/>
           </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>
-            <a class="blue_btn fl ml5 mt1" onclick="programing_test('0')" id="test_send_0">测试</a>
+            <a class="blue_btn fl ml5 mt programing_test" 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 %>
+    <input type="hidden" name="error_msg" id="homework_test_error_msg" value="<%= homework.homework_tests.first.error_msg if homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg%>">
+    <table class="border_ce" cellpadding="0" cellspacing="0" id="homework_work_test_show" style="display: <%= homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg && !homework.homework_tests.first.error_msg.empty? ? "block" : "none"%>">
+      <tbody>
+      <tr class="border_t" >
+        <td  class="td_end fb c_red w60 td_board_left">
+          错误信息:
+        </td>
+        <td  class="td_end wl" id="homework_work_test_desc">
+          <% if  homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg %>
+            <%= homework.homework_tests.first.error_msg%>
+          <% end%>
+        </td>
+      </tr>
+      </tbody>
+    </table>
   </ul>
 </div>
 
@@ -142,4 +166,28 @@
                 }
         );
     }
+
+    function init_programing_test()
+    {
+        $(".programing_test").each(function(){
+            $(this).removeClass("green_btn red_btn").addClass("blue_btn").text("测试");
+            $(this).next("input").val("");
+        });
+    }
+
+    function homework_language_change(obj)
+    {
+        if(obj.val() == "1")
+        {
+//            alert(1);
+            $("textarea[name='standard_code']").val("<%= escape_javascript c_stantard_code_teacher%>");
+
+        }
+        else if(obj.val() == "2")
+        {
+//            alert(2);
+            $("textarea[name='standard_code']").val("<%= escape_javascript c_stantard_code_teacher_%>");
+
+        }
+    }
 </script>

app/views/homework_common/new.html.erb

@@ -1,27 +1,17 @@
+<%= 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" id="hwork_new">
+<div class="hwork_new">
-  <%= form_for("new_homework_common",:url => next_step_homework_common_index_path) do |f|%>
+  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-      <input type="hidden" name="course" value="<%= @course.id%>">
+      <%= hidden_field_tag "course",@course.id%>
-      <h3 class="c_blue f16 mb10">
+      <%= 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>
-      </h3>
+      <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-      <input type="radio" class="mb10 fl" name="homework_common_type" value="1" id="homework_detail_manual_radio" checked/>
+      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <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/programing_test.js.erb

@@ -1,2 +1,12 @@
-$("#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_send_<%= @index%>").replaceWith("<a class='<%= @result == 0 ? 'green_btn' : 'red_btn'%> fl ml5 mt1 programing_test' onclick='programing_test(<%= @index%>)' id='test_send_<%= @index%>'><%= @result == 0 ? '正确' : '错误'%></a>");
-$("#test_result_<%= @index%>").val("<%= @result%>");
+$("#test_result_<%= @index%>").val("<%= @result%>");
+<% if @err_msg || @result != 0%>
+    $("#homework_work_test_show").show();
+    $("#homework_work_test_desc").text("<%= escape_javascript(@err_msg || status_to_err_msg(@result))%>");
+    <% if @err_msg%>
+        $("#homework_test_error_msg").val("<%= escape_javascript(@err_msg)%>");
+    <% end%>
+<% else%>
+    $("#homework_work_test_show").hide();
+    $("#homework_test_error_msg").val("");
+<% end%>

app/views/issues/show.html.erb

@@ -6,7 +6,7 @@
 <div class="pro_page_box">
   <div class="pro_page_top break_word">
     <%= link_to "#{@issue.project.name}"+">", project_issues_path(@issue.project) %>
-    <a href="javascript:void(0)"><%= "#" + @issue.project_index %></a>
+    <a href="javascript:void(0)"><%= "#" + @issue.id.to_s %></a>
   </div>
   <div class="problem_main">
     <div class="ping_dispic">

app/views/layouts/_base_footer_public.html.erb

@@ -0,0 +1,46 @@
+<div id="Footer">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
+      <li class="fl"><a href="http://forge.trustie.net/projects/2/feedback" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
+      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
+        <select class="languageBox">
+          <option value="Chinese" selected="selected">中文</option>
+          <option value="English">英文</option>
+        </select>
+      </li>
+    </ul>
+  </div>
+
+  <div class="cl"></div>
+  <ul class="departments">
+    <li class="fl mr10">
+      <strong><%= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%= l(:label_hosted_by)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%= l(:label_sponsor)%></a>
+    </li>
+    <li class="fl mr10">
+      <strong><%= l(:label_partners)%></strong><a href="http://eecs.pku.edu.cn" class="ml10 f_grey" target="_blank"><%= l(:label_co_organizer_EECS)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://scse.buaa.edu.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_BHU)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.iscas.ac.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_CAS)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%= l(:label_co_organizer_InforS)%></a>
+    </li>
+  </ul>
+  <div class="cl"></div>
+  <ul class="copyright">
+    <li class="fl"><%= l(:label_rights_reserved)%></li>
+    <span class="fl mw15">|</span>
+    <li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
+  </ul>
+</div><!--Footer end-->
+<div class="cl"></div>

app/views/layouts/_base_header.html.erb

@@ -18,7 +18,7 @@
 			<ul class="sub_menu">
               <% if @show_course == 1 && !visiable %>
                 <% hasCourse=false %>
-                <% User.current.courses.each do |course| %>
+                <% User.current.courses.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").each do |course| %>
                     <% if !course_endTime_timeout?(course) %>
                           <% hasCourse=true %>
                           <% break %>
@@ -34,9 +34,10 @@
 		</li>
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
 			<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')',
-                       {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user},
+                       {:controller=> 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.host_user},
                        {:class => 'my-message'} if User.current.logged?%>
 		</li>
+
 	</ul>
 	</div>
 	<% end -%>

app/views/layouts/_base_header_new.html.erb

@@ -9,65 +9,60 @@
     <div id="menu">
       <ul class="menu">
         <% if User.current.logged? %>
-          <li>
+            <li>
-            <%=link_to_user(User.current)%><!--<a href="javascript:void(0);" class="parent">用户名称</a>-->
+              <%=link_to_user(User.current)%><!--<a href="javascript:void(0);" class="parent">用户名称</a>-->
-            <ul>
+              <ul>
-              <% hidden_non_project = Setting.find_by_name("hidden_non_project")
+                <% hidden_non_project = Setting.find_by_name("hidden_non_project")
-                 visiable = hidden_non_project && hidden_non_project.value == "0"%>
+                   visiable = hidden_non_project && hidden_non_project.value == "0"%>
-              <% if @show_course == 1 && !visiable %>
+                <% if @show_course == 1 && !visiable %>
-                <%# if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
+                    <%# if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
-                  <% hasCourse=false %>
+                    <% hasCourse=false %>
-                  <% User.current.courses.each do |course| %>
+                    <% User.current.courses.each do |course| %>
-                    <% if !course_endTime_timeout?(course) %>
+                        <% if !course_endTime_timeout?(course) %>
-                      <% hasCourse=true %>
+                            <% hasCourse=true %>
+                        <% end %>
                     <% end %>
-                  <% end %>
+                    <% if hasCourse %>
-                  <% if hasCourse %>
+                        <li>
+                          <a href="<%= url_for(:controller => 'users', :action => 'user_courses', :id=>User.current.id, :host=>Setting.host_user) %>" class="parent">我的课程</a>
+                          <ul>
+                            <%  User.current.courses.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").each do |course| %>
+                                <% if !course_endTime_timeout?(course) %>
+                                    <li title="<%=course.name%>"><a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>course.id, :host=>Setting.host_course) %>"><%= course.name %></a>
+                                <% end %>
+                            <% end %>
+                          </ul>
+                        </li>
+                    <% end %>
+                    <%# end -%>
+                <% end %>
+
+                <% if User.current.projects.count>0 %>
                     <li>
-                      <a href="<%= url_for(:controller => 'users', :action => 'user_courses', :id=>User.current.id, :host=>Setting.host_user) %>" class="parent">我的课程</a>
+                      <a href="<%= url_for(:controller => 'users', :action => 'user_projects', :id=>User.current.id, :host=>Setting.host_user) %>" class="parent">我的项目</a>
                       <ul>
-                        <%  User.current.courses.each do |course| %>
+                        <% User.current.projects.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").each do |project| %>
-                          <% if !course_endTime_timeout?(course) %>
+                            <li title="<%=project.name%>">
-                            <li title="<%=course.name%>"><a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>course.id, :host=>Setting.host_course) %>"><%= course.name %></a>
+                              <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>project.id, :host=>Setting.host_name) %>">
-                          <% end %>
+                                <%=project.name%>
+                              </a>
+                            </li>
                         <% end %>
                       </ul>
                     </li>
-                  <% end %>
+                <% end %>
-                <%# end -%>
+                <li><a href="<%= url_for(:controller => 'my', :action => 'account') %>">编辑资料</a></li>
+              </ul>
+            </li><!---level1 end--->
+            <!--消息提醒-->
+            <div class="navHomepageNews">
+              <%= link_to image_tag("/images/news_icon_small.png" , :width => "21", :height => "24"), {:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user} %>
+              <% if User.current.count_new_message >0 %>
+                  <div class="newsActive"></div>
               <% end %>
-
+            </div>
-              <% if User.current.projects.count>0 %>
+            <!--消息提醒end-->
-                <li>
+            <!--<li ><a href="javascript:void(0);">退出</a></li>-->
-                  <a href="<%= url_for(:controller => 'users', :action => 'user_projects', :id=>User.current.id, :host=>Setting.host_user) %>" class="parent">我的项目</a>
-                  <ul>
-                    <% User.current.projects.each do |project| %>
-                      <li title="<%=project.name%>"><a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>project.id, :host=>Setting.host_name) %>"><%=project.name%></a></li>
-                    <% end %>
-                  </ul>
-                </li>
-              <% end %>
-              <li><a href="<%= url_for(:controller => 'my', :action => 'account') %>">编辑资料</a></li>
-            <!--<li><a href="javascript:void(0);" class="parent">我的课程</a>-->
-              <!--<ul>-->
-                <!--<li><a href="javascript:void(0);">新建课程</a></li>-->
-                <!--<li><a href="javascript:void(0);">我的课程0我的课程我的课程01我的课程011</a></li>-->
-                <!--<li><a href="javascript:void(0);">我的课程02</a></li>-->
-                <!--<li><a href="javascript:void(0);">我的课程02</a></li>-->
-              <!--</ul>&lt;!&ndash;-level3 end-&ndash;&gt;-->
-            <!--</li>&lt;!&ndash;-level2 end-&ndash;&gt;-->
-            <!--<li><a href="javascript:void(0);" class="parent">我的项目</a>-->
-              <!--<ul>-->
-                <!--<li><a href="javascript:void(0);">新建项目</a></li>-->
-                <!--<li><a href="javascript:void(0);">我的项目01</a></li>-->
-                <!--<li><a href="javascript:void(0);">我的项目0</a></li>-->
-                <!--<li><a href="javascript:void(0);">我的项目02</a></li>-->
-              <!--</ul>&lt;!&ndash;-level3 end-&ndash;&gt;-->
-            <!--</li>&lt;!&ndash;-level2 end-&ndash;&gt;-->
-            <!--<li><a href="javascript:void(0);">我的主页</a></li>-->
-            </ul>
-          </li><!---level1 end--->
-          <!--<li ><a href="javascript:void(0);">退出</a></li>-->
         <% end %>
       </ul>
       <%= render_menu :account_menu -%>

app/views/layouts/_new_header.html.erb

@@ -26,7 +26,7 @@
                         <li  id="my_courses_li">
                           <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id},target:"_blank", :class => "parent"  %>
                           <ul id="my_courses_ul">
-                            <% user_course.reverse.each do |course| %>
+                            <% user_course.each do |course| %>
                                 <li title="<%=course.name%>">
                                   <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id},target:"_blank" %>
                                 </li>
@@ -40,7 +40,7 @@
                     <li id="my_projects_li">
                       <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name},target:"_blank", :class => "parent" %>
                       <ul id="my_projects_ul" >
-                        <% User.current.projects.reverse.each do |project| %>
+                        <% User.current.projects.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").each do |project| %>
                             <li title="<%=project.name%>">
                               <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name }, target:"_blank" %>
                             </li>
@@ -53,6 +53,9 @@
                 </li>
               </ul>
             </li>
+
+
+
         <% end -%>
         <%= header_render_menu :account_menu -%>
       </ul>

app/views/layouts/_user_courses_list.html.erb

@@ -4,7 +4,7 @@
       <ul class="course_sub_menu">
         <% course_index = 0 %>
 
-        <%  User.current.courses.reverse.each do |course| %>
+        <%  User.current.courses.each do |course| %>
             <% if !course_endTime_timeout?(course) %>
                 <%= render :partial => 'layouts/user_homework_list', :locals => {:course => course,:course_index => course_index} %>
                 <% course_index += 1 %>

app/views/layouts/_user_project_list.html.erb

@@ -2,7 +2,7 @@
     <li id="project_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
       <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name} %>
       <ul class="project_sub_menu" style="top:<%= hasCourse ? 35 : 0 %>px;">
-        <% User.current.projects.reverse.each do |project| %>
+        <% User.current.projects.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").each do |project| %>
             <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>">
               <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name } %>
             </li>

app/views/layouts/base_courses.html.erb

@@ -113,7 +113,7 @@
         <div class="subNav">
           <%= link_to l(:label_activity), course_path(@course), :class => "f14 c_blue02" %>
           <!--暂时不显示课程动态数，优化后在显示-->
-          <%= link_to "(#{course_activity_count @course})", course_path(@course), :class => "subnav_num c_orange"%>
+          <%= link_to "(#{@course.course_activities.count})", course_path(@course), :class => "subnav_num c_orange"%>
         </div>
         <div class="subNav">
           <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>

app/views/layouts/base_users_new.html.erb

@@ -169,13 +169,13 @@
 
       <div class="cl"></div>
 
-      <div class="leftbox">
+      <div class="leftbox mt10">
         <ul class="leftbox_ul_left">
-          <% if !@user.user_extensions.nil? && @user.user_extensions.identity == 0 %>
+          <% if @user.user_extensions && @user.user_extensions.identity == 0 %>
-            <% if(get_create_course_count(@user)) == 0 %>
+            <% if(get_create_course_count(@user)) != 0 %>
                 <li>创建课程&nbsp;:</li>
             <% end %>
-            <% if(get_homework_commons_count(@user)) == 0 %>
+            <% if(get_homework_commons_count(@user)) != 0 %>
                 <li>发布作业&nbsp;:</li>
             <% end %>
           <% end %>
@@ -202,11 +202,11 @@
           <% end %>
         </ul>
         <ul class="leftbox_ul_right c_dgrey">
-          <% if !@user.user_extensions.nil? && @user.user_extensions.identity == 0 %>
+          <% if @user.user_extensions && @user.user_extensions.identity == 0 %>
-            <% if(get_create_course_count(@user)) == 0 %>
+            <% if(get_create_course_count(@user)) != 0 %>
                 <li><%= get_create_course_count(@user) %></li>
             <% end %>
-            <% if(get_homework_commons_count(@user)) == 0 %>
+            <% if(get_homework_commons_count(@user)) != 0 %>
                 <li><%= get_homework_commons_count(@user) %></li>
             <% end %>
           <% end %>
@@ -235,14 +235,14 @@
         <div class="cl"></div>
       </div>
 
-      <div class="cl"></div>
+      <!--<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"}%>
+            <%= render :partial => 'tags/user_tag', :locals => {:obj => @user,:object_flag => "1"}%>
           </div>
         </div>
         <div class="cl"></div>

app/views/mailer/send_for_user_activities.html.erb

@@ -81,7 +81,7 @@
                                   :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                       <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_course_homework) %></span>
 
-                      <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value),
+                      <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_url(:homework => bid.id,:token => @token.value),
                                   :class => 'wmail_info',
                                   :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                       %>

app/views/poll/_other_poll.html.erb

@@ -0,0 +1,37 @@
+<div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
+  <div class="upload_con">
+    <h2>选择问卷导入本课程</h2>
+        <div class="upload_box">
+          <div id="error_show" style="color: red;"></div>
+          <%= form_tag import_other_poll_poll_index_path,
+                       method: :post,
+                       remote: true,
+                       id: "relation_file_form" do %>
+              <input type="hidden" name="course_id" value="<%= polls_group_id%>" />
+              <%= content_tag('div', poll_check_box_tags('polls[]', polls,polls_group_id), :id => 'courses',:style=> 'width: 300px;')%>
+              <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" style="margin-left: 0px !important;" onclick="submit_quote();">导&nbsp;&nbsp;入</a>
+              <a href="javascript:void(0)" class="blue_btn grey_btn fl c_white "  onclick="closeModal();">取&nbsp;&nbsp;消</a>
+          <% end -%>
+        </div>
+
+
+  </div>
+</div>
+
+<script>
+    function submit_quote() {
+        $('#error_show').html('');
+        var selected = false;
+       for(var i = 0; i < $("input[name='polls[]']").length;i++){
+           if($("input[name='polls[]']")[i].checked){
+               selected = true;
+           }
+       }
+        if (selected){
+            $('#submit_quote').parent().submit();
+            closeModal();
+        }else{
+            $('#error_show').html('您没有选择任何问卷');
+        }
+    }
+</script>

app/views/poll/_poll.html.erb

@@ -2,11 +2,13 @@
 <% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
 <% if @is_teacher%>
   <li title="<%= poll.polls_name %>">
-    <% if has_commit %>
+    <div style="width: 310px;float: left;">
-        <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
+      <% if has_commit %>
-    <% else %>
+          <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
-        <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
+      <% else %>
-    <% end %>
+          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
+      <% end %>
+    </div>
   </li>
 
   <% if poll.polls_status == 1%>
@@ -41,6 +43,7 @@
         <li class="polls_de_grey fr ml5">导出</li>
     <% elsif poll.polls_status == 2 || poll.polls_status == 3 %>
         <li><%= link_to "导出", export_poll_poll_path(poll.id,:format => "xls"), :class => "polls_de fr ml5"%></li>
+
     <% end%>
 
 

app/views/poll/_poll_list.html.erb

@@ -3,20 +3,14 @@
     <span>（<%= @obj_count%>）</span>
   </h2>
   <% if @is_teacher%>
+      <%= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%>
       <%= link_to l(:label_new_poll), new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => "newbtn" %>
   <% end%>
 </div>
 <div class="cl"></div>
-<div class="polls_list">
+<div id="polls_list" class="polls_list">
-  <% @polls.each do |poll|%>
+
-      <ul id="polls_<%= poll.id %>" class="polls_list_ul">
+    <%= render :partial => 'polls_list', :locals => {:polls => @polls,:obj_pages=>@obj_pages,:obj_count=>@obj_count} %>
-        <%= render :partial => 'poll', :locals => {:poll => poll} %>
-      </ul>
-      <div class="cl"></div>
-  <% end%>
 
-  <ul class="wlist">
-    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-  </ul>
   <div class="cl"></div>
 </div><!--列表end-->

app/views/poll/_polls_list.html.erb

@@ -0,0 +1,10 @@
+<% polls.each do |poll|%>
+    <ul id="polls_<%= poll.id %>" class="polls_list_ul">
+      <%= render :partial => 'poll', :locals => {:poll => poll} %>
+    </ul>
+    <div class="cl"></div>
+<% end%>
+
+<ul class="wlist">
+  <%= pagination_links_full obj_pages, obj_count, :per_page_links => false, :remote => false, :flag => true%>
+</ul>

app/views/poll/import_other_poll.js.erb

@@ -0,0 +1 @@
+$('#polls_list').html('<%= escape_javascript(render :partial => 'polls_list', :locals => {:polls => @polls,:obj_pages=>@obj_pages,:obj_count=>@obj_count}) %> <div class="cl"></div>');

app/views/poll/index.html.erb

@@ -80,6 +80,11 @@
         $('#ajax-modal').parent().css("top","").css("left","");
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
+
+    function closeModal()
+    {
+        hideModal($("#popbox_upload"));
+    }
 </script>
 <div class="polls_content02" id="polls">
   <%= render :partial => 'poll_list'%>

app/views/poll/other_poll.js.erb

@@ -0,0 +1,13 @@
+
+<% if @polls.empty? %>
+    alert('您目前还没有自己新建的问卷');
+<% else %>
+    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'other_poll',:locals => {:polls => @polls,:polls_group_id=>@polls_group_id}) %>');
+
+
+    showModal('ajax-modal', '513px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+    $('#ajax-modal').parent().css("top","").css("left","");
+    $('#ajax-modal').parent().addClass("popbox_polls");
+<% end %>

app/views/projects/search.html.erb

@@ -104,9 +104,13 @@
 </div>
 <% end %>
 
+<div class="pagination">
+  <ul>
+    <%= pagination_links_full @project_pages, @project_count %>
+  </ul>
+</div>
 
-
+<%#= paginate  @project_pages %>
-<%= paginate  @project_pages %>
 
 
 

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

@@ -13,8 +13,8 @@
     <td class="w90" > <%= l(:field_effective_date) %></td>
     <td class="w150"><%= l(:field_description) %> </td>
     <td class="w90"><%= l(:field_status) %></td>
-    <td class="w90"><%= l(:field_sharing) %></td>
+    <!--<td class="w90"><%#= l(:field_sharing) %></td>-->
-    <td class="w150"><%= l(:label_wiki_page) %></td>
+    <!--<td class="w150"><%#= l(:label_wiki_page) %></td>-->
     <td class="w150"></td>
   </tr>
   <% for version in @project.shared_versions.sort %>
@@ -25,13 +25,13 @@
     <td class="description"><%= format_date(version.effective_date) %></td>
     <td class="description tl" style="word-break:break-all;"><%=h version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>
-    <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
+    <!--<td class="sharing"><%#=h format_version_sharing(version.sharing) %></td>-->
-    <td class="tl" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"  title="">
+    <!--<td class="tl" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"  title="">-->
-      <%= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki',
+      <%#= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki',
-                                                             :action => 'show',
+#                                                              :action => 'show',
-                                                             :project_id => version.project,
+#                                                              :project_id => version.project,
                                                              :id => Wiki.titleize(version.wiki_page_title)},:class=>"c_blue02") || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %>
-    </td>
+    <!--</td>-->
     <td >
       <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %>
         <%= link_to l(:button_edit), edit_version_path(version), :class => 'c_purple' %></a>

app/views/student_work/_evaluation_student_work.html.erb

@@ -48,8 +48,10 @@
           <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
           迟交扣分
           <span class="c_red">&nbsp;<%= student_work.late_penalty%>&nbsp;</span>分，
-          缺评扣分
+          <% if student_work.homework_common.homework_type == 1%>
-          <span class="c_red">&nbsp;<%= student_work.absence_penalty%>&nbsp;</span>分，
+              缺评扣分
+              <span class="c_red">&nbsp;<%= student_work.absence_penalty%>&nbsp;</span>分，
+          <% end%>
           最终成绩为
           <span class="c_red">&nbsp;<%= format("%.1f",score)%>&nbsp;</span>分。
         </div>

app/views/student_work/index.html.erb

@@ -148,7 +148,7 @@
                       输出
                     </td>
                   </tr>
-                  <% homework.homework_tests.each do |test|%>
+                  <% @homework.homework_tests.each do |test|%>
                       <tr class="<%= cycle("", "b_grey") %>">
                         <td  class="td_tit">
                           <%=test.input%>

app/views/student_work/new.html.erb

@@ -44,7 +44,7 @@
             </p>
             <div class="cl"></div>
             <p id="about_project" class="about_project" >
-              <label class="fl">&nbsp;&nbsp;&nbsp;关联项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
+              <label class="fl">&nbsp;&nbsp;&nbsp;选择项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
               <%= f.select :project_id,options_for_select(user_projects_option), {},{:class => "bo02 mb10"}  %>
             </p>
             <div class="cl"></div>
@@ -54,7 +54,11 @@
                 <%= @homework.homework_type == 2 ? "提交代码" : "作品描述"%>
                 &nbsp;&nbsp;&nbsp;：
               </label>
-              <%= f.text_area "description", :class => "w620 hwork_txt ", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();"%>
+              <% if @homework.homework_type == 2 && @homework.homework_detail_programing%>
+                  <%= f.text_area "description", :class => "w620 hwork_txt h400", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();", :value => @homework.homework_detail_programing.language == "1" ? c_stantard_code_student : c_stantard_code_student_%>
+              <% else %>
+                  <%= f.text_area "description", :class => "w620 hwork_txt", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();"%>
+              <% end%>
               <div class="cl"></div>
               <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
             </p>

app/views/tags/_tag_user_new_name.html.erb

@@ -0,0 +1,30 @@
+<% @tags = obj.reload.tag_list %>
+<% if non_list_all && @tags.size > 0 %>
+
+<% else %>
+    <!-- 用来显示三大对象的主页中的tag  故是全部显示  -->
+    <% if @tags.size > 0 %>
+        <% @tags.each do |tag| %>
+            <span class="re_tag f_l " id="tag">
+              <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id, :class => 'pt5' %>
+              <span class="del">
+                <%= link_to('x', remove_tag_path(:tag_name => tag,:taggable_id => obj.id, :taggable_type => object_flag), :remote => true, :confirm => l(:text_are_you_sure) ) if User.current.eql?(obj) %>
+              </span>
+            </span>
+        <% end %>
+    <% end %>
+<% end %>
+
+<% if User.current.logged?%>
+    <a href="javascript:void(0)" class="yellowBtn f_l" onclick="$('#add_tag03').slideToggle();"><%= l(:label_add_tag)%></a>
+    <span id="add_tag03" style="display:none; vertical-align: middle;" class="ml10 f_l">
+       <%= form_for "tag_for_save",:remote => true,:url=>save_tag_path,:update => "tags_show",:complete => '$("#put-tag-form").slideUp();' do |f| %>
+          <%= f.text_field :name ,:id => "tags_name3",:size=>"20",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length,:class =>"isTxt w90 f_l" %>
+          <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
+          <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+          <input type="button" class="submit f_l" onclick="$('#tags_name3').parent().submit();" />
+       <% end %>
+    </span>
+<% end%>
+
+

app/views/tags/_user_tag.html.erb

@@ -0,0 +1,5 @@
+<div id="tags">
+  <div id="tags_show">
+    <%= render :partial => "tags/tag_user_new_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
+  </div>
+</div>

app/views/tags/remove_tag.js.erb

@@ -2,6 +2,9 @@
 <% if  @object_flag == '3'%>
 $('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
+<% elsif @object_flag == '1'%>
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_user_new_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
 <% elsif @object_flag == '2'%>
 $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_project_new_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');

app/views/tags/tag_save.js.erb

@@ -4,6 +4,10 @@ $('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_n
                                         :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
 //$('#put-tag-form-issue').hide();
 $('#name-issue').val("");
+<% elsif  @obj_flag == '1'%>
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_user_new_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
+$('#tags_name3').val("");
 <% elsif  @obj_flag == '2'%>
 $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_project_new_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');

app/views/users/_user_jour_reply.html.erb

@@ -3,9 +3,9 @@
     <div class="mes_box02" id = '<%= reply.id %>'>
       <%= link_to image_tag(url_to_avatar(reply.user),:width => '32',:height => '32'), user_path(reply.user),:class => "users_pic_sub fl mr5" %>
       <div class=" mes_box02_info fl">
-        <%= link_to "#{reply.user.login}&nbsp;".html_safe, user_path(reply.user),:class => 'course_name fl c_blue02 ', :target => "_blank"%>
+        <%= link_to "#{reply.user.nickname}&nbsp;".html_safe, user_path(reply.user),:class => 'course_name fl c_blue02 ', :target => "_blank"%>
         <span class="fl c_grey">&nbsp;回复&nbsp;</span>
-        <%= link_to "#{parent_jour.user.login}&nbsp;:&nbsp;".html_safe, user_path(parent_jour.user),:class => 'course_name fl c_blue02 mr5 ', :target => "_blank"%>
+        <%= link_to "#{parent_jour.user.nickname}&nbsp;:&nbsp;".html_safe, user_path(parent_jour.user),:class => 'course_name fl c_blue02 mr5 ', :target => "_blank"%>
         <div class="cl">
           <%= reply.notes.html_safe %>
         </div>

app/views/users/_user_jours_new.html.erb

@@ -1,8 +1,8 @@
-<div class="message_list" id="<%= jour.id %>" nhname="rec" data-id="<%= jour.id %>">
+<div class="message_list break_word" id="<%= jour.id %>" nhname="rec" data-id="<%= jour.id %>">
   <%= link_to image_tag(url_to_avatar(jour.user),:width => '46',:height => '46'), user_path(jour.user),:class => "users_pic fl" %>
   <div class="fl ml5 mes_box mb10" >
     <div>
-      <%= link_to "#{jour.user.login}&nbsp;:&nbsp;".html_safe, user_path(jour.user),:class => 'fl c_blue02 f14 fb mb5', :target => "_blank"%>
+      <%= link_to "#{jour.user.nickname}&nbsp;:&nbsp;".html_safe, user_path(jour.user),:class => 'fl c_blue02 f14 fb mb5', :target => "_blank"%>
     </div>
     <div class="cl"></div>
     <div>

app/views/users/_user_show.html.erb

@@ -23,8 +23,19 @@
              </tr>
             <tr>
               <td colspan="2">
-                <%= l(:label_x_has_fans,:count=>user.watcher_users.count)%>
+                <%= l(:label_x_has_fans,:count=>user.watcher_users.count, :remote => true)%>
-                <%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
+                <%= l(:label_has_watchers,:count=>User.watched_by(user.id).count, :remote => true) %>
+                <% if User.current.logged?%>
+                    <% if User.current == user%>
+                        <a href="<%= url_for(:controller => 'my', :action => 'account') %>" class="fr gz_btn mr10 ">编辑资料</a>
+                    <%else%>
+                        <%if(user.watched_by?(User.current))%>
+                            <a id="user_watch_id" href="<%= watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.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=>user.id,:target_id=>user.id) %>" class="fr gz_btn mr10" data-method="post" data-remote="true" title="添加关注">添加关注</a>
+                        <% end %>
+                    <% end%>
+                <% end %>
               </td>
             </tr>
           </table>

app/views/users/show.html.erb

@@ -5,14 +5,14 @@
     <% if @user.allowed_to?(:add_project, nil, :global => true) %>
       <a href="<%= url_for(:controller => 'projects', :action => 'new',:host=>Setting.host_name) %>" class="bgreen_n_btn fr ml10 mt2" target="_blank">新建项目</a>
     <% else %>
-      <a href="<%= join_project_projects_path %>" data-remote ="true" class="green_n_btn fr mt2">加入项目</a>
+      <a href="<%= join_project_projects_path %>" data-remote ="true" class="bgreen_n_btn fr mt2">加入项目</a>
     <% end %>
 
     <% if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>
-      <a href="<%= url_for(:controller => 'courses', :action => 'new',:host=>Setting.host_course) %>" class="green_n_btn fr mt2" target="_blank">新建课程</a>
+      <a href="<%= url_for(:controller => 'courses', :action => 'new',:host=>Setting.host_course) %>" class="bgreen_n_btn fr mt2" target="_blank">新建课程</a>
     <% else %>
       <!--<a href="<%#= url_for(:controller => 'courses', :action => 'join_private_courses',:host=>Setting.host_course) %>" data-remote ="true" class="green_n_btn fr mt2">加入课程</a>-->
-      <a href="<%= join_private_courses_courses_path %>" data-remote ="true" class="green_n_btn fr mt2">加入课程</a>
+      <a href="<%= join_private_courses_courses_path %>" data-remote ="true" class="bgreen_n_btn fr mt2">加入课程</a>
     <% end %>
   <div class="cl"></div>
 </div>

app/views/users/user_course_activities.html.erb

@@ -10,10 +10,19 @@
   </span>
   <a href="<%= user_path(rec[:item].user.id) %>" class="c_orange course_name fl mr5" title="<%= rec[:item].user.show_name %>"><%= rec[:item].user.show_name %></a>
     <span class="fl mr5 c_grey"><%= get_activity_opt(rec[:item],rec[:e]) %></span>
-    <a href="<%= get_activity_url(rec[:item],rec[:e]) %>"
+    <% if(( rec[:e].is_public == false || rec[:e].is_public == 0 )&& !rec[:e].visible?)%>
-       class="c_blue02 fl users_courses_txt hidepic" title="<%= get_activity_act_showname(rec[:item]) %>">
+        <a href="<%= get_activity_url(rec[:item],rec[:e]) %>"
-      <%= get_activity_act_showname_htmlclear(rec[:item]) %>
+           class="c_grey fl users_courses_txt hidepic"
-    </a>
+           title="<% if(rec[:item].activity_container_type=='Project')%><%='该项目是私有的，您无权查看。'%><% else %><%='该课程是私有的，您无权查看。' %><% end %>">
+          <%= get_activity_act_showname_htmlclear(rec[:item]) %>
+        </a>
+    <% else %>
+        <a href="<%= get_activity_url(rec[:item],rec[:e]) %>"
+           class="c_blue02 fl users_courses_txt hidepic" title="<%= get_activity_act_showname(rec[:item]) %>">
+          <%= get_activity_act_showname_htmlclear(rec[:item]) %>
+        </a>
+    <% end %>
+
     <span class="fr c_grey mr10"><%= time_tag(get_activity_act_createtime(rec[:item])).html_safe %></span>
   </div>
 <% end %>

app/views/users/user_messages.html.erb

@@ -0,0 +1,254 @@
+<div id="RSide" class="fl">
+<div class="homepageRight">
+<div class="resources">
+<div class="resourcesBanner">
+  <div class="bannerName">消息</div>
+  <ul class="resourcesSelect">
+    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+      <ul class="newsType">
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "全部",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user} %></a></li>
+        <%# 课程相关消息 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作业消息",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'homework'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "通知回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news_reply'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "课程问卷",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'} %></a></li>
+        <%# 项目相关消息 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "指派给我",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "更新了问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "项目新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "新闻回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news_reply'} %></a></li>
+        <%# 项目相关消息 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "贴吧帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'} %></a></li>
+        <%# 系统贴吧 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "用户留言",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'user_feedback'} %></a></li>
+
+      </ul>
+    </li>
+  </ul>
+</div>
+
+<div>
+<% if @new_message_count >0 %>
+    <%# 课程消息 %>
+    <% unless @user_course_messages.nil? %>
+        <% @user_course_messages.each do |ucm| %>
+            <% if ucm.course_message_type == "News" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.author %></a></li>
+                  <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布通知</li>
+                  <li class="homepageNewsContent fl">
+                    <%= link_to "#{ucm.course_message.title.html_safe}", {:controller => 'news', :action => 'show', :id => ucm.course_message.id },
+                    :class =>"#{ucm.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                    :title => "#{ucm.course_message.title.html_safe}" %></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ucm.course_message_type == "Comment" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.author %></a></li>
+                  <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了通知</li>
+                  <li class="homepageNewsContent fl">
+                    <%= link_to "#{ucm.course_message.comments.html_safe}", {:controller => 'news', :action => 'show', :id => ucm.course_message.commented.id },
+                    :class =>"#{ucm.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                    :title => "#{ucm.course_message.comments.html_safe}" %></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ucm.course_message_type == "HomeworkCommon" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
+                  <li class="homepageNewsType fl">发布作业</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to ("#{ucm.course_message.name}"), student_work_index_path(:homework => ucm.course_message.id),:class => "newsGrey", :title => "#{ucm.course_message.name}" %></a></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ucm.course_message_type == "Poll" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.user %></a></li>
+                  <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布问卷</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to format_activity_title(" #{ucm.course_message.polls_name.nil? ? "未命名问卷" : ucm.course_message.polls_name}"), poll_index_path(:polls_type => "Course", :polls_group_id => ucm.course_id),
+                    :class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}",
+                    :title => "#{ucm.course_message.polls_name}" %></a></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ucm.course_message_type == "Message" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.author %></a></li>
+                  <% if ucm.course_message.parent_id.nil? %>
+                      <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
+                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                        <%=link_to ucm.course_message.subject.html_safe, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id,
+                        :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}",
+                        :title => "#{ucm.course_message.subject.html_safe}" %></a></li>
+                      <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                  <% else %>
+                      <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复帖子</li>
+                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                        <%=link_to ucm.course_message.subject.html_safe, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id,
+                        :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}",
+                        :title => "#{ucm.course_message.subject.html_safe}" %> </a></li>
+                      <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                  <% end %>
+                </ul>
+            <% end %>
+            <% if ucm.course_message_type == "StudentWorksScore" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
+                  <li class="homepageNewsType fl">评阅了作品</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to "#{ucm.course_message.comment.nil? ? "分数："+ucm.course_message.score.to_s : "分数："+ucm.course_message.score.to_s + "----" + "评语：" + ucm.course_message.comment}", student_work_index_path(:homework => ucm.course_message.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ucm.course_message.comment}" %></a></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ucm.course_message_type == "JournalsForMessage" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
+                  <li class="homepageNewsType fl">回复了作品</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to ucm.course_message.notes, student_work_index_path(:homework => ucm.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ucm.course_message.notes}" %></a></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <div class="cl"></div>
+        <% end %>
+    <% end %>
+    <!--项目消息-->
+    <% unless @user_forge_messages.nil? %>
+        <% @user_forge_messages.each do |ufm| %>
+            <% if ufm.forge_message_type == "Issue" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.author %></a>
+                  </li>
+                  <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">指派问题给我</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to ("#{ufm.forge_message.subject.html_safe}"), issue_path(:id => ufm.forge_message.id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ufm.forge_message.subject.html_safe}" %></a>
+                  </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ufm.forge_message_type == "Journal" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.user), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.user %></a>
+                  </li>
+                  <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+                    更新了问题
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to get_issue_des_update(ufm.forge_message),
+                    issue_path(:id => ufm.forge_message.journalized_id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                    :title => "#{get_issue_des_update(ufm.forge_message)}" %></a>
+                  </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ufm.forge_message_type == "Message" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ufm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ufm.forge_message.author %></a></li>
+
+                  <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ufm.forge_message.parent_id.nil? ? "发布帖子" : "回复帖子" %></li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%=link_to ufm.forge_message.subject.html_safe, project_boards_path(ufm.forge_message.project,
+                    :parent_id => ufm.forge_message.parent_id ? ufm.forge_message.parent_id : ufm.forge_message.id,
+                    :topic_id => ufm.forge_message.id),:class=>"#{ufm.viewed==0?"newsBlack":"newsGrey"}",
+                    :title => "#{ufm.forge_message.subject.html_safe}" %></a></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+
+                </ul>
+            <% end %>
+            <% if ufm.forge_message_type == "News" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="newsBlue"><%= ufm.forge_message.author %></a>
+                  </li>
+                  <li class="homepageNewsType fl">发布新闻</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to ("#{ufm.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ufm.forge_message.id}, :class => "newsGrey", :title => "#{ufm.forge_message.title.html_safe}" %></a>
+                  </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+            <% if ufm.forge_message_type == "Comment" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a></li>
+                  <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ufm.forge_message.author %></a></li>
+                  <li class="homepageNewsType fl">回复了新闻</li>
+                  <li class="homepageNewsContent fl">
+                    <%= link_to "#{ufm.forge_message.comments.html_safe}",
+                                {:controller => 'news', :action => 'show', :id => ufm.forge_message.commented.id },:class =>"#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ufm.forge_message.comments.html_safe}"%></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+        <% end %>
+    <% end %>
+    <%# 公共贴吧　%>
+    <% unless @user_memo_messages.nil? %>
+        <% @user_memo_messages.each do |urm| %>
+            <% if urm.memo_type == "Memo" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(urm.memo.author), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="newsBlue"><%= urm.memo.author %></a>
+                  </li>
+                  <li class="homepageNewsType fl" >新建贴吧帖子</li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to urm.memo.content.html_safe, forum_memo_path(urm.memo.forum_id, urm.memo.parent_id ? urm.memo.parent_id: urm.memo.id),:class => "newsGrey" , :title => "#{urm.memo.content.html_safe}" %></a>
+                  </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(urm.memo.created_at).html_safe %> </li>
+                </ul>
+            <% end %>
+        <% end %>
+    <% end %>
+    <%# 用户留言消息 %>
+    <% unless @user_feedback_messages.nil? %>
+        <% @user_feedback_messages.each do |ufm| %>
+            <% if ufm.journals_for_message_type == "Principal" %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.journals_for_message.user), :width => "30", :height => "30") %></a>
+                  </li>
+                  <li class="homepageNewsPublisher fl">
+                    <a href="javascript:void(0);" class="newsBlue"><%= ufm.journals_for_message.user %></a>
+                  </li>
+                      <li class="homepageNewsType fl"><%= ufm.journals_for_message.reply_id == 0 ? "给你留言了" : "回复了你的留言" %></li>
+                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                        <%= link_to ufm.journals_for_message.notes.html_safe, feedback_path(ufm.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ufm.journals_for_message.notes.html_safe}" %></a>
+                      </li>
+                  <li class="homepageNewsTime fl"><%= time_tag(ufm.journals_for_message.created_on).html_safe %> </li>
+                </ul>
+            <% end %>
+        <% end %>
+    <% end %>
+<% else %>
+    <div class="flash notice">暂无消息！</div>
+<% end %>
+</div>
+</div>
+</div>
+</div>

config/locales/account/zh.yml

@@ -37,7 +37,7 @@ zh:
   label_password_lost: "忘记密码？"
   button_login: 登录
   #     account_controller中判断用户名或密码输入有误的提示信息
-  notice_account_invalid_creditentials: "无效的用户名或密码"
+  notice_account_invalid_creditentials: "无效的用户名或密码，注意登录名区分大小写，谢谢！"
   #     account_controller中判断未激活的提示信息
   notice_account_invalid_creditentials_new: "您还未到邮箱激活。如果您丢失帐户，电子邮件验证帮助我们的支持团队验证帐户的所有权，并允许您接收所有您要求的通知。"
 

config/locales/my/zh.yml

@@ -33,7 +33,6 @@ zh:
   label_account_identity_studentID: 请输入学号
 
   field_brief_introduction_my: 个人签名
-  field_description: 个人简介
   field_is_required: 必填
   field_firstname: 名字或组织名
   firstname_empty: 名字不能为空

config/locales/projects/en.yml

@@ -42,10 +42,10 @@ en:
   
   label_member: "Members"
   project_module_attachments: "Resources"
-   label_project_mail_attachments: Project Resources
+  label_project_mail_attachments: "Project Resources"
-    label_project_mail_upload: had uploaded project resources
+  label_project_mail_upload: "had uploaded project resources"
 
-  label_invite: Invitation
+  label_invite: "Invitation"
   label_invite_new_user: "Send email to invite new user"
   label_invite_trustie_user: "Invite the Trustie registered user"
 

config/locales/projects/zh.yml

@@ -67,6 +67,13 @@ zh:
   label_project_mail_upload: 上传了资源
 
   label_invite: 邀请
+
+  # 项目消息通知
+  label_forge_message: 消息
+  label_issue_message: 问题
+  label_course_message: 课程消息
+  label_project_message: 项目消息
+
   
   label_issue_tracking: 问题跟踪
   label_release_issue: 发布问题
@@ -363,7 +370,6 @@ zh:
   #     
   label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。'
   field_name: 名称
-  field_description: 描述
   field_identifier: 标识
   field_enterprise_name: 组织名称
   label_organization_choose: --请选择组织--

config/locales/zh.yml

@@ -552,6 +552,7 @@ zh:
   label_registered_on: 注册于
   label_overall_activity: 活动概览
   label_new: 新建
+  label_latest_login_user_list: 最近登录用户列表
 
   label_logged_as: 登录为
   label_environment: 环境
@@ -690,7 +691,7 @@ zh:
   label_sort_lowest: 置底
   label_roadmap_due_in: "截止日期到  %{value}"
   label_roadmap_overdue: "%{value} 延期"
-  label_roadmap_no_issues: 该版本还没有对应的缺陷，可以在“发布问题”的“目标版本”中设置！
+  label_roadmap_no_issues: 该版本还没有对应的缺陷，可以在“发布问题”的“目标版本”中指定版本！
   label_user_search_type: 搜索类型
   label_search_by_login: 登录名
   label_search_by_name: 名字
@@ -1252,6 +1253,7 @@ zh:
   label_leave_message_to: 给用户 %{name}留言
   label_leave_message: 留言内容
   label_message: 留言板
+  label_leave_message_list: 留言列表
   field_add: 添加于 %{time} 之前
 
   label_student_response: 作业答疑 # modified by bai
@@ -1748,6 +1750,7 @@ zh:
   cancel_apply: 取消申请
   apply_master: 申请成为版主
   you_are_master: 您是该项目的版主
+  label_notification_list: 通知
 
   #add by linchun (竞赛相关)
   label_upload_softwarepackage: 上传软件包
@@ -2058,5 +2061,22 @@ zh:
   lable_unset: 未设置
   label_chose_group: 请选择分班
 
+#  label_hosted_organization: 主办单位
+#  label_hosted_by: 国防科学技术大学并行与分布处理国家重点实验室
+#  label_sponsor: 计算机科学与技术系
+#  label_partners: 合作单位
+#  label_co_organizer_NUDT: 国防科学技术大学计算机学院
+#  label_co_organizer_EECS: 北京大学
+#  label_co_organizer_BHU: 北京航空航天大学
+#  label_co_organizer_CAS: 中国科学院软件研究所
+#  label_co_organizer_InforS: 中创软件
+#  label_rights_reserved: Copyright  2007~2015, All Rights Riserved
+#  label_about_us: 关于我们
+#  label_contact_us: 联系我们
+#  label_recruitment_information: 招聘信息
+#  label_surpport_group: 帮助中心
+#  label_forums: 论坛反馈
+#  label_language: 语言
+#  label_license: 湘ICP备09019772
 
 

config/routes.rb

@@ -83,10 +83,13 @@ RedmineApp::Application.routes.draw do
       get 'close_poll'
       get 'export_poll'
       get 'import_poll'
+
     end
     collection do
       delete 'delete_poll_question'
       post 'update_poll_question'
+      get 'other_poll'
+      post 'import_other_poll'
     end
   end
 
@@ -319,6 +322,7 @@ RedmineApp::Application.routes.draw do
       match 'user_visitorlist', :to => 'users#user_visitorlist', :via => :get
       match 'user_homeworks', :to => 'users#user_homeworks', :via => :get
       match 'watch_projects', :to => 'users#watch_projects', :via => :get
+
       # added by bai
       match 'show_score', :to => 'users#show_score', :via => :get
       match 'topic_score_index', :to => 'users#topic_score_index', :via => [:get, :post]
@@ -346,6 +350,7 @@ RedmineApp::Application.routes.draw do
   end
   match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "feedback"
   match 'users/:id/user_projects', :to => 'users#user_projects',  :via => :get
+  match 'users/:id/user_messages', :to => 'users#user_messages', :via => :get
 
   #end
   match 'my/account',  :via => [:get, :post]
@@ -676,6 +681,13 @@ RedmineApp::Application.routes.draw do
   match 'admin/default_configuration', :via => :post
   get 'admin/organization'
   get 'admin/schools'
+  get 'admin/leave_messages'
+  match 'admin/messages_list', as: :messages_list
+  match 'admin/project_messages', as: :project_messages
+  match'admin/course_messages', as: :course_messages
+  get 'admin/notices'
+  get 'admin/latest_login_users'
+  get 'admin/homework'
 
   resources :auth_sources do
     member do

db/migrate/20150801034945_change_result_default.rb

@@ -0,0 +1,9 @@
+class ChangeResultDefault < ActiveRecord::Migration
+  def up
+    change_column :homework_tests,:result,:integer,:default => nil
+  end
+
+  def down
+    change_column :homework_tests,:result,:integer,:default => 0
+  end
+end

db/migrate/20150810064247_add_created_at_to_activities.rb

@@ -0,0 +1,8 @@
+class AddCreatedAtToActivities < ActiveRecord::Migration
+  def up
+  	add_column :activities, :created_at, :timestamp
+  end
+  def end
+  	remove_column :activities, :created_at	
+  end
+end

db/migrate/20150811010817_update_activities_data.rb

@@ -0,0 +1,21 @@
+class UpdateActivitiesData < ActiveRecord::Migration
+  def up 	
+  	count = Activity.all.count / 20 + 1
+    transaction do
+      for i in 1 ... count do i
+        Activity.page(i).per(20).each do |activity|
+          type = activity.act_type
+          if type=='Contest' || type=='Message' || type=='News'|| type=='Journal'|| type=='Issue'|| type=='Principal'||type=='JournalsForMessage'
+            activity.created_at = activity.act.created_on if activity.act
+          elsif type=='Contestnotification' || type=='HomeworkCommon' || type=='Poll'
+            activity.created_at = activity.act.created_at if activity.act
+          end
+          activity.save
+	  	  end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20150811065543_add_course_activities.rb

@@ -0,0 +1,15 @@
+class AddCourseActivities < ActiveRecord::Migration
+  def up
+    create_table :course_activities do |t|
+      t.integer :user_id
+      t.integer :course_id
+      t.integer :course_act_id
+      t.string :course_act_type
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :course_activities
+  end
+end

db/migrate/20150811080754_course_activities.rb

@@ -0,0 +1,40 @@
+#encoding=UTF-8
+class CourseActivities < ActiveRecord::Migration
+  def up
+    Course.all.each do |course|
+      transaction do
+        course.course_acts << CourseActivity.new(:user_id => course.tea_id,:course_id => course.id)
+        #作业
+        course.homework_commons.each do |homework_common|
+          homework_common.course_acts << CourseActivity.new(:user_id => homework_common.user_id,:course_id => course.id)
+        end
+        #通知
+        course.news.each do |new|
+          new.course_acts << CourseActivity.new(:user_id => new.author_id,:course_id => course.id)
+        end
+        #资源
+        course.attachments.each do |attachment|
+          attachment.course_acts << CourseActivity.new(:user_id => attachment.author_id,:course_id => course.id)
+        end
+        #讨论区
+        if course.boards.first
+          course.boards.first.messages.each do |message|
+            message.course_acts << CourseActivity.new(:user_id => message.author_id,:course_id => course.id)
+          end
+        end
+        #留言
+        course.journals_for_messages.each do |jour|
+          jour.course_acts << CourseActivity.new(:user_id => jour.user_id,:course_id => course.id)
+        end
+        #问卷
+        Poll.where("polls_type = 'Course' and polls_group_id = #{course.id}").each do |poll|
+          poll.course_acts << CourseActivity.new(:user_id => poll.user_id,:course_id => course.id)
+        end
+      end
+    end
+  end
+
+  def down
+    CourseActivity.destroy_all
+  end
+end

db/migrate/20150811083322_create_forge_messages.rb

@@ -0,0 +1,13 @@
+class CreateForgeMessages < ActiveRecord::Migration
+  def change
+    create_table :forge_messages do |t|
+      t.integer :user_id
+      t.integer :project_id
+      t.integer :forge_message_id
+      t.string :forge_message_type
+      t.integer :viewed
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20150814011838_create_course_messages.rb

@@ -0,0 +1,13 @@
+class CreateCourseMessages < ActiveRecord::Migration
+  def change
+    create_table :course_messages do |t|
+      t.integer :user_id
+      t.integer :course_id
+      t.integer :course_message_id
+      t.string :course_message_type
+      t.integer :viewed
+
+      t.timestamps
+    end
+  end
+end