Merge branch 'szzh' into develop

app/controllers/courses_controller.rb

@@ -631,6 +631,11 @@ class CoursesController < ApplicationController
   end
 
   def feedback
+   @course.journals_for_messages.each do |messages|
+     query = messages.course_messages.where("user_id = ?", User.current.id)
+     query.update_all(:viewed => true);
+   end
+
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       page = params[:page]
       # Find the page of the requested reply

app/controllers/homework_common_controller.rb

@@ -206,6 +206,7 @@ class HomeworkCommonController < ApplicationController
         end
         @homework_detail_manual.update_column('comment_status', 2)
         @statue = 1
+        # send_message_homework(@homework)
       else
         @statue = 2
       end
@@ -224,12 +225,21 @@ class HomeworkCommonController < ApplicationController
       student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
       student_work.save
     end
-
+    # send_message_homework(@homework)
     respond_to do |format|
       format.js
     end
   end
 
+  # 开启/关闭匿评消息通知
+  # def send_message_homework(homework)
+  #   # status 标记匿评状态 1为关闭 0为开启
+  #   course = @homework.course
+  #   course.student.each do |st|
+  #     @homework.course_messages << CourseMessage.new(:user_id => st.user_id, :course_id => course.id, :viewed => false, :status => false)
+  #   end
+  # end
+
   #提示
   def alert_anonymous_comment
     @cur_size = 0

app/controllers/projects_controller.rb

@@ -33,7 +33,7 @@ class ProjectsController < ApplicationController
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics #:watcherlist
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
-  before_filter :memberAccess, only: :member
+  # before_filter :memberAccess, only: :member
 
   # accept_rss_auth :index
   accept_api_auth :index, :show, :create, :update, :destroy
@@ -358,24 +358,57 @@ class ProjectsController < ApplicationController
 
   end
 
+  # 项目邀请用户加入实现过程
   # 两种情况：1、系统外用户；2、系统内用户 (通过邮件判定)
   def send_mail_to_member
+    # 该邮箱未注册过
     if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
-      email = params[:mail]
-      Mailer.run.send_invite_in_project(email, @project, User.current)
-      @is_zhuce = false
-      flash[:notice] = l(:notice_email_sent, :value => email)
+      if !User.where("login =?", params[:mail]).first.nil?
+        # 用户名唯一，用户修改邮箱，未修改用户名，用户名等同邮箱的情况，默认改用户已经注册
+        user = User.find_by_login(params[:mail].to_s)
+        if !user.member_of?(@project)
+          # 如果已经邀请过该用户，则不重复发送
+          if InviteList.where("project_id =? and mail =?", @project.id, params[:mail].to_s).first.nil?
+            email = params[:mail]
+            Mailer.request_member_to_project(email, @project, User.current).deliver
+            flash[:notice] = l(:notice_email_sent, :value => email)
+          else
+            flash[:error] = l(:notice_email_invited)
+          end
+        else
+          flash[:error] = l(:label_member_of_project, :value => email)
+        end
+      else
+        email = params[:mail]
+        Mailer.send_invite_in_project(email, @project, User.current).deliver
+        @is_zhuce = false
+        flash[:notice] = l(:notice_email_sent, :value => email)
+      end
+
+    # 邮箱地址已被注册
     elsif !User.find_by_mail(params[:mail].to_s).nil?
       user = User.find_by_mail(params[:mail].to_s)
       if !user.member_of?(@project)
-        email = params[:mail]
-        Mailer.run.request_member_to_project(email, @project, User.current)
-        flash[:notice] = l(:notice_email_sent, :value => email)
+        # 如果已经邀请过该用户，则不重复发送
+        invite_list = InviteList.where("project_id =? and mail =?", @project.id, params[:mail].to_s).first
+        if invite_list.nil?
+          email = params[:mail]
+          Mailer.request_member_to_project(email, @project, User.current).deliver
+          flash[:notice] = l(:notice_email_sent, :value => email)
+        else
+          # 已经发送过了，则隔3小时才能再次发送
+          if Time.now - invite_list.created_at > 10800
+            email = params[:mail]
+            Mailer.request_member_to_project(email, @project, User.current).deliver
+            flash[:notice] = l(:notice_email_sent, :value => email)
+          else
+            flash[:error] = l(:notice_email_invited)
+          end
+        end
       else
         flash[:error] = l(:label_member_of_project, :value => email)
       end
     else
-      flash[:error] = l(:notice_registed_error, :value => email)
       @is_zhuce = true
     end
     respond_to do |format|
@@ -383,25 +416,26 @@ class ProjectsController < ApplicationController
     end
   end
 
-  #发送邮件邀请新用户
+  # 发送邮件邀请新用户页面对应方法
   def invite_members_by_mail
     if User.current.member_of?(@project) || User.current.admin?
-      @inviter_lists = InviteList.where(project_id:@project.id).all
-      @inviters = []
-      @waiters = []
-      unless @inviter_lists.blank?
-        @inviter_lists.each do|inviter_list|
-          unless inviter_list.user.nil?
-            if inviter_list.user.member_of?(@project)
-              @inviters << inviter_list.user
-              @inviters_count = @inviters.size
-            else
-              @waiters << inviter_list.user
-              @waiters_count = @waiters.size
-            end
-          end
-        end
-      end
+      @inviter_lists = InviteList.where(project_id:@project.id).order("created_at desc")
+
+      # @inviters = []
+      # @waiters = []
+      # unless @inviter_lists.blank?
+      #   @inviter_lists.each do|inviter_list|
+      #     unless inviter_list.user.nil?
+      #       if inviter_list.user.member_of?(@project)
+      #         @inviters << inviter_list.user
+      #         @inviters_count = @inviters.size
+      #       else
+      #         @waiters << inviter_list.user
+      #         @waiters_count = @waiters.size
+      #       end
+      #     end
+      #   end
+      # end
       @is_zhuce = false
       respond_to do |format|
         format.html
@@ -413,16 +447,16 @@ class ProjectsController < ApplicationController
   end
 
   # 邀请Trustie注册用户
-  def invite_members
-    if User.current.member_of?(@project) || User.current.admin? 
-      @member ||= @project.members.new
-        respond_to do |format|
-        format.html
-      end
-    else
-      render_403
-    end
-  end
+  # def invite_members
+  #   if User.current.member_of?(@project) || User.current.admin?
+  #     @member ||= @project.members.new
+  #       respond_to do |format|
+  #       format.html
+  #     end
+  #   else
+  #     render_403
+  #   end
+  # end
 
   def edit
   end
@@ -451,6 +485,10 @@ class ProjectsController < ApplicationController
         flash[:notice] = l(:label_mail_invite_success)
       end
     end
+    # 私有项目非项目成员无法访问成员列表
+    unless @project.is_public?
+      return render_403 unless User.current.member_of?(@project)
+    end
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'project_member_list'
     # 判断是否课程

app/controllers/system_messages_controller.rb

@@ -38,14 +38,15 @@ class SystemMessagesController < ApplicationController
       return
     end
     @system_messages = SystemMessage.new
-    @system_messages.content = params[:system_message][:content]
+    @system_messages.description = params[:system_message][:description]
+    @system_messages.subject = params[:system_message][:subject]
     @system_messages.user_id = User.current.id
     respond_to do |format|
       if @system_messages.save
-        format.html {redirect_to user_message_path(User.current, :type => "system_messages")}
+        format.html {redirect_to user_system_messages_path(User.current)}
         flash[:notice] = l(:notice_successful_message)
       else
-        if params[:system_message][:content].empty?
+        if params[:system_messages][:description].empty?
           flash[:error] = l(:label_content_blank_fail)
         else
           flash[:error] = l(:label_admin_message_fail)

app/controllers/users_controller.rb

@@ -40,7 +40,7 @@ class UsersController < ApplicationController
                                       :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_resource,
                                       :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
-                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource]
+                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -101,18 +101,20 @@ class UsersController < ApplicationController
     end
     # 记录当前点击按钮的时间
     # 考虑到用户未退出刷新消息页面
-    if OnclickTime.where("user_id =?", User.current).first.nil?
+    message_time = OnclickTime.where("user_id =?", User.current).first
+    if message_time.nil?
       message_new_time = OnclickTime.new
       message_new_time.user_id = User.current.id
       message_new_time.onclick_time = Time.now
       message_new_time.save
     else
-      message_new_time = OnclickTime.where("user_id =?", User.current).first
-      message_last_time = message_new_time.onclick_time
-      message_new_time.update_attributes(:onclick_time => Time.now)
+      # 24小时内显示
+      contrast_time = Time.now - 86400
+      message_time.update_attributes(:onclick_time => Time.now)
     end
-    @user_system_messages = SystemMessage.where("created_at >?", message_last_time).order("created_at desc")
+    @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc")
     # 当前用户查看消息，则设置消息为已读
+    # DO 待优化，只需查出符合条件的再更新
     if params[:viewed] == "all"
       course_querys = @user.course_messages
       forge_querys = @user.forge_messages
@@ -142,8 +144,8 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
-      when 'system_messages'
-        @message_alls = SystemMessage.order("created_at desc").all
+      # when 'system_messages'
+      #   @message_alls = SystemMessage.order("created_at desc").all
       when 'apply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
@@ -193,6 +195,15 @@ class UsersController < ApplicationController
     end
   end
 
+  # 系统消息
+  def user_system_messages
+    @sytem_messages = SystemMessage.order("created_at desc").all
+    @sytem_messages = paginateHelper @sytem_messages,25
+    respond_to do |format|
+      format.html{render :layout=>'new_base_user'}
+    end
+  end
+
   def user_projects_index
     if User.current.admin?
       memberships = @user.memberships.all(conditions: "projects.project_type = #{Project::ProjectType_project}").first
@@ -622,12 +633,11 @@ class UsersController < ApplicationController
       redirect_to signin_url
       return
     end
-    # 更新用户留言消息状态
-    @user.journals_for_messages.each do |jour_message|
-      jour_message.user_feedback_messages.each do |userfeedback_message|
-        if User.current.id == userfeedback_message.user_id
-          userfeedback_message.update_attributes(:viewed => true)
-        end
+    # 自己访问自己的页面才更新消息状态
+    if User.current == @user
+      journals_messages =  UserFeedbackMessage.where("user_id =? and journals_for_message_type =? and viewed =?", User.current.id, "JournalsForMessage", 0)
+      journals_messages.each do |journals_message|
+        journals_message.update_attributes(:viewed => true)
       end
     end
     # end

app/helpers/projects_helper.rb

@@ -76,6 +76,17 @@ module ProjectsHelper
     return result
   end
 
+# 被邀请成员的状态
+  def status_for_ivitied(ivite_list, project)
+    if ivite_list.user.member_of?(project)
+      value = "已经加入了项目！"
+    elsif ivite_list.user.active?
+      value = "邀请已发送，等待用户加入！"
+    else
+      value = "账号尚未激活，等待用户应答！"
+    end
+  end
+
   # Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},

app/helpers/student_work_helper.rb

@@ -6,7 +6,7 @@ module StudentWorkHelper
   def user_projects_option
     projects = User.current.projects.visible
     not_have_project = []
-    not_have_project << "没有可选项目，请直接为本作品创建一个项目"
+    not_have_project << "请选择关联项目"
     not_have_project << 0
     type = []
     type << not_have_project

app/models/homework_detail_programing.rb

@@ -4,6 +4,6 @@ class HomeworkDetailPrograming < ActiveRecord::Base
   belongs_to :homework_common
 
   def language_name
-    %W(c c++).at(self.language.to_i - 1)
+    %W(C C++).at(self.language.to_i - 1)
   end
 end

app/models/invite_list.rb

@@ -1,5 +1,5 @@
 class InviteList < ActiveRecord::Base
-  attr_accessible :project_id, :user_id
+  attr_accessible :project_id, :user_id, :mail
   belongs_to :user
   belongs_to :project
 

app/models/journals_for_message.rb

@@ -190,13 +190,45 @@ class JournalsForMessage < ActiveRecord::Base
     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
+    # 课程留言
+    if self.jour_type == 'Course'
+      receivers = []
+      teachers = []
+      # 获取课程的老师
+      self.jour.members.each do |m|
+        if m.user.allowed_to?(:as_teacher, self.jour)
+          teachers << m
+        end
+      end
+      if self.reply_id == 0  # 主留言，即不是回复某条留言
+        teachers.each do |teacher|
+          if teacher.user_id != self.user_id
+            receivers << teacher.user_id
+          end
+        end
+      else # 留言回复
+        reply_to = User.find(self.reply_id)
+        if self.user_id != self.reply_id # 添加我回复的那个人
+          receivers << reply_to.id
+        end
+        # 给老师发送。 过滤条件：老师自己给自己发；回复对象为老师则排除改老师
+        teachers.each do |teacher|
+          if teacher.user_id != self.user_id && self.reply_id != teacher.user_id
+            receivers << teacher.user_id
+          end
+        end
+      end
+      receivers.each do |r|
+        self.course_messages << CourseMessage.new(:user_id => r, :course_id => self.jour.id, :viewed => false)
+      end
+    end
   end
 
   # 用户留言消息通知

app/models/mailer.rb

@@ -48,9 +48,9 @@ class Mailer < ActionMailer::Base
   end
 
   # author: alan
-  # 发送邀请未注册用户加入项目邮件
+  # 邀请未注册用户加入项目
   # 功能： 在加入项目的同时自动注册用户
-  def  send_invite_in_project(email, project, invitor)
+  def send_invite_in_project(email, project, invitor)
     @email = email
     @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
     @password = newpass(6)
@@ -59,8 +59,8 @@ class Mailer < ActionMailer::Base
     login = login.sub(/%40/,'@')
     us = UsersService.new
     # 自动激活用户
-    user = us.register_auto(login, @email, @password)
-    InviteList.create(:user_id => user.id, :project_id => project.id)
+    user = us.register_auto(login, email, @password)
+    InviteList.create(:user_id => user.id, :project_id => project.id, :mail =>email)
     User.current = user unless User.current.nil?
     @user = user
     @token = Token.get_token_from_user(user, 'autologin')
@@ -76,15 +76,22 @@ 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)
+    if InviteList.where("project_id= ? and user_id =? and mail =?", project.id, @user.id, email).first.nil?
+      InviteList.create(:user_id => user.id, :project_id => project.id, :mail => email)
     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)
+    # 发送消息邀请
+    send_message(user,project)
+    # end
     mail :to => email, :subject => @subject
   end
 
+  # 邀请信息消息 注：forge_message_id 为邀请人ID(特殊情况)
+  def send_message(user, project)
+    ForgeMessage.create(:user_id => user.id, :project_id => project.id, :forge_message_type => "Project_Invite",:forge_message_id => User.current.id, :viewed => false)
+  end
+
   # author: alan
   # 根据用户选择发送个人日报或周报
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
@@ -208,6 +215,20 @@ class Mailer < ActionMailer::Base
     mail :to => user.mail,:subject => subject if has_content
   end
 
+  # 作业截止时间邮件提醒
+  def homework_endtime__added(homework_common, user_id)
+    user = User.find(user_id)
+    @subject = "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+    @token = Token.get_token_from_user(user, 'autologin')
+    @homework_endtime_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+    @homework_endtime_name = homework_common.name
+    @author = homework_common.user
+    #收件人邮箱
+    recipient = user.mail
+    mail :to => recipient,
+         :subject => "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+  end
+
   # 公共讨论区发帖、回帖添加邮件发送信息
   def forum_message_added(memo)
     @memo = memo

app/models/member.rb

@@ -30,6 +30,9 @@ class Member < ActiveRecord::Base
   validate :validate_role
 
   before_destroy :set_issue_category_nil
+  # 删除项目成员一并删除该成员的邀请记录
+  after_destroy :delete_ivite_list
+
 
   def role
   end
@@ -97,6 +100,16 @@ class Member < ActiveRecord::Base
     end
   end
 
+  # 删除成员一并删除该成员的邀请信息
+  def delete_ivite_list
+    member_invite_lists = InviteList.where("user_id =? and project_id =?", self.user_id, self.project_id)
+    unless member_invite_lists.nil?
+      member_invite_lists.each do |member_invite_list|
+        member_invite_list.destroy
+      end
+    end
+  end
+
   # Find or initilize a Member with an id, attributes, and for a Principal
   def self.edit_membership(id, new_attributes, principal=nil)
     @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)

app/models/project.rb

@@ -66,8 +66,8 @@ class Project < ActiveRecord::Base
   # has_many :students_for_courses, :dependent => :destroy
   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 :applied_projects, :dependent => :destroy
+  has_many :invite_lists, :dependent => :destroy
   has_one :dts
 
   # end

app/models/student_work.rb

@@ -31,9 +31,8 @@ class StudentWork < ActiveRecord::Base
         else
           self.system_score = last_test.test_score
         end
-        set_final_score self.homework_common,self
     end
-
+    set_final_score self.homework_common,self
   end
   def set_src
     self.description = last_test.src if last_test

app/models/system_message.rb

@@ -1,7 +1,8 @@
 class SystemMessage < ActiveRecord::Base
-  attr_accessible :content, :id, :user_id
+  attr_accessible :content, :id, :user_id, :description, :subject
   belongs_to :user
 
-  validates :content, presence: true
-  validates_length_of :content, maximum: 255
+  validates :subject, presence: true
+  # validates :description, presence: true
+  validates_length_of :description, maximum: 10000
 end

app/models/user.rb

@@ -140,7 +140,7 @@ class User < Principal
   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
+  has_many :invite_lists,  :dependent => :destroy
   # end
 
 ######added by nie
@@ -213,6 +213,8 @@ class User < Principal
   # added by fq
   after_create :act_as_activity, :add_onclick_time
   # end
+  # 更新邮箱用户或用户名的同事，同步更新邀请信息
+  after_update :update_invite_list
 
   scope :in_group, lambda {|group|
     group_id = group.is_a?(Group) ? group.id : group.to_i
@@ -1010,6 +1012,16 @@ class User < Principal
     end
   end
 
+  # 更新邮箱的同事，更新invite_lists表中的邮箱信息
+  def update_invite_list
+    invite_lists = InviteList.where("user_id =?",self.id).all
+    unless invite_lists.blank?
+      invite_lists.each do |invite_list|
+        invite_list.update_attribute(:mail, self.mail)
+      end
+    end
+  end
+
   # Removes references that are not handled by associations
   # Things that are not deleted are reassociated with the anonymous user
   def remove_references_before_destroy

app/views/admin/messages.html.erb

@@ -3,11 +3,17 @@
   <%=l(:label_system_message)%>
 </h3><br/>
 <div style="padding-top: 20px; padding-left: 5px;">
-  <%= form_for(@admin_messages, :html => {:id =>'system_message-form'}) do |f| %>
-      <div class="field">
-        <%= f.kindeditor :content,:width=>'87%',:editor_id=>'system_message_editor' %>
+  <%= form_for(@admin_messages, :html => {:id =>'system_messages-form'}) do |f| %>
+      <li>
+        <label><span class="">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
+        <input type="text" name="system_message[subject]" class="hwork_input_news" id="system_message_subject" width="576px" onblur="regexTitle($(this));" maxlength="255" placeholder="255个字符以内" value="">
+        <p id="title_notice_span" class="ml55"></p>
+      </li>
+      <li>
+        <label class="fl" >&nbsp;&nbsp;<span class="c_red"></span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+        <%= f.kindeditor :description,:width=>'87.5%',:editor_id=>'system_message_editor' %>
         <p id="content_notice_span" class="ml55"></p>
-      </div>
+      </li>
       <div>
         <p id="content_notice_span" class="ml55"></p>
       </div>
@@ -19,14 +25,8 @@
 <script>
     function system_message_length() {
         var obj = system_message_editor.html();
-        if (obj.length == 0) {
-            $("#content_notice_span").text("内容不能为空");
-            $("#content_notice_span").css('color', '#ff0000');
-            $("#content_notice_span").focus();
-            return false;
-        }
-        else if (obj.length > 255) {
-            $("#content_notice_span").text("内容过长，超过255个字符");
+        if (obj.length > 10000) {
+            $("#content_notice_span").text("内容过长，超过10000个字符");
             $("#content_notice_span").css('color', '#ff0000');
             $("#content_notice_span").focus();
             return false;
@@ -37,10 +37,27 @@
             return true;
         }
     }
+    function regexTitle(obj){
+        var title = obj.val();
+        if(title.length == 0)
+        {
+            $("#title_notice_span").text("标题不能为空").css("color", "#ff0000").focus();
+            return false;
+        }
+        else if(title.length > 255)
+        {
+            $("#title_notice_span").text("标题长度过长，不能超过255个字符").css("color", "#ff0000").focus();
+            return false;
+        }
+        else{
+            $("#title_notice_span").text("填写正确").css("color", "#008000");
+            return true;
+        }
+    }
     function submit_message() {
 
-        if (system_message_length()) {
-            $("#system_message-form").submit();
+        if (system_message_length() && regexTitle($("#system_message_subject"))) {
+            $("#system_messages-form").submit();
         }
     }
 </script>

app/views/comments/create.js.erb

@@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data('<%= @user_activity_id%>',"","85%");
+init_activity_KindEditor_data('<%= @user_activity_id%>',"","85%");

app/views/issues/add_journal.js.erb

@@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data(<%= @user_activity_id%>,"","85%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","85%");

app/views/journals/diff.html.erb

@@ -1,8 +1,8 @@
 <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
 <p>由<%= @journal.user %> 更新于 <%= format_time @journal.created_on %></p>
 
-<div class="text-diff">
-  <%= simple_format_without_paragraph @diff.to_html %>
+<div class="text-diff" style="word-break:break-all; word-wrap:break-word;">
+  <%= @diff.to_html.gsub("&lt;","<").gsub("&gt;",">").gsub("&quot;","\"").gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;quot;", "\"").html_safe %>
 </div>
 
 <p><%= link_to l(:button_back), issue_path(@issue), :onclick => 'history.back(); return false;' %></p>

app/views/layouts/base_projects.html.erb

@@ -36,21 +36,6 @@
   <%#= render :partial => 'layouts/new_header'%>
   <div class="cl"></div>
 
-  <!--TopBar begin-->
-  <div id="TopBar">
-    <div class="topbar_info02 fl">
-      <h2>
-        <a href="http://<%= Setting.host_name %>" target="_blank" class="c_blue">
-          <%= l(:label_projects_community) %>
-        </a>
-      </h2>
-      <p class="hidden">
-        <%= l(:label_user_location) %> :
-        <%= link_to l(:field_homepage), home_path %> > <a href="http://<%= Setting.host_name %>"><%=l(:label_project_hosting_platform) %> </a>><%= link_to @project.name, project_path(@project.id) %>
-      </p>
-    </div>
-  </div><!--TopBar end-->
-
   <div id="content">
     <div id="LSide" class="fl">
       <div class="project_info">
@@ -113,9 +98,9 @@
           </div>
           <ul class="navContent " style="display:block" id="navContent_invit">
             <li><%=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>
-            <% if User.current.allowed_to?(:manage_members, @project) %>
-              <li><%=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>
-            <% end %>
+            <!--<%# if User.current.allowed_to?(:manage_members, @project) %>-->
+              <!--<li><%#=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>-->
+            <!--<%# end %>-->
           </ul>
         <% end %><!--end-->
         <!--menu 左侧工具栏 -->

app/views/mailer/homework_endtime__added.html.erb

@@ -0,0 +1,11 @@
+<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_content)%></strong></span>
+		<span style="float: left; width: 526px">
+          <p><%=link_to @author, user_url(@author) %> 发布的作业：<%=link_to @homework_endtime_name, @homework_endtime_url%> <span style="color: red">截止时间快到了！</span></p>
+          <p style="color: red;font-size: 12px;">如果您还未交作业，请赶紧提交作业！</p>
+        </span>
+    </li>
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>

app/views/mailer/request_member_to_project.html.erb

@@ -4,9 +4,9 @@
 
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-        	<p><span style="color:#1b55a7; font-weight:bold;"><%= @invitor_name %></span> 邀请您加入项目：<span style="color:#1b55a7; font-weight:bold;"><%= @project_name %></span> </p>
+        	<p><span style="color:#1b55a7; font-weight:bold;"><%= @invitor_name %></span> 邀请您加入项目：<span style="color:#1b55a7; font-weight:bold;"><%=link_to @project_name, project_url(@project) %></span> </p>
           <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
-          <p>点击“同意加入”按钮，即可快速加入项目！</p> <br/>
+          <p>点击“同意加入”按钮，即可快速加入项目，查看项目相关信息！</p> <br/>
           <label  class="mail_reply">
             <%= link_to( l(:label_agree_join_project), @project_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
           </label>

app/views/mailer/send_invite_in_project.html.erb

@@ -1,7 +1,5 @@
-
 <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_content)%></strong></span>
 		<span style="float: left; width: 526px">
           <p><%= @subject %> </p>
@@ -9,13 +7,9 @@
           <p> <%= link_to @project_url, @project_url%></p>
           <p>您的账号为:<%= @email %></p>
           <p>密码为： <%= @password %></p>
-
+          <p style="color: red;font-size: 12px;">为了您的账号安全，请勿将邮件信息告知他人！</p>
         </span>
     </li>
-
   </ul>
-
   <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
-</div>
-
-
+</div>