Merge remote-tracking branch 'origin/szzh' into guange_dev

app/controllers/activity_notifys_controller.rb

@@ -0,0 +1,54 @@
+class ActivityNotifysController < ApplicationController
+#  layout 'base_projects'#by young
+#  default_search_scope :messages
+  before_filter :find_project_by_project_id#, :find_board_if_available
+#  before_filter :authorize, :except => [:new, :show, :create, :index]
+#  accept_rss_auth :index, :show
+
+  helper :activities
+  def index
+    query = nil
+    if @course
+      query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=?',@course.id,'Course',User.current.id);
+    else
+      @events_by_day = []
+    end
+
+    if( query != nil )
+      logger.info('xxoo')
+      limit = 10;
+      @obj_count = query.count();
+      @obj_pages = Paginator.new @obj_count,limit,params['page']
+      list = query.order('id desc').limit(limit).offset(@obj_pages.offset).all();
+      events=[];
+      for item in list
+        event = item.activity;
+        event.set_notify_id(item.id)
+        event.set_notify_is_read(item.is_read)
+        events << event
+      end
+      @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
+      @controller_name = 'ActivityNotifys'
+      logger.info('aavv')
+    end
+    respond_to do |format|
+      format.html  {render :template => 'courses/show', :layout => 'base_courses'}
+    end
+  end
+
+  def chang_read_flag
+    if @course
+      if(params[:an_id] != nil )
+        query = ActivityNotify.where('id=? and notify_to=?',params[:an_id],User.current.id)
+      else
+        query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=? and is_read=0',@course.id,'Course',User.current.id)
+      end
+      @result = query.update_all('is_read=1');
+    else
+      @result = false;
+    end
+    respond_to do |format|
+      format.html{render :layout => nil}
+    end
+  end
+end

app/controllers/attachments_controller.rb

@@ -211,9 +211,19 @@ class AttachmentsController < ApplicationController
       if !@attachment.container.nil? &&
          (@attachment.container.is_a?(Course) || ((@attachment.container.has_attribute?(:course) || @attachment.container.has_attribute?(:course_id) )  &&
          @attachment.container.course ) || ((@attachment.container.has_attribute?(:board) || @attachment.container.has_attribute?(:board_id)) &&
-         @attachment.container.board && @attachment.container.board.course ) )
+         @attachment.container.board && @attachment.container.board.course ) || @attachment.container.is_a?(StudentWorksScore) ||  @attachment.container.is_a?(HomeworkCommon) ||
+         @attachment.container.is_a?(StudentWork))
         if @attachment.container.is_a?(News)
           format.html { redirect_to_referer_or news_path(@attachment.container) }
+        elsif @attachment.container.is_a?(StudentWorksScore)
+          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          format.js
+        elsif @attachment.container.is_a?(HomeworkCommon)
+          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          format.js
+        elsif @attachment.container.is_a?(StudentWork)
+          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          format.js
         elsif @attachment.container.is_a?(Message)
           format.html { redirect_to_referer_or new_board_message_path(@attachment.container) }
         elsif @course.nil?
@@ -451,7 +461,7 @@ private
         @attachment.container.board.course)
       @course = @attachment.container.board.course
     else
-      unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWorks'
+      unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
         @project = @attachment.project
       end
     end

app/controllers/boards_controller.rb

@@ -88,14 +88,40 @@ class BoardsController < ApplicationController
               preload(:author, {:last_reply => :author}).
               all
         elsif @course
