diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index c8b6a6fda..c310087f7 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -191,9 +191,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?
@@ -431,7 +441,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
diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index f6b044c63..5dd5363b9 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/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
+      @homework.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(@homework)
       if @homework.save
         respond_to do |format|
           format.html { redirect_to course_for_bid_url @homework.bid }
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 58c959512..06bc1fd38 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/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)
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index fbafd16e9..3c34aa549 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -363,7 +363,8 @@ class ProjectsController < ApplicationController
 
   #发送邮件邀请新用户
   def invite_members_by_mail
-    if User.current.member_of?(@project) || User.current.admin? 
+    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
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 8c5561d74..30fd0ff50 100644
--- a/app/controllers/student_work_controller.rb
+++ b/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
 
   #根据条件过滤作业结果
diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb
index 5399fd5bf..b9940f4be 100644
--- a/app/helpers/homework_common_helper.rb
+++ b/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
diff --git a/app/models/invite_list.rb b/app/models/invite_list.rb
index f1ba8546f..4868fc3d7 100644
--- a/app/models/invite_list.rb
+++ b/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
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index dbc5d3cff..087fb6d73 100644
--- a/app/models/mailer.rb
+++ b/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,34 +102,32 @@ 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}))
-                            and (i.created_on between '#{date_from}' and '#{date_to}') order by i.created_on desc"
+    # 查询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
       for i in 0..count do
         bids =  courses[i].homeworks.where("bids.created_on between '#{date_from}' and '#{date_to}'").order("bids.created_on desc")
         attachments = courses[i].attachments.where("attachments.created_on between '#{date_from}' and '#{date_to}'").order('attachments.created_on DESC')
-        @bids += bids if bids.count > 0 
-        @attachments += attachments if attachments.count > 0 
+        @bids += bids if bids.count > 0
+        @attachments += attachments if attachments.count > 0
       end
     end
     # user 提交的作业
     @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
@@ -277,11 +273,11 @@ class Mailer < ActionMailer::Base
     @token = Token.get_token_from_user(user, 'autologin')
     @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value)
 
- # edit
-     @issue_author_url = url_for(user_activities_url(@author,:token => @token.value))
-     @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
+    # edit
+    @issue_author_url = url_for(user_activities_url(@author,:token => @token.value))
+    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
 
-      @user_url = url_for(my_account_url(user,:token => @token.value))
+    @user_url = url_for(my_account_url(user,:token => @token.value))
 
 
     subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
@@ -289,13 +285,13 @@ class Mailer < ActionMailer::Base
          :subject => subject,
          :filter => true
   end
-    # issue.attachments.each do |attach|
-    #   attachments["#{attach.filename}"] = File.read("#{attach.disk_filename}")
-    # end
-   # cc = issue.watcher_recipients - recipients
-    #mail.attachments['test'] = File.read("#{RAILS.root}/files/2015/01/150114094010_libegl.dll")
+  # issue.attachments.each do |attach|
+  #   attachments["#{attach.filename}"] = File.read("#{attach.disk_filename}")
+  # end
+  # cc = issue.watcher_recipients - recipients
+  #mail.attachments['test'] = File.read("#{RAILS.root}/files/2015/01/150114094010_libegl.dll")
+
 
-   
 
 
   # Builds a Mail::Message object used to email recipients of the edited issue.
@@ -324,13 +320,13 @@ class Mailer < ActionMailer::Base
     @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
     @user_url = url_for(my_account_url(user,:token => @token.value))
 
-      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
+    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject
     @issue = issue
     @journal = journal
-   # @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
+    # @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
     mail :to => recipients,
          :subject => s,
          :filter => true
@@ -360,10 +356,10 @@ class Mailer < ActionMailer::Base
     @issues = issues
     @days = days
     @issues_url = url_for(:controller => 'issues', :action => 'index',
-                                :set_filter => 1, :assigned_to_id => user.id,
-                                :sort => 'due_date:asc')
+                          :set_filter => 1, :assigned_to_id => user.id,
+                          :sort => 'due_date:asc')
     mail :to => user.mail,
-      :subject => l(:mail_subject_reminder, :count => issues.size, :days => days)
+         :subject => l(:mail_subject_reminder, :count => issues.size, :days => days)
   end
 
   #缺陷到期邮件通知
@@ -494,8 +490,8 @@ class Mailer < ActionMailer::Base
       @news = news
       @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
       mail :to => news.recipients,
-        :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}",
-        :filter => true
+           :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}",
+           :filter => true
     elsif  news.course
       redmine_headers 'Course' => news.course.id
       @author = news.author
@@ -526,9 +522,9 @@ class Mailer < ActionMailer::Base
       @comment = comment
       @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
       mail :to => news.recipients,
-       :cc => news.watcher_recipients,
-       :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}",
-       :filter => true
+           :cc => news.watcher_recipients,
+           :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}",
+           :filter => true
     elsif news.course
       redmine_headers 'Course' => news.course.id
       @author = comment.author
@@ -563,9 +559,9 @@ class Mailer < ActionMailer::Base
       @message = message
       @message_url = url_for(message.event_url)
       mail :to => recipients,
-        :cc => cc,
-        :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}",
-        :filter => true
+           :cc => cc,
+           :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}",
+           :filter => true
     elsif message.course
       redmine_headers 'Course' => message.course.id,
                       'Topic-Id' => (message.parent_id || message.id)
@@ -598,12 +594,12 @@ class Mailer < ActionMailer::Base
     cc = wiki_content.page.wiki.watcher_recipients - recipients
     @wiki_content = wiki_content
     @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
-                                      :project_id => wiki_content.project,
-                                      :id => wiki_content.page.title)
+                                :project_id => wiki_content.project,
+                                :id => wiki_content.page.title)
     mail :to => recipients,
-      :cc => cc,
-      :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}",
-      :filter => true
+         :cc => cc,
+         :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}",
+         :filter => true
   end
 
   # Builds a Mail::Message object used to email the recipients of a project of the specified wiki content was updated.
@@ -620,15 +616,15 @@ class Mailer < ActionMailer::Base
     cc = wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients
     @wiki_content = wiki_content
     @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
-                                      :project_id => wiki_content.project,
-                                      :id => wiki_content.page.title)
+                                :project_id => wiki_content.project,
+                                :id => wiki_content.page.title)
     @wiki_diff_url = url_for(:controller => 'wiki', :action => 'diff',
-                                   :project_id => wiki_content.project, :id => wiki_content.page.title,
-                                   :version => wiki_content.version)
+                             :project_id => wiki_content.project, :id => wiki_content.page.title,
+                             :version => wiki_content.version)
     mail :to => recipients,
-      :cc => cc,
-      :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}",
-      :filter => true
+         :cc => cc,
+         :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}",
+         :filter => true
   end
 
   # Builds a Mail::Message object used to email the specified user their account information.
@@ -642,7 +638,7 @@ class Mailer < ActionMailer::Base
     @password = password
     @login_url = url_for(:controller => 'account', :action => 'login')
     mail :to => user.mail,
-      :subject => l(:mail_subject_register, Setting.app_title)
+         :subject => l(:mail_subject_register, Setting.app_title)
   end
 
   # Builds a Mail::Message object used to email all active administrators of an account activation request.
@@ -655,10 +651,10 @@ class Mailer < ActionMailer::Base
     recipients = User.active.where(:admin => true).all.collect { |u| u.mail }.compact
     @user = user
     @url = url_for(:controller => 'users', :action => 'index',
-                         :status => User::STATUS_REGISTERED,
-                         :sort_key => 'created_on', :sort_order => 'desc')
+                   :status => User::STATUS_REGISTERED,
+                   :sort_key => 'created_on', :sort_order => 'desc')
     mail :to => recipients,
-      :subject => l(:mail_subject_account_activation_request, Setting.app_title)
+         :subject => l(:mail_subject_account_activation_request, Setting.app_title)
   end
 
   # Builds a Mail::Message object used to email the specified user that their account was activated by an administrator.
@@ -671,7 +667,7 @@ class Mailer < ActionMailer::Base
     @user = user
     @login_url = url_for(:controller => 'account', :action => 'login')
     mail :to => user.mail,
-      :subject => l(:mail_subject_register, Setting.app_title)
+         :subject => l(:mail_subject_register, Setting.app_title)
   end
 
   def lost_password(token)
@@ -679,7 +675,7 @@ class Mailer < ActionMailer::Base
     @token = token
     @url = url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
     mail :to => token.user.mail,
-      :subject => l(:mail_subject_lost_password, Setting.app_title)
+         :subject => l(:mail_subject_lost_password, Setting.app_title)
   end
 
   def register(token)
@@ -687,14 +683,14 @@ class Mailer < ActionMailer::Base
     @token = token
     @url = url_for(:controller => 'account', :action => 'activate', :token => token.value)
     mail :to => token.user.mail,
-      :subject => l(:mail_subject_register, Setting.app_title)
+         :subject => l(:mail_subject_register, Setting.app_title)
   end
 
   def test_email(user)
     set_language_if_valid(user.language)
     @url = url_for(:controller => 'welcome')
     mail :to => user.mail,
-      :subject => 'forge test'
+         :subject => 'forge test'
   end
 
   # Overrides default deliver! method to prevent from sending an email
@@ -702,8 +698,8 @@ class Mailer < ActionMailer::Base
   def deliver!(mail = @mail)
     set_language_if_valid @initial_language
     return false if (recipients.nil? || recipients.empty?) &&
-                    (cc.nil? || cc.empty?) &&
-                    (bcc.nil? || bcc.empty?)
+        (cc.nil? || cc.empty?) &&
+        (bcc.nil? || bcc.empty?)
 
 
     # Log errors when raise_delivery_errors is set to false, Rails does not
@@ -735,8 +731,8 @@ class Mailer < ActionMailer::Base
     user_ids = options[:users]
 
     scope = Issue.open.where("#{Issue.table_name}.assigned_to_id IS NOT NULL" +
-      " AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
-      " AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date
+                                 " AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
+                                 " AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date
     )
     scope = scope.where(:assigned_to_id => user_ids) if user_ids.present?
     scope = scope.where(:project_id => project.id) if project
@@ -800,12 +796,12 @@ class Mailer < ActionMailer::Base
 
   def mail(headers={})
     headers.merge! 'X-Mailer' => 'Redmine',
-            'X-Redmine-Host' => Setting.host_name,
-            'X-Redmine-Site' => Setting.app_title,
-            'X-Auto-Response-Suppress' => 'OOF',
-            'Auto-Submitted' => 'auto-generated',
-            'From' => Setting.mail_from,
-            'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>"
+                   'X-Redmine-Host' => Setting.host_name,
+                   'X-Redmine-Site' => Setting.app_title,
+                   'X-Auto-Response-Suppress' => 'OOF',
+                   'Auto-Submitted' => 'auto-generated',
+                   'From' => Setting.mail_from,
+                   'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>"
 
     # Removes the author from the recipients and cc
     # if he doesn't want to receive notifications about what he does
@@ -851,7 +847,7 @@ class Mailer < ActionMailer::Base
     set_language_if_valid Setting.default_language
     super
   end
-  
+
   def self.deliver_mail(mail)
     return false if mail.to.blank? && mail.cc.blank? && mail.bcc.blank?
     Thread.new do
@@ -898,7 +894,7 @@ class Mailer < ActionMailer::Base
   end
 
   def mylogger
-    if Setting.delayjob_enabled? 
+    if Setting.delayjob_enabled?
       Delayed::Worker.logger
     else
       Rails.logger
diff --git a/app/models/project.rb b/app/models/project.rb
index 4a546a430..49ed2d0ee 100644
--- a/app/models/project.rb
+++ b/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
diff --git a/app/views/attachments/destroy.js.erb b/app/views/attachments/destroy.js.erb
index 0b6cee0df..d23422e24 100644
--- a/app/views/attachments/destroy.js.erb
+++ b/app/views/attachments/destroy.js.erb
@@ -1,26 +1,30 @@
-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');
-if(containerid==undefined){
-    $('#attachments_<%= j params[:attachment_id] %>').remove();
-    var count=$('#attachments_fields>span').length;
-    if(count<=0){
-        $("#upload_file_count").text('<%= l(:label_no_file_uploaded)%>');
-        $(".remove_all").remove();
+<% 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');
+    if(containerid==undefined){
+        $('#attachments_<%= j params[:attachment_id] %>').remove();
+        var count=$('#attachments_fields>span').length;
+        if(count<=0){
+            $("#upload_file_count").text('<%= l(:label_no_file_uploaded)%>');
+            $(".remove_all").remove();
+        }else{
+            $("#upload_file_count").html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
+        }
     }else{
-        $("#upload_file_count").html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
+        $('#attachments_<%= j params[:attachment_id] %>').remove();
+        var count=$('#attachments_fields'+containerid+'>span').length;
+        if(count<=0){
+            $('#upload_file_count'+containerid).text('<%= l(:label_no_file_uploaded)%>');
+            var remove_all_html_obj = $(".remove_all").filter(function(index){
+                return $(this).data('containerid')==containerid;
+            });
+            remove_all_html_obj.remove();
+        }else{
+            $('#upload_file_count'+containerid).html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
+        }
     }
-}else{
-    $('#attachments_<%= j params[:attachment_id] %>').remove();
-    var count=$('#attachments_fields'+containerid+'>span').length;
-    if(count<=0){
-        $('#upload_file_count'+containerid).text('<%= l(:label_no_file_uploaded)%>');
-        var remove_all_html_obj = $(".remove_all").filter(function(index){
-            return $(this).data('containerid')==containerid;
-        });
-        remove_all_html_obj.remove();
-    }else{
-        $('#upload_file_count'+containerid).html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
-    }
-}
-//modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  end
\ No newline at end of file
+    //modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  end
+<% end%>
\ No newline at end of file
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index bb080b57b..0d250cf14 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/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>
diff --git a/app/views/courses/show_member_score.js.erb b/app/views/courses/show_member_score.js.erb
index 083f070c2..013b478fc 100644
--- a/app/views/courses/show_member_score.js.erb
+++ b/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");
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 6039b543b..043aea489 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -44,7 +44,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"%>
diff --git a/app/views/homework_common/_homework_common_form.html.erb b/app/views/homework_common/_homework_common_form.html.erb
index ec6a1bbcc..e3ef0d237 100644
--- a/app/views/homework_common/_homework_common_form.html.erb
+++ b/app/views/homework_common/_homework_common_form.html.erb
@@ -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>
@@ -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>
diff --git a/app/views/mailer/news_added.html.erb b/app/views/mailer/news_added.html.erb
index ca8f3c1b0..316ab9d2c 100644
--- a/app/views/mailer/news_added.html.erb
+++ b/app/views/mailer/news_added.html.erb
@@ -1,17 +1,15 @@
-
 <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;">
+    <%= 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 %>
-      <%=h @news.project.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+     <%=h @news.project.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
   <% 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>
+     <%=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>
 <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>
 
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 73a561ca3..81a65442f 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -1,341 +1,359 @@
-
-
-
-
-
-
-
 <div class="content">
 <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-<%= @subject %>
+  <%= @subject %>
 </h4>
 <% if @attachments.first || @course_news.first || @bids.first ||
         @homeworks.first || @course_journal_messages.first|| @course_messages.first %>
-   <div class="wmail_main" style="padding:20px 10px 0px;">
-    <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_course_overview)%></h2>
-    <% unless @course_news.first.nil? %>
-    <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+    <div class="wmail_main" style="padding:20px 10px 0px;">
+      <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_course_overview)%></h2>
+      <% unless @course_news.first.nil? %>
+          <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_course_news) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_news.count %>)</span>
+            </h4>
+            <% @course_news.each do |course_new|%>
+                <li style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-      <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-        <%= l(:label_course_news) %>
-        <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_news.count %>)</span>
-      </h4>
+                  <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
-      <% @course_news.each do |course_new|%>
-          <li style="clear: both; list-style: none;">
-            <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
-          
-            <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value),
-                                :class=> "wmail_column",
-                                :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+                  <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_project_notice) %></span>
 
-            <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
-                    :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_project_notice) %></span>
+                  <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_new.created_on) %></span>
+                </li>
+            <% end %>
 
-            <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
-                        :class => 'wmail_info',
-                        :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-                %>
-            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_new.created_on) %></span>
-          </li>
+            <div class="cl"></div>
+          </ul><!--课程通知 end-->
       <% end %>
 
-      <div class="cl"></div>
-    </ul><!--课程动态 end-->
-    <% end %>
-    <% if  !@bids.first.nil?  || !@homeworks.first.nil? %>
-    <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+      <!--课程作业-->
+      <% if  !@bids.first.nil?  || !@homeworks.first.nil? %>
+          <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;"><%= l(:label_homework_overview) %><span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @bids.count %>)</span></h4>
+            <% unless @bids.first.nil?%>
+                <% @bids.each do |bid| %>
+                    <li style="clear: both; list-style: none;">
+                      <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                      <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-      <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;"><%= l(:label_homework_overview) %><span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @bids.count %>)</span></h4>
-      <% unless @bids.first.nil?%>
-      <% @bids.each do |bid| %>
-           <li style="clear: both; list-style: none;">
-            <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+                      <%= link_to truncate(bid.courses.first.name,length: 30,omission: '...'), course_url(bid.courses.first, :token => @token.value),
+                                  :class=> "wmail_column",
+                                  :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                      <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
-            <%= link_to truncate(bid.courses.first.name,length: 30,omission: '...'), course_url(bid.courses.first, :token => @token.value),
-                        :class=> "wmail_column",
-                        :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+                      <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value), :class => "wmail_name",
+                                  :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_course_homework) %></span>
 
-            <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value), :class => "wmail_name",
-                        :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_course_homework) %></span>
+                      <%= link_to truncate(bid.name,length: 30,omission: '...'), course_for_bid_url(:id => bid.id,:token => @token.value),
+                                  :class => 'wmail_info',
+                                  :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                      %>
+                      <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(bid.created_on) %></span>
+                    </li>
+                <% end %>
+            <% end %>
+            <% unless @homeworks.first.nil? %>
+                <% @homeworks.each do |homework| %>
+                    <li style="clear: both; list-style: none;">
+                      <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                      <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-            <%= link_to truncate(bid.name,length: 30,omission: '...'), course_for_bid_url(:id => bid.id,:token => @token.value),
-                        :class => 'wmail_info',
-                        :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-            %>
-            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(bid.created_on) %></span>
-          </li>
-      <% end %>
-      <% end %>
-      <% unless @homeworks.first.nil? %>
-      <% @homeworks.each do |homework| %>
-          <li style="clear: both; list-style: none;">
-            <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+                      <%= link_to truncate(homework.bid.courses.first.name,length: 30,omission: '...'), course_url(homework.bid.courses.first, :token => @token.value),
+                                  :class=> "wmail_column",
+                                  :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                      <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
-            <%= link_to truncate(homework.bid.courses.first.name,length: 30,omission: '...'), course_url(homework.bid.courses.first, :token => @token.value),
-                        :class=> "wmail_column",
-                        :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+                      <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value), :class => "wmail_name",
+                                  :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_course_submit_homework) %></span>
 
-            <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value), :class => "wmail_name",
-                        :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_course_submit_homework) %></span>
+                      <%= link_to truncate(homework.name,length: 30,omission: '...'), course_for_bid_url(:id => homework.bid.id,:token => @token.value),
+                                  :class => 'wmail_info',
+                                  :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                      %>
+                      <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(homework.created_at) %></span>
+                    </li>
+                <% end %>
+            <% end %>
 
-            <%= link_to truncate(homework.name,length: 30,omission: '...'), course_for_bid_url(:id => homework.bid.id,:token => @token.value),
-                        :class => 'wmail_info',
-                        :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-            %>
-            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(homework.created_at) %></span>
-          </li>
-      <% end %>
+            <div class="cl"></div>
+          </ul><!--作业动态 end-->
       <% end %>
 
-      <div class="cl"></div>
-    </ul><!--作业动态 end-->
-    <% end %>
+      <!-- 课程留言 -->
+      <% unless @course_journal_messages.first.nil? %>
+          <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:view_course_journals_for_messages) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
+            </h4>
 
-    <% unless @course_journal_messages.first.nil? %>
-    <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <% @course_journal_messages.each do |course_journal_message|%>
+                <li style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-            <%= l(:view_course_journals_for_messages) %>
-            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
-          </h4>
+                  <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
-          <% @course_journal_messages.each do |course_journal_message|%>
-              <li style="clear: both; list-style: none;">
-                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+                  <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_send_course_journals_for_messages) %></span>
 
-                <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value),
-                            :class=> "wmail_column",
-                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+                  <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_journal_message.created_on) %></span>
+                </li>
+            <% end %>
+            <div class="cl"></div>
+          </ul><!--课程留言 end-->
+      <% end %>
 
-                <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_send_course_journals_for_messages) %></span>
+      <!-- 课程讨论区 -->
+      <% unless @course_messages.first.nil? %>
+          <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:view_borad_course) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
+            </h4>
+            <% @course_messages.each do |course_message|%>
+                <li style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+                  <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+                  <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_send_course_messages) %></span>
+                  <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_message.created_on) %></span>
+                </li>
+            <% end %>
+            <div class="cl"></div>
+          </ul><!-- 课程讨论区end -->
+      <% end %>
 
-                <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value),
-                            :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-                %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_journal_message.created_on) %></span>
-              </li>
-          <% end %>
+      <!-- 课件 -->
+      <% unless @attachments.first.nil? %>
+          <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_course_attendingcontestwork_download) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @attachments.count %>)</span>
+            </h4>
 
-      <div class="cl"></div>
-    </ul><!--课程留言 end-->
-    <% end %>
+            <% @attachments.each do |attachment|%>
+                <li style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-    <% unless @course_messages.first.nil? %>
-    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+                  <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
-          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-            <%= l(:view_borad_course) %>
-            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
-          </h4>
+                  <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_course_file_upload) %></span>
 
-          <% @course_messages.each do |course_message|%>
-              <li style="clear: both; list-style: none;">
-                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
-
-                <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id, :token => @token.value),
-                            :class=> "wmail_column",
-                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
-
-                <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_send_course_messages) %></span>
-
-                <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value),
-                            :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-                %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_message.created_on) %></span>
-              </li>
-          <% end %>
-
-      <div class="cl"></div>
-    </ul><!--课程讨论  end-->
-    <% end %>
-
-    <% unless @attachments.first.nil? %>
-    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
-          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-            <%= l(:label_course_attendingcontestwork_download) %>
-            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @attachments.count %>)</span>
-          </h4>
-
-          <% @attachments.each do |attachment|%>
-              <li style="clear: both; list-style: none;">
-                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
-
-                <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value),
-                            :class=> "wmail_column",
-                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
-
-                <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_course_file_upload) %></span>
-
-                <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value),
-                            :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-                %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(attachment.created_on) %></span>
-              </li>
-          <% end %>
-      <div class="cl"></div>
-    </ul><!--课件下载  end-->
-    <% end %>
-  </div><!--课程动态  end-->
-  <% end %>
-  <% if @issues.first || @project_messages.first %>
-  <div class="wmail_main" style="padding:20px 10px 0px;">
-    <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_project_overview_new)%></h2>
-    <% unless @issues.first.nil? %>
-    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
-          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-            <%= l(:label_issue_tracking) %>
-            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @issues.count %>)</span>
-          </h4>
-
-          <% @issues.each do |issue|%>
-              <li style="clear: both; list-style: none;">
-                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
-
-                <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value),
-                            :class=> "wmail_column",
-                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
-
-                <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_project_issue) %></span>
-
-                <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value),
-                            :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-                %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(issue.created_on) %></span>
-              </li>
-          <% end %>
-
-      <div class="cl"></div>
-    </ul><!--问题跟踪 end-->
-    <% end %>
-
-    <% unless @project_messages.first.nil? %>
-    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
-          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-            <%= l(:project_moule_boards_show) %>
-            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @project_messages.count %>)</span>
-          </h4>
-
-          <% @project_messages.each do |project_message|%>
-              <li style="clear: both; list-style: none;">
-                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
-
-                <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value),
-                            :class=> "wmail_column",
-                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
-
-                <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_send_course_messages) %></span>
-
-                <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value),
-                            :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-                %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(project_message.created_on) %></span>
-              </li>
-          <% end %>
-
-      <div class="cl"></div>
-    </ul><!--项目论坛 end-->
-    <% end %>
+                  <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(attachment.created_on) %></span>
+                </li>
+            <% end %>
+            <div class="cl"></div>
+          </ul><!--课件下载  end-->
+      <% end %>
+    </div>
+<% end %>
 
 
 
-  </div><!--项目动态  end-->
- <% end %>
- <% unless @user_journal_messages.first.nil? %>
-  <div class="wmail_main" style="padding:20px 10px 0px;">
-    <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_activities) %></h2>
+<!--项目相关-->
+<% if @issues.first || @project_messages.first %>
+    <div class="wmail_main" style="padding:20px 10px 0px;">
+      <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_project_overview_new)%></h2>
+      <% unless @issues.first.nil? %>
+          <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_issue_tracking) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @issues.count %>)</span>
+            </h4>
+            <% @issues.each do |issue|%>
+                <li style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+                  <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+                  <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_project_issue) %></span>
+                  <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(issue.created_on) %></span>
+                </li>
+            <% end %>
 
-    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
-          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-            <%= l(:label_user_message) %>
-            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @user_journal_messages.count %>)</span>
-          </h4>
+            <div class="cl"></div>
+          </ul><!--问题跟踪 end-->
+      <% end %>
 
-          <% @user_journal_messages.each do |user_journal_message|%>
-              <li  style="clear: both; list-style: none;">
-                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+      <!-- 讨论区 -->
+      <% unless @project_messages.first.nil? %>
+          <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:project_moule_boards_show) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @project_messages.count %>)</span>
+            </h4>
 
-                <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value),
-                :class => "wmail_name",
-                :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_show_your_message) %></span>
+            <% @project_messages.each do |project_message|%>
+                <li style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-                <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'),feedback_url(@user,:token => @token.value),
-                :class => 'wmail_info',
-                :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-                %>
+                  <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+
+                  <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_send_course_messages) %></span>
+
+                  <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(project_message.created_on) %></span>
+                </li>
+            <% end %>
+
+            <div class="cl"></div>
+          </ul><!--项目论坛 end-->
+      <% end %>
+
+      <!--项目新闻-->
+      <% unless @project_news.first.nil? %>
+          <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_course_news) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @project_news.count %>)</span>
+            </h4>
+            <% @project_news.each do |project_new|%>
+                <li style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+                  <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+                  <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_project_notice) %></span>
+
+                  <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(project_new.created_on) %></span>
+                </li>
+            <% end %>
+            <div class="cl"></div>
+          </ul><!-- 项目新闻end -->
+      <% end %>
+
+    </div>
+<% end %><!-- 项目动态end -->
+
+<!-- 用户留言 -->
+<% unless @user_journal_messages.first.nil? %>
+    <div class="wmail_main" style="padding:20px 10px 0px;">
+      <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_activities) %></h2>
+
+      <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+        <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+          <%= l(:label_user_message) %>
+          <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @user_journal_messages.count %>)</span>
+        </h4>
+
+        <% @user_journal_messages.each do |user_journal_message|%>
+            <li  style="clear: both; list-style: none;">
+              <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+
+              <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value),
+                          :class => "wmail_name",
+                          :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_show_your_message) %></span>
+
+              <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'),feedback_url(@user,:token => @token.value),
+                          :class => 'wmail_info',
+                          :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              %>
               <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(user_journal_message.created_on) %></span></li>
 
         <% end %>
 
-      <div class="cl"></div>
-    </ul><!--课程动态 end-->
+        <div class="cl"></div>
+      </ul><!--用户留言 end-->
 
-  </div><!--个人动态  end-->
-  <% end %>
-  <% if @forums.first || @memos.first %>
+    </div><!--个人动态  end-->
+<% end %>
+<% if @forums.first || @memos.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:lable_bar_active) %></h2>
       <% unless @forums.first.nil? %>
-      <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
-        <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-          <%= l(:label_user_forum) %>
-          <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @forums.count %>)</span>
-        </h4>
+          <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_user_forum) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @forums.count %>)</span>
+            </h4>
 
-        <% @forums.each do |forum|%>
-            <li  style="clear: both; list-style: none;">
-              <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+            <% @forums.each do |forum|%>
+                <li  style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-              <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value),
-                          :class => "wmail_name",
-                          :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_forum_new) %></span>
+                  <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value),
+                              :class => "wmail_name",
+                              :style => "color:#fe5722; 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:#6e6e6e;"><%= l(:label_forum_new) %></span>
 
-              <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value),
-                          :class => 'wmail_info',
-                          :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-              %>
-              <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(forum.created_at) %></span></li>
+                  <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(forum.created_at) %></span></li>
 
-        <% end %>
+            <% end %>
 
-        <div class="cl"></div>
-      </ul><!-- 新建贴吧 end-->
+            <div class="cl"></div>
+          </ul><!-- 新建贴吧 end-->
       <% end %>
       <% unless @memos.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
@@ -366,14 +384,14 @@
       <% end %>
     </div><!--贴吧动态 end-->
 <% end %>
-  <div class="wmail_foot" style="margin-top:20px;color:#2775d2; margin-left:10px;">
-    <% [:label_user_mail_option_all, :label_user_mail_option_day, :label_user_mail_option_none].each do |mail_option| %>
-    <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
-    <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
-    <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
-    <% end %>
-    <% end %>
-  </div>
+<div class="wmail_foot" style="margin-top:20px;color:#2775d2; margin-left:10px;">
+  <% [:label_user_mail_option_all, :label_user_mail_option_day, :label_user_mail_option_none].each do |mail_option| %>
+      <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
+          <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
+      <% else %>
+          <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+      <% end %>
+  <% end %>
+</div>
 </div>
 
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 7f952cb3c..ce7ea2aa1 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -45,39 +45,55 @@
     }
 
 
-//        if (filter.test(email)&& !(email.value == null)) return true;
-//            else
-//            {
-//                document.getElementById('valid_email').innerHTML = "您所填写的电子邮件格式不正确";
-//                document.getElementById('valid_email').style.color = "#FF0000";
-//                return false;
-//            }
-//
-//        }
+    //        if (filter.test(email)&& !(email.value == null)) return true;
+    //            else
+    //            {
+    //                document.getElementById('valid_email').innerHTML = "您所填写的电子邮件格式不正确";
+    //                document.getElementById('valid_email').style.color = "#FF0000";
+    //                return false;
+    //            }
+    //
+    //        }
 </script>
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_invite_join)%></h2>
 </div>
 <div  class="box_main">
-		<p class="box_p">
-			<%= l(:label_invite_email_tips)%>
-		</p>
-		<div id="is_registed">
-			<%= render :partial => 'regested', locals: { :isregisted => false} %>
-		</div>
-			<%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %>
-				<span id="valid_email" style="color: #FF0000;"></span>
-              <ul>
-                <li>
-                <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "this.value=this.value.replace(' ','')", :style => "ime-mode:disabled;", :onblur => "verifyAddress(this);" %>
-                </li>
-              </ul>
-                <div class="cl"></div>
-                <a href="#" class="btn_free" onclick="senderEmail($(this));">
-                    <%= l(:label_send_email)%>
-                </a>
+  <p class="box_p">
+    <%= l(:label_invite_email_tips)%>
+  </p>
+  <div id="is_registed">
+    <%= render :partial => 'regested', locals: { :isregisted => false} %>
+  </div>
+  <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %>
+      <span id="valid_email" style="color: #FF0000;"></span>
+      <ul>
+        <li>
+          <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "this.value=this.value.replace(' ','')", :style => "ime-mode:disabled;", :onblur => "verifyAddress(this);" %>
+        </li>
+      </ul>
+      <div class="cl"></div>
+      <a href="#" class="btn_free" onclick="senderEmail($(this));">
+        <%= l(:label_send_email)%>
+      </a>
+  <% end %>
+  <%# 邀请用户的状态 %>
+  <% unless @inviter_lists.blank? %>
+      <div>
+        <span class="status_inviter">已邀请的用户</span><br/>
+        <% @inviter_lists.each do |inviter_list| %>
+            <%= inviter_list.user.name %><br/>
+        <% end %>
+        </br>
+        <span class="status_inviter">等待加入项目的用户</span><br/>
+        <% @inviter_lists.each do |inviter_list| %>
+            <% unless inviter_list.user.member_of?(@project) %>
+                <%= inviter_list.user.name %><br/>
+            <% end %>
+        <% end %>
+      </div>
+  <% end %>
+</div>
+
 
-			<% end %>
-		</div>
 
-</div>
\ No newline at end of file
diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb
index e091e507d..bdfcff6e1 100644
--- a/app/views/student_work/_add_score.html.erb
+++ b/app/views/student_work/_add_score.html.erb
@@ -16,7 +16,7 @@
             <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
           </div>
       <%end%>
-      <a href="javascript:void(0);" class="blue_n_btn fr" onclick="$(this).parent().parent().submit();">提交</a>
+      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();">提交</a>
       <div class="cl"></div>
     </li>
 <% end%>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 2b8369b24..5a339dc03 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -1,22 +1,21 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
 <ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
   <% is_my_work = student_work.user == User.current%>
-  <li style="min-height: 1px;width: 65px;">
+  <li class="hwork_num">
     <% if is_my_work%>
-        <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-        <%= link_to student_id,"javascript:void(0)",:class => "c_grey hwork_center",:title => student_id%>
-    <% else%>
-        <%= link_to "--", "javascript:void(0)",:class => "c_grey hwork_center"%>
+     <span>
+        <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+     </span>
     <% end%>
   </li>
-  <li>
+  <li class="hwork_name">
     <% if is_my_work%>
-        <%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name",:title => student_work.user.show_name %>
+        <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name %>
     <% else%>
-        <%= link_to "匿名","javascript:void(0)",:class => "c_blue02 hwork_name"%>
+        <%= link_to "匿名","javascript:void(0)"%>
     <% end%>
   </li>
-  <li class=" hwork_tit_e" style="width: 440px">
+  <li class=" hwork_tit_e" style="width: 410px">
     <%= link_to student_work.name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
   </li>
   <% my_score = student_work_score(student_work,User.current) %>
diff --git a/app/views/student_work/_evaluation_work_title.html.erb b/app/views/student_work/_evaluation_work_title.html.erb
index a3b1cda41..0be6228bb 100644
--- a/app/views/student_work/_evaluation_work_title.html.erb
+++ b/app/views/student_work/_evaluation_work_title.html.erb
@@ -1,7 +1,7 @@
-<li class="w70 ">
-  <span href="javascript:void(0);" class="c_dark f14 fb fl ml15 ">学号</span>
+<li class="hwork_num ">
+  <span class="f14 f_b c_dark fl ">学号</span>
 </li>
-<li class="w70">
+<li class="hwork_name f14 fb c_dark">
   <span class="c_dark f14 fb fl ">学生姓名</span>
 </li>
 <li class="hwork_tit_e">
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index 3758ffedd..4e9f337c0 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -35,9 +35,9 @@
   <% end%>
   <li >
     <span class="tit_fb ">内容：</span>
-    <p class="show_hwork_p break_word">
-      <%= @work.description%>
-    </p>
+    <div class="show_hwork_p break_word">
+      <%= textilizable @work.description%>
+    </div>
     <div class="cl"></div>
   </li>
   <li >
@@ -54,13 +54,13 @@
 
   <% if @is_teacher || (@homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
       <!-- 老师 || 匿评作业 && 开启匿评状态 && 不是当前用户自己的作品 -->
-      <div id="add_student_score_<%= @work.id%>" class="mt10    ">
+      <div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
         <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
       </div>
   <% end%>
 </ul>
 
-<div class="ping_box" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+<div class="ping_box mt10" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
   <%@work.student_works_scores.order("created_at desc").each do |score|%>
       <div id="work_score_<%= score.id%>">
         <%= render :partial => 'student_work_score',:locals => {:score => score}%>
diff --git a/app/views/student_work/_student_work.html.erb b/app/views/student_work/_student_work.html.erb
index cff481b7a..e8fb2ce3a 100644
--- a/app/views/student_work/_student_work.html.erb
+++ b/app/views/student_work/_student_work.html.erb
@@ -1,22 +1,23 @@
 <!-- 作品列表，显示某一个作品的信息 -->
 <ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
-  <li style="min-height: 1px;width: 65px;">
-    <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-    <%= link_to student_id,"javascript:void(0)",:class => "c_grey hwork_center",:title => student_id%>
+  <li class="hwork_num">
+    <span>
+      <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+    </span>
   </li>
-  <li>
-    <%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name",:title => student_work.user.show_name%>
+  <li class=" hwork_name ">
+    <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name%>
   </li>
   <li class=" hwork_tit">
     <%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
   </li>
-  <li class=" hwork_code <%= student_work.teacher_score.nil? ? 'c_grey' : 'c_red'%>">
+  <li class=" hwork_code <%= student_work.teacher_score.nil? ? 'c_grey' : 'c_red'%> mr18">
     <%= student_work.teacher_score.nil? ? "--" : format("%.2f",student_work.teacher_score)%>
   </li>
-  <li class=" hwork_code <%= student_work.teaching_asistant_score.nil? ? 'c_grey' : 'c_red'%>">
+  <li class=" hwork_code <%= student_work.teaching_asistant_score.nil? ? 'c_grey' : 'c_red'%> mr18">
     <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.2f",student_work.teaching_asistant_score)%>
   </li>
-  <li class=" hwork_code02 <%= student_work.student_score.nil? ? 'c_grey' : 'c_red'%> student_score_info">
+  <li class=" hwork_code02 <%= student_work.student_score.nil? ? 'c_grey' : 'c_red'%> mr18 student_score_info" >
     <%= student_work.student_score.nil? ? "--" : format("%.2f",student_work.student_score)%>
     <% unless student_work.student_score.nil?%>
         <span class="c_blue">
@@ -30,7 +31,7 @@
         </div>
     <% end%>
   </li>
-  <li class=" hwork_code02 <%= student_work.final_score.nil? ? 'c_grey' : 'c_red'%>">
+  <li class=" hwork_code <%= student_work.final_score.nil? ? 'c_grey' : 'c_red'%>">
     <%= student_work.final_score.nil? ? "--" : format("%.2f",student_work.final_score)%>
   </li>
   <div class="cl"></div>
diff --git a/app/views/student_work/_student_work_title.html.erb b/app/views/student_work/_student_work_title.html.erb
index 7cf5e5d01..8162ea971 100644
--- a/app/views/student_work/_student_work_title.html.erb
+++ b/app/views/student_work/_student_work_title.html.erb
@@ -1,32 +1,32 @@
-<li class="w70 ">
-  <span href="javascript:void(0);" class="c_dark f14 fb fl  ">学号</span>
+<li class="hwork_num ">
+  <a href="javascript:void(0);" class=" f14 f_b c_dark fl" >学号</a>
 </li>
-<li class="w70">
-  <span class="c_dark f14 fb fl ">学生姓名</span>
+<li class=" hwork_name f14 fb c_dark">
+  学生姓名
 </li>
 <li class="hwork_tit">
   <span class="c_dark f14 fb fl">作品名称</span>
 </li>
-<li class="w70 mr5" >
-  <%= link_to "教师评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+<li class="mr5 w70">
+  <%= link_to "教师评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl hwork_code"%>
   <% if @show_all && @order == "teacher_score"%>
       <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
   <% end%>
 </li>
-<li class="w70 mr5">
-  <%= link_to "教辅评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+<li class="mr5 w70">
+  <%= link_to "教辅评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl hwork_code"%>
   <% if @show_all && @order == "teaching_asistant_score"%>
       <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
   <% end%>
 </li>
-<li class="w60 mr5 ml10">
-  <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+<li class="mr5 ml15 w40">
+  <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
   <% if @show_all && @order == "student_score"%>
       <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
   <% end%>
 </li>
-<li class="w40 ml10" id="final_sort">
-  <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "final_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+<li class="ml30">
+  <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "final_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
   <% if @show_all && @order == "final_score"%>
       <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
   <% end%>
diff --git a/app/views/student_work/_work_attachments.html.erb b/app/views/student_work/_work_attachments.html.erb
index 638644fdf..f303897bc 100644
--- a/app/views/student_work/_work_attachments.html.erb
+++ b/app/views/student_work/_work_attachments.html.erb
@@ -1,5 +1,8 @@
-<% for attachment in attachments %>
-    <%= link_to_short_attachment attachment, :class => 'link_file', :download => true -%>
-    <span class="ml5">(<%= number_to_human_size attachment.filesize %>)</span>
-    <div class="cl"></div>
+<% attachments.each_with_index do |attachment,i| %>
+    <div id="attachment_<%= attachment.id%>">
+      <%= link_to_short_attachment attachment, :class => 'link_file', :download => true -%>
+      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author %>
+      <span class="ml5">(<%= number_to_human_size attachment.filesize %>)</span>
+      <div class="cl"></div>
+    </div>
 <% end -%>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 9fa678bc4..1cd665569 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -36,6 +36,7 @@
       </span>
       <% if @show_all%>
         <input  type="text" value="<%= @name%>" placeholder="昵称、学号、姓名搜索" class="min_search ml10 fl" onkeypress="SearchByName($(this),'<%= student_work_index_path(:homework => @homework.id)%>',event);">
+        <a class="student_work_search fl" onclick="SearchByName($(this).prev(),'<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
       <% end%>
       <% if @is_teacher%>
           <div class="fr">
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 8ca078084..78f608a80 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -85,7 +85,8 @@ zh:
   project_module_documents: 文档  
   label_roadmap: 里程碑 #版本路线图
   project_module_dts: DTS测试工具
-  label_project_tool_response: 用户反馈  
+  label_project_tool_response: 用户反馈
+  label_course_news: 项目新闻
 
   label_project_overview: "项目简介"
   label_expend_information: 展开更多信息
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 7d926bd34..7653a0c4e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -112,7 +112,7 @@ zh:
   field_project: 项目
   field_issue: 问题
 
-  field_notes: 说明
+  field_notes: 内容
   field_is_closed: 已关闭的问题
   field_is_default: 默认值
 
diff --git a/db/schema.rb b/db/schema.rb
index 42c743588..68f00c1cd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150602055730) do
+ActiveRecord::Schema.define(:version => 20150604153000) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -23,6 +23,20 @@ ActiveRecord::Schema.define(:version => 20150602055730) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
+  create_table "activity_notifies", :force => true do |t|
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type"
+    t.integer  "activity_id"
+    t.string   "activity_type"
+    t.integer  "notify_to"
+    t.datetime "created_on"
+    t.integer  "is_read"
+  end
+
+  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
+  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
+  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
+
   create_table "api_keys", :force => true do |t|
     t.string   "access_token"
     t.datetime "expires_at"
@@ -606,6 +620,13 @@ ActiveRecord::Schema.define(:version => 20150602055730) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "invite_lists", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "issue_categories", :force => true do |t|
     t.integer "project_id",                   :default => 0,  :null => false
     t.string  "name",           :limit => 30, :default => "", :null => false
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index e35a49eed..0570ec437 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -793,6 +793,10 @@ function SearchByName(obj,url,event)
         location.href = url + "&name=" + obj.val();
     }
 }
+function SearchByName(obj,url)
+{
+    location.href = url + "&name=" + obj.val();
+}
 
 $(function(){
     $("#about_project label").eq(1).remove();
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index d962e4f2f..7d4436704 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -630,14 +630,17 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
 .w300{ width:300px;}
 .w80{ width:80px;}
 .t_c{ text-align:center;}
-.hwork_tit{ width:240px; float:left; }
-.hwork_tit a{ width:255px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.hwork_tit_e{ width:440px; float:left; }
-.hwork_tit_e a{ width:455px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.hwork_code{ width:60px; text-align:center; margin-right:15px;}
-.hwork_code02{ width:60px; text-align:center; margin-right:10px;}
+
+.hwork_tit{ width:210px; float:left; }
+.hwork_tit a{ width:205px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.hwork_code{ width:56px; text-align:center;  }
+.hwork_code02{ width:60px; text-align:center;  }
+.hwork_tit_e{ width:420px; float:left; }
+.hwork_tit_e a{ width:405px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.hwork_num{ width:90px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.mr18{ margin-right:18px;}
 a.hwork_center{ display:block; width:60px;  margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
-a.hwork_name{ display:block;width:65px;  margin-right:10px;overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_name{ display:block;width:80px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
 .show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
 .show_hwork ul li{ margin-bottom:5px;}
 .show_hwork_arrow{ position:relative; top:2px; left:25px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;}
@@ -656,7 +659,6 @@ a:hover.ping_pic{border:1px solid #64bdd9;}
 a.down_btn{ border:1px solid #CCC; color:#999; padding:0px 5px; font-size:12px; text-align:center; display:block;}
 a:hover.down_btn{ background:#14ad5a; color:#fff; border:1px solid #14ad5a;}
 .fr{ float:right;}
-.min_search{ width:200px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 185px -193px no-repeat; cursor:pointer;}
 .li_min_search{ float:right; margin-right:-10px;}
 .info_ni{ width:100px; padding:5px;position: absolute;display:none;-moz-border-radius:3px;  -webkit-border-radius:3px;  border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left;}
 /*返回顶部*/
@@ -671,6 +673,9 @@ input#score{ width:40px;}
 .ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;top:0;height:100%;background:#64bdd9;left:0;}
 
 .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px;}
+.evaluation{position: relative;}
+.evaluation_submit{position: absolute;right: 0px;bottom: 5px;}
+.student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; }
 
 /* 与我相关 */
 .new_icon{background:url(../images/new_icon.png) 0px 0px no-repeat; width:35px; height:15px; display:block;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 5a6d98fbe..6cba7011f 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -49,6 +49,7 @@ a.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px  no-repea
 a:hover.icon_removem{background:url(../images/img_floatbox.png) -22px -61px  no-repeat;}
 a.btn_free{ background:#ff5722; display:block;  text-align:center; color:#fff; padding:3px 0; width:80px; margin-bottom:10px;}
 a:hover.btn_free{ background:#d63502;}
+.status_inviter{color: #3CA5C6;font-weight: bold; font-size: 14px }
 /*成员邀请*/
 .invi_search{ }
 .invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d6e6907fa..306520f96 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -18,7 +18,7 @@ table{ background:#fff;}
 .no_line{ border-bottom:none;}
 .line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 .no_border{ border:none;}
-.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/new_project/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
+.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/new_project/public_icon.png) 135px -193px no-repeat;}
 
 /* font & color */
 h2{ font-size:18px; color:#15bccf;}
@@ -59,6 +59,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
+.ml35{margin-left: 35px;}
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
@@ -86,6 +87,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
 .w20{ width:20px;}
+.w40{width: 40px;}
 .w45{ width: 45px;}
 .w60{ width:60px;}
 .w70{ width:70px;}