-          board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
-              includes(:last_reply).
-              # limit(@topic_pages.per_page).
-              # offset(@topic_pages.offset).
-
-              preload(:author, {:last_reply => :author}).
-              all : []
-          @topics = paginateHelper board_topics,10
+          #
+          # board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
+          #     includes(:last_reply).
+          #     # limit(@topic_pages.per_page).
+          #     # offset(@topic_pages.offset).
+          #
+          #     preload(:author, {:last_reply => :author}).
+          #     all : []
+          # @topics = paginateHelper board_topics,10
+          if( @board )
+            limit = 10;
+            pageno = params[:page];
+            if(pageno == nil || pageno=='')
+              dw_topic = nil;
+              if( params[:parent_id]!=nil && params[:parent_id]!='' )
+                dw_topic = @board.topics.where(id:params[:parent_id]).first();
+              end
+              if( dw_topic != nil )
+                dw_count = @board.topics.where('(sticky>?) or (sticky=? and created_on>?)',dw_topic.sticky,dw_topic.sticky,dw_topic.created_on).count();
+                dw_count = dw_count+1;
+                pageno = dw_count%10==0 ? (dw_count/limit) : (dw_count/limit+1)
+              end
+            end
+            if(pageno == nil || pageno=='')
+              pageno=1;
+            end
+            @topic_count = @board.topics.count();
+            @topic_pages = Paginator.new @topic_count, limit, pageno
+            @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
+                            limit(limit).offset(@topic_pages.offset).includes(:last_reply).
+                            preload(:author, {:last_reply => :author}).all();
+          else
+            @topics = [];
+          end
         end
 
         @message = Message.new(:board => @board)
@@ -103,6 +129,7 @@ class BoardsController < ApplicationController
         if @project
           render :action => 'show', :layout => 'base_projects'
         elsif @course
+          @params=params
           render :action => 'show', :layout => 'base_courses'
         end
       }

app/controllers/homework_attach_controller.rb

@@ -334,9 +334,8 @@ class HomeworkAttachController < ApplicationController
       @homework.name = name
       @homework.description = description
       @homework.project_id = params[:project_id] || 0
-      if params[:attachments]
       @homework.save_attachments(params[:attachments])
-      end
+      render_attachment_warning_if_needed(@homework)
       if @homework.save
         respond_to do |format|
           format.html { redirect_to course_for_bid_url @homework.bid }

app/controllers/homework_common_controller.rb

@@ -5,7 +5,7 @@ class HomeworkCommonController < ApplicationController
   before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
 
   def index
-    homeworks = @course.homework_commons
+    homeworks = @course.homework_commons.order("created_at desc")
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @homeworks = paginateHelper homeworks,20
@@ -17,14 +17,14 @@ class HomeworkCommonController < ApplicationController
   def new
     @homework = HomeworkCommon.new
     @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 2
+    @homework.late_penalty = 0
     @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
     @homework.publish_time = Time.now.strftime('%Y-%m-%d')
 
     #匿评作业相关属性
     @homework_detail_manual = HomeworkDetailManual.new
     @homework_detail_manual.ta_proportion = 0.6
-    @homework_detail_manual.absence_penalty = 2
+    @homework_detail_manual.absence_penalty = 0
     @homework_detail_manual.evaluation_num = 3
     @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
     @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
@@ -101,6 +101,9 @@ class HomeworkCommonController < ApplicationController
     @homework_detail_manual.evaluation_num = params[:evaluation_num]
     @homework_detail_manual.absence_penalty = params[:absence_penalty]
 
+    @homework.save_attachments(params[:attachments])
+    render_attachment_warning_if_needed(@homework)
+
     if @homework.save && @homework_detail_manual.save
       respond_to do |format|
         format.html {
@@ -197,7 +200,7 @@ class HomeworkCommonController < ApplicationController
   end
   #是不是课程的老师
   def teacher_of_course
-    render_403 unless User.current.allowed_to?(:as_teacher,@course)
+    render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
   end
 
   def get_assigned_homeworks(student_works, n, index)

app/controllers/messages_controller.rb

@@ -31,6 +31,8 @@ class MessagesController < ApplicationController
   include AttachmentsHelper
   helper :project_score
 
+  include CoursesHelper
+
   REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE)
 
   # Show a topic and its replies
@@ -91,6 +93,29 @@ class MessagesController < ApplicationController
           ids = params[:asset_id].split(',')
           update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
         end
+        # 与我相关动态的记录add start
+        if(@board.course_id>0) #项目的先不管
+          teachers = searchTeacherAndAssistant(@board.course);
+          for teacher in teachers
+            if(teacher.user_id != User.current.id)
+              notify = ActivityNotify.new()
+              if(@board.course_id>0)
+                notify.activity_container_id = @board.course_id
+                notify.activity_container_type = 'Course'
+              else
+                notify.activity_container_id = @board.project_id
+                notify.activity_container_type = 'Project'
+              end
+              notify.activity_id = @message.id
+              notify.activity_type = 'Message'
+              notify.notify_to = teacher.user_id
+              notify.is_read = 0
+              notify.save()
+            end
+          end
+        end
+        # 与我相关动态的记录add end
+
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
         render_attachment_warning_if_needed(@message)
         if params[:is_board]
@@ -151,6 +176,35 @@ class MessagesController < ApplicationController
         ids = params[:asset_id].split(',')
         update_kindeditor_assets_owner ids,@reply.id,OwnerTypeHelper::MESSAGE
       end
+
+      # 与我相关动态的记录add start
+      if(@board.course_id>0) #项目的先不管
+        notifyto_arr = {}
+        notifyto_arr[@topic.author_id] = @topic.author_id
+        if( params[:parent_topic] != nil && params[:parent_topic] != '')
+          parent_topic = Message.find(params[:parent_topic])
+          notifyto_arr[parent_topic.author_id] = parent_topic.author_id
+        end
+        notifyto_arr.each do |k,user_id|
+          if(user_id != User.current.id)
+            notify = ActivityNotify.new()
+            if(@board.course_id>0)
+              notify.activity_container_id = @board.course_id
+              notify.activity_container_type = 'Course'
+            else
+              notify.activity_container_id = @board.project_id
+              notify.activity_container_type = 'Project'
+            end
+            notify.activity_id = @reply.id
+            notify.activity_type = 'Message'
+            notify.notify_to = user_id
+            notify.is_read = 0
+            notify.save()
+          end
+        end
+      end
+      # 与我相关动态的记录add end
+
       call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
       attachments = Attachment.attach_files(@reply, params[:attachments])
       render_attachment_warning_if_needed(@reply)

app/controllers/projects_controller.rb

@@ -364,6 +364,7 @@ class ProjectsController < ApplicationController
   #发送邮件邀请新用户
   def invite_members_by_mail
     if User.current.member_of?(@project) || User.current.admin?
+      @inviter_lists = InviteList.where(project_id:@project.id).all
       @is_zhuce = false
       respond_to do |format|
         format.html

app/controllers/student_work_controller.rb

@@ -253,13 +253,13 @@ class StudentWorkController < ApplicationController
   #是不是当前课程的成员
   #当前课程成员才可以看到作品列表
   def member_of_course
-    render_403 unless User.current.member_of_course? @course
+    render_403 unless User.current.member_of_course? @course || User.current.admin?
   end
 
   #判断是不是当前作品的提交者
   #提交者 && (非匿评作业 || 未开启匿评) 可以编辑作品
   def author_of_work
-    render_403 unless User.current.id == @work.user_id && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 )
+    render_403 unless (User.current.id == @work.user_id || User.current.admin?) && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 )
   end
 
   #根据条件过滤作业结果

app/helpers/homework_common_helper.rb

@@ -3,7 +3,7 @@ module HomeworkCommonHelper
   #迟交扣分下拉框
   def late_penalty_option
     type = []
-    for i in (1..5)
+    for i in (0..5)
       option = []
       option << i
       option << i
@@ -29,7 +29,7 @@ module HomeworkCommonHelper
   #缺评扣分
   def absence_penalty_option
     type = []
-    i = 1
+    i = 0
     while  i <= 5
       option = []
       option << i

app/models/activity_notify.rb

@@ -0,0 +1,3 @@
+class ActivityNotify < ActiveRecord::Base
+  belongs_to :activity, polymorphic: true
+end

app/models/invite_list.rb

@@ -1,5 +1,13 @@
 class InviteList < ActiveRecord::Base
   attr_accessible :project_id, :user_id
-  # belongs_to :user
-  # belongs_to :project
+  belongs_to :user
+  belongs_to :project
+
+  # 用户拒绝邀请后，删除记录
+  def self.delete_inviter(userid, projectid)
+    @inviters = AppliedProject.where("user_id = ? and project_id = ?", userid, projectid)
+    @inviters.each do |inviter|
+      inviter.destroy
+    end
+  end
 end

app/models/mailer.rb

@@ -58,6 +58,7 @@ class Mailer < ActionMailer::Base
     us = UsersService.new
     # 自动激活用户
     user = us.register_auto(login, @email, @password)
+    InviteList.create(:user_id => user.id, :project_id => project.id)
     User.current = user unless User.current.nil?
     @user = user
 
@@ -73,6 +74,10 @@ class Mailer < ActionMailer::Base
     @project_name = "#{project.name}"
     @user = user
     @project = project
+    inviter_lists = InviteList.where(project_id:@project.id, user_id:@user.id).all
+    if inviter_lists.blank?
+      InviteList.create(:user_id => user.id, :project_id => project.id)
+    end
     @token = Token.get_token_from_user(user, 'autologin')
     @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true, :token => @token.value)
     mail :to => email, :subject => @subject
@@ -83,13 +88,10 @@ class Mailer < ActionMailer::Base
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
   def send_for_user_activities(user, date_to, days)
     date_from = date_to - days.days
-
     subject = "[ #{user.show_name}#{l(:label_day_mail)}]"
     @subject = " #{user.show_name}#{l(:label_day_mail)}"
-
     date_from = "#{date_from} 17:59:59"
     date_to = "#{date_to} 17:59:59"
-    
     # 生成token用于直接点击登录
     @user = user
     @token = Token.get_token_from_user(user, 'autologin')
@@ -100,19 +102,15 @@ class Mailer < ActionMailer::Base
     project_ids = projects.map{|project| project.id}.join(",")
     course_ids = courses.map {|course| course.id}.join(",")
 
-    # 查询user的缺陷，包括发布的，跟踪的以及被指派的缺陷
-    sql = "select DISTINCT i.* from issues i, watchers w
-                        where (i.assigned_to_id = #{user.id} or i.author_id = #{user.id}
-                                or (w.watchable_type = 'Issue' and w.watchable_id = i.id and w.user_id = #{user.id}))
+    # 查询user的缺陷，项目中成员都能收到
+    sql = "select * from members m, issues i where i.project_id = m.project_id and m.user_id='#{user.id}'
      and (i.created_on between '#{date_from}' and '#{date_to}') order by i.created_on desc"
     @issues = Issue.find_by_sql(sql)
 
     # @bids 查询课程作业，包括老师发布的作业，以及user提交作业
     # @attachments查询课程课件更新
     @attachments ||= []
-
     @bids ||= []  # 老师发布的作业
-
     unless courses.first.nil?
       count = courses.count
       count = count - 1
@@ -127,7 +125,9 @@ class Mailer < ActionMailer::Base
     @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc")
 
     # 查询user在课程。项目中发布的讨论帖子
-    messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+    messages = Message.find_by_sql("select me.* from messages me, boards b, members m where
+     b.id = me.board_id and b.project_id = m.project_id and m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+    # messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
     @course_messages ||= []
     @project_messages ||= []
     unless messages.first.nil?
@@ -139,6 +139,7 @@ class Mailer < ActionMailer::Base
         end
       end
     end
+
     #  查询user在课程中发布的通知，项目中发的新闻
     @course_news = (course_ids && !course_ids.empty?) ? News.find_by_sql("select DISTINCT n.*  from news n
                                                 where n.course_id in (#{course_ids})
@@ -151,18 +152,13 @@ class Mailer < ActionMailer::Base
                                                   jour_type='Course' and user_id = #{user.id}
                                                   and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
     @user_journal_messages = user.journals_for_messages.where("m_parent_id IS NULL and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC')
-
-
     # 查询user新建贴吧或发布帖子
     @forums = Forum.find_by_sql("select  DISTINCT * from forums where creator_id = #{user.id} and (created_at between '#{date_from}' and '#{date_to}') order by created_at desc")
     @memos = Memo.find_by_sql("select DISTINCT m.* from memos m, forums f where (m.author_id = #{user.id} or (m.forum_id = f.id and f.creator_id = #{user.id}))
                            and (m.created_at between '#{date_from}' and '#{date_to}')  order by m.created_at desc")
 
-
     has_content = [@issues,@homeworks,@course_messages,@project_messages,@course_news,@project_news,
-                   @course_journal_messages,@user_journal_messages,@forums,@memos,@attachments,@bids].any? {|o|
-                    !o.empty?
-                  }
+                   @course_journal_messages,@user_journal_messages,@forums,@memos,@attachments,@bids].any? {|o| !o.empty?}
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
     mail :to => user.mail,:subject => subject if has_content

app/models/message.rb

@@ -34,6 +34,8 @@ class Message < ActiveRecord::Base
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # end
 
+  has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
+
   acts_as_searchable :columns => ['subject', 'content'],
                      :include => {:board => :project},
                      :project_key => "#{Board.table_name}.project_id",
@@ -148,6 +150,19 @@ class Message < ActiveRecord::Base
     usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project)))
   end
 
+  def set_notify_id(notify_id)
+    @notify_id= notify_id
+  end
+  def get_notify_id()
+    return @notify_id
+  end
+  def set_notify_is_read(notify_is_read)
+    @notify_is_read = notify_is_read
+  end
+  def get_notify_is_read()
+    return @notify_is_read
+  end
+
   private
 
   def add_author_as_watcher
@@ -218,4 +233,5 @@ class Message < ActiveRecord::Base
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE
   end
+
 end

app/models/project.rb

@@ -67,7 +67,7 @@ class Project < ActiveRecord::Base
   has_many :student, :through => :students_for_courses, :source => :user
   has_one :course_extra, :class_name => 'Course', :foreign_key => :extra,:primary_key => :identifier, :dependent => :destroy
   has_many :applied_projects
-  # has_many :invite_lists
+  has_many :invite_lists
 
   # end
   #ADDED BY NIE

app/views/activity_notifys/chang_read_flag.html.erb

@@ -0,0 +1 @@
+<%= @result == false ? 'false' : 'true' %>

app/views/attachments/destroy.js.erb

@@ -1,3 +1,6 @@
+<% if @is_destroy%>
+    $("#attachment_<%= @attachment.id%>").remove();
+<%else%>
     var attachment_html_obj = $('#attachments_<%= j params[:attachment_id] %>');
     //modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  start
     var containerid=$('.remove-upload',attachment_html_obj).data('containerid');
@@ -24,3 +27,4 @@ if(containerid==undefined){
         }
     }
     //modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  end
+<% end%>

app/views/boards/_course_show.html.erb

@@ -109,6 +109,7 @@
                                :html => {:nhname=>"form",:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
 
                       <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+                      <input name="parent_topic" type="hidden" value=""/>
                       <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
                       <div style="padding-top:5px;" class="fr">
                         <a href="javascript:void(0)" nhname="cancelbtn" class="grey_btn fr ml10" style=""><%= l(:button_cancel)%></a>
@@ -127,7 +128,7 @@
                   <ul>
                     <% replies_all.each do |message| %>
                         <% replies_all_i=replies_all_i+1 %>
-                        <li nhname="reply_rec" style="display:<%= replies_all_i>2?'none':'' %>">
+                        <li nhname="reply_rec" style="display:<%= replies_all_i>2?'none':'' %>" id="topic<%=message.id%>">
                           <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
                           <div class="Msg_txt">
                             <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
@@ -151,6 +152,7 @@
                                         :nhname =>'showbtn_child_reply',
                                         :class => ' c_dblue fr',
                                         :style => 'margin-right: 10px;',
+                                        'data-topic-id' =>message.id,
                                         :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %>
                           </div>
                           <div class="cl"></div>
@@ -172,7 +174,8 @@
     <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 <ul class="wlist">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+  <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+  <%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => false, :flag => true %>
 </ul>
 <%# other_formats_links do |f| %>
 <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
@@ -255,6 +258,18 @@
                 }
                 nh_init_board(params);
             });
+
+            <% if( @params[:topic_id]!=nil && @params[:topic_id]!='' && @params[:page]==nil ) %>
+            var nh_dw_html = $("#topic<%=@params[:topic_id]%>");
+            if(nh_dw_html!=undefined && nh_dw_html.length!=0){
+                if(nh_dw_html.is(':hidden')){
+                    $("a[nhname='reply_ex_btn']",nh_dw_html.parent('ul').parent('div').parent('div')).click();
+                }
+                $("#nhjump").attr('href','#'+nh_dw_html.attr('id'));
+                $("#nhjump")[0].click();
+
+            }
+            <% end %>
             <% if(!@flag.nil? && @flag=='true') %>
             if($("#new_topic_btn")!=undefined)$("#new_topic_btn").click();
             <% end %>

app/views/boards/show.html.erb

@@ -1,11 +1,11 @@
-<style>
-    .ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    .ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    .ke-toolbar-icon-url{background-image:url( '/images/public_icon.png' )}
-    .ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    .ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    .ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    .ke-toolbar .ke-outline{border:none;}
+<style type="text/css">
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
     .break_word {width:100%;}
 </style>
 <script type="text/javascript">
@@ -13,7 +13,9 @@
     var menuids=["TopUserNav"] //Enter id(s) of SuckerTree UL menus, separated by commas
     function buildsubmenus(){
         for (var i=0; i<menuids.length; i++){
-            var ultags=document.getElementById(menuids[i]).getElementsByTagName("ul")
+            var div = document.getElementById(menuids[i]);
+            if(div == undefined)continue;
+            var ultags=div.getElementsByTagName("ul")
             for (var t=0; t<ultags.length; t++){
                 ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle"
                 ultags[t].parentNode.onmouseover=function(){
@@ -201,6 +203,8 @@ function nh_init_board(params){
                     params.cancelbtn.click();
                 }
             }
+            var parent_topic_id =  $(this).data('topic-id');
+            if(parent_topic_id!=undefined)$("input[name='parent_topic']",params.form).val(parent_topic_id);
             var ref_str = params.get_ref_str_call($(this));
             params.quote_show.html(ref_str);
             params.quote_input.html(ref_str);

app/views/courses/_show_member_score.html.erb

@@ -1,24 +1,5 @@
 <style>
-    table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-    ul,li{ list-style-type:none}
-    .cl{ clear:both; overflow:hidden; }
-    a{ text-decoration:none; text-align:center; }
-    a:hover{ text-decoration:underline;}
-    /**** 常用***/
-    .f_l{ float:left;}
-    .f_r{ float:right;}
-    .b_lblue{ background:#64bdd9;}
-    .b_dblue{ background:#55a1b9; cursor:pointer;}
-    .f_b{ font-weight: bold;}
-    .c_blue{ color:#64bdd9;}
-    .c_grey{ color:#999999;}
     .c_grey02{ color:#666666;}
-    .f_14{ font-size:14px;}
-    .c_dblue{ color:#3e6d8e;}
-    .w90{width:90px;}
-    .ml10{margin-left:10px;}
-    .ml5{margin-left:5px;}
-    .b_grey{ background:#a3a3a3;}
     .c_blue02{ color:#15bcce; font-weight: bold;}
     .w280{ display:block; width:280px;float:left;}
     .w70{ display:block;width:70px; text-align:center; float:left;}
@@ -26,9 +7,6 @@
     .c_blue03{ color:#0d90c4;}
 
 
-    /***弹框***/
-    /*#popbox_tscore{width:480px;position:absolute;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}*/
-    /*.alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;}*/
     .tscore_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  text-align: center; padding-top:5px;}
     .tscore_box{ width:350px; margin:15px auto;}
     .tscore_box li{ height:25px;}
@@ -40,11 +18,16 @@
     <ul class="tscore_box">
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>
       <% @member_score.student_homework_score[0].each do |homework_score| %>
-
-            <li><span class="c_grey02 w280"><%= homework_score.name %></span><span class="c_red w70"><%= format("%0.2f",homework_score[:score].nil? ? 0 : homework_score[:score]) %></span></li>
+            <li>
+              <span class="c_grey02 w280">
+                <%= homework_score.name %>
+              </span>
+              <span class="c_red w70">
+                <%= format("%0.2f",homework_score[:score].nil? ? 0 : homework_score[:score]) %>
+              </span>
+            </li>
        <% end %>
       <li><span class="c_blue03 w280">作业积分（总得分）</span><span class="c_red w70"><%= @member_score.student_homework_score[1] %></span></li>
     </ul>
 
-
   </div>

app/views/courses/show.html.erb

@@ -1,11 +1,22 @@
 <div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_activity)%></h2>
+<% if @controller_name=='ActivityNotifys' %>
+  <a class="fl about_me" href="<%=course_path(@course)%>"><%= l(:label_activity)%></a>
+  <h2 class="fl project_h2">与我相关</h2>
+  <div class="fr mt10 mr5 c_grey02">
+    <label class="mr5" style="cursor:pointer;" data-href="<%= course_activity_notifys_path(@course) %>/chang_read_flag" nhname='nh_act_link_all'>全部标为已读</label>
+  </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)%>">与我相关</a>
+  <% end %>
+<% end %>
 </div>
 
 <% if @events_by_day != nil && @events_by_day.size >0 %>
     <% @events_by_day.keys.sort.reverse.each do |day| %>
         <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
-            <div class="problem_main">
+            <div class="problem_main" nhname="container">
               <a class="problem_pic fl">
                 <%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %>
               </a>
@@ -14,8 +25,19 @@
                 <%= link_to_user_header("(#{e.event_author})", @canShowRealName,:class => 'problem_name c_orange fl') if @canShowRealName && e.respond_to?(:event_author) %>
                 <span class="fl"> &nbsp;</span>
                 <span class="fl"> <%= l(:label_new_activity) %>：</span>
-                <%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) :
-                        (e.event_type.eql?("bid") ? homework_course_path(@course) : (e.event_type.eql?("message") || e.event_type.eql?("reply")  ?  course_boards_path(@course,:topic_id => e.id) : e.event_url)),:class => "problem_tit c_dblue fl fb"%>
+                <%
+                     link = (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) :
+                                (e.event_type.eql?("bid") ? homework_course_path(@course) :
+                                         (e.event_type.eql?("message") || e.event_type.eql?("reply")  ?
+                                                course_boards_path(@course,:topic_id => e.id,:parent_id=>(e.parent_id ? e.parent_id : e.id)) : e.event_url))
+                %>
+                <%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), link,
+                            :class => "problem_tit c_dblue fl fb",'data-type'=>e.event_type,
+                            '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)%>
+                <%if @controller_name=='ActivityNotifys' && !e.get_notify_is_read%>
+                <span nhname="nh_act_flag" class="ml10 fl"><img src="/images/new.png" width="35" height="15"/></span>
+                <%end%>
                 <br />
                 <p class="mt5 break_word"><%= e.event_description.html_safe %>
                   <br />
@@ -28,7 +50,7 @@
         <% end%>
     <% end%>
 <% end%>
-<% if @obj_pages.next_page.nil? %>
+<% 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") %>
@@ -51,3 +73,35 @@
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
 <div class="cl"></div>
+
+<script type="text/javascript">
+  $(function(){
+      $("div[nhname='container']").each(function(){
+          var container = $(this);
+          var btn = $("a[nhname='nh_act_link']",container);
+          if(btn.data('notify-id')>0){
+              btn.attr('target','_blank');
+              btn.click(function(){
+                  var flag = $("span[nhname='nh_act_flag']",container);
+                  if(flag!=undefined){
+                      var url = $(this).data('href');
+                      $.ajax({url:url,dataType:'text',success:function(data){
+                          if(data == 'true'){
+                              flag.remove();
+                          }
+                      }});
+                  }
+                  return true;
+              });
+          }
+      });
+      $("label[nhname='nh_act_link_all']").click(function(){
+          var url = $(this).data('href');
+          $.ajax({url:url,dataType:'text',success:function(data){
+              if(data == 'true'){
+                  $("span[nhname='nh_act_flag']").remove();
+              }
+          }});
+      });
+  });
+</script>

app/views/courses/show_member_score.js.erb

@@ -6,8 +6,8 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'courses/show_me
 showModal('ajax-modal', '400px');
 //$('#ajax-modal').css('height','569px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
-"<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' style='margin-left: -30px;' /></a></span>");
+$('#ajax-modal').before("<span>" +
+"<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' style='margin-left: 375px;' /></a></span>");
 //$('#ajax-modal').parent().removeClass();
 $('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed");
 $('#ajax-modal').parent().addClass("new-watcher");

app/views/files/_course_list.html.erb

@@ -45,7 +45,7 @@
               <% end %>
             </div>
             <div class="cl"></div>
-            <div class="">
+            <div class="mt5">
               <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
               <%= link_to( l(:button_delete), attachment_path(file),
                            :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>

app/views/homework_common/_homework_common_form.html.erb

@@ -33,7 +33,7 @@
     <%= calendar_for('homework_end_time')%>
     <div class="cl"></div>
   </li>
-  <li class="fl ml100">
+  <li class="fl ml100" style="display: none;">
     <label class="label02">&nbsp;发布日期：&nbsp;</label>
     <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.publish_time%>" >
     <%= calendar_for('homework_publish_time')%>
@@ -45,7 +45,7 @@
   <p class="fl ml20 f14 mb10 c_orange">基本规则设置（总分为100分）</p>
   <div class="cl"></div>
     <ul class="ml10">
-      <li>
+      <li style="display: none;">
         <label class="label02">迟交扣分：&nbsp;</label>
         <%= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
         <span class="fl mt5">&nbsp;分</span>
@@ -78,13 +78,13 @@
   <p class="fl ml20 f14 mb10 c_orange">学生互评设置</p>
   <div class="cl"></div>
   <ul class="ml10">
-    <li >
+    <li style="display: none;">
       <label class="label02">互评启动时间：&nbsp;</label>
       <input  type="text" name="evaluation_start" id="evaluation_start_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_start%>" >
       <%= calendar_for('evaluation_start_time')%>
       <div class="cl"></div>
     </li>
-    <li >
+    <li style="display: none;">
       <label class="label02">互评结束时间：&nbsp;</label>
       <input  type="text" name="evaluation_end" id="evaluation_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_end%>" >
       <%= calendar_for('evaluation_end_time')%>
@@ -97,7 +97,7 @@
       <div class="cl"></div>
     </li>
 
-    <li >
+    <li style="display: none;">
       <label class="label02">缺评扣分：&nbsp;</label>
       <%= select_tag :absence_penalty,options_for_select(absence_penalty_option,homework.homework_detail_manual.absence_penalty), {:class => "fl mb10 h26 w70"}  %>
       <span class="fl mt5">&nbsp;分</span>

app/views/layouts/_new_header.html.erb

@@ -18,15 +18,15 @@
         <% if User.current.logged? -%>
 
             <li id="current_user_li">
-              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user}, :class => "uses_name"%>
+              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user}, target:"_blank", :class => "uses_name"%>
               <ul id="user_sub_menu" style="right: 0px;display: none;">
                 <% unless User.current.projects.empty? %>
                     <li id="my_projects_li">
-                      <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name}, :class => "parent" %>
+                      <%= 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.each do |project| %>
                             <li title="<%=project.name%>">
-                              <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name } %>
+                              <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name }, target:"_blank" %>
                             </li>
                         <% end %>
                       </ul>
@@ -37,11 +37,11 @@
                     <% user_course = get_user_course User.current%>
                     <% unless user_course.empty? %>
                         <li  id="my_courses_li">
-                          <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id}, :class => "parent"  %>
+                          <%=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.each do |course| %>
                                 <li title="<%=course.name%>">
-                                  <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id} %>
+                                  <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id},target:"_blank" %>
                                 </li>
                             <% end %>
                           </ul>

app/views/mailer/news_added.html.erb

@@ -1,9 +1,6 @@
-
 <p>
   <span class="c_blue" style="color:#1b55a7;">
-
     <%= link_to(h("#{@news.author.login}(#{@news.author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
-
     </span><%= l(:mail_issue_title_userin)%>
   <span class="c_blue" style="color:#1b55a7;">
      <% if @news.project %>
@@ -11,7 +8,8 @@
   <% elsif @news.course %>
      <%=h @news.course.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
   <% end %>
-  </span><%= l(:mail_issue_title_active)%></p>
+  </span><%= l(:mail_issue_title_active)%>
+</p>
 <div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
   <ul style="list-style-type:none; margin:0; padding:0;">
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span>
@@ -25,7 +23,7 @@
     </li>
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-        	<%= @news.description %>
+            <%= @news.description.html_safe %>
         </span>
     </li>