From b2f7b0f67092ba73bc4087852c18abf03350404b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 15 Jun 2015 10:34:23 +0800
Subject: [PATCH 01/46] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=EF=BC=88?=
 =?UTF-8?q?=E6=9C=AA=E6=94=B9=E5=8A=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_project_show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 3ffbe6554..6e94f0947 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -5,7 +5,7 @@
 <% if authorize_for('news', 'edit') %>
     <div id="edit-news" style="display:none;">
       <%= labelled_form_for :news, @news, :url => news_path(@news),
-                            :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
+                           :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
           <%= render :partial => 'project_form', :locals => { :f => f, :is_new => false } %>
       <% end %>
       <div id="preview" class="wiki"></div>

From aacd3af1fe5f216c058233260caee22aa6df55ca Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 15 Jun 2015 10:53:57 +0800
Subject: [PATCH 02/46] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=EF=BC=8C=E6=8C=89=E5=A4=A9=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 8488fc1d0..e6b091dd4 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -104,7 +104,7 @@ class Mailer < ActionMailer::Base
 
     # 查询user的缺陷，项目中成员都能收到
     sql = "select DISTINCT * 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"
+     and (i.updated_on between '#{date_from}' and '#{date_to}') order by i.updated_on desc"
     @issues = Issue.find_by_sql(sql)
 
     # @bids 查询课程作业，包括老师发布的作业，以及user提交作业

From e874f4406cde1d5e8bf33775ee86a8284d21c66d Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 11:15:19 +0800
Subject: [PATCH 03/46] ...

---
 app/controllers/courses_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f58d6ea24..61354add7 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -343,8 +343,8 @@ class CoursesController < ApplicationController
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
     filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
-    # 如果是ie11 需要转码
-    if(/rv\:11\.0/.match(request.env["HTTP_USER_AGENT"]) != nil)
+    # 如果是ie 需要转码
+    if(/trident/.match(request.env["HTTP_USER_AGENT"]) != nil)
       filename= URI::encode(filename)
     end
     respond_to do |format|

From 21ff990c658f300ca6460c8d0dab24c12ea55617 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 11:18:44 +0800
Subject: [PATCH 04/46] =?UTF-8?q?bug#2812:forge=E4=B8=BB=E9=A1=B5=E3=80=81?=
 =?UTF-8?q?course=E4=B8=BB=E9=A1=B5=E6=90=9C=E7=B4=A2=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=81=9A=E6=88=90=E4=B8=8B=E6=8B=89=E6=8C=89=E9=92=AE=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/_search_project.html.erb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb
index c2919b162..6679f559d 100644
--- a/app/views/welcome/_search_project.html.erb
+++ b/app/views/welcome/_search_project.html.erb
@@ -34,6 +34,9 @@ form #search_type{
 	-moz-appearance: none;
 	text-indent: 0.01px;
 	text-overflow: '';
+  padding-right:10px;
+  background-image:url(/images/arrow_expanded.png)!important;
+  background:no-repeat right;
 }
 
 form #search_by
@@ -68,6 +71,21 @@ form #search_by
 }
 <%#完了把上面东西放到 .css 里%>
 </style>
+<!--[if IE]>
+<!--<style type="text/css">-->
+  <!--form #search_type{-->
+    <!--background:none!important;-->
+  <!--}-->
+<!--</style>-->
+<![endif]-->
+<script type="text/javascript">
+  $(function(){
+    var userAgent = navigator.userAgent.toLowerCase();
+    if(/trident/.test(userAgent)){
+      $('form #search_type').css({'background-image':'none!important'});
+    }
+  });
+</script>
 <script type="text/javascript">
   function searchTypeChange()
   {

From b6f3233318224c961b79da1362e5e3815681a307 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 12:12:12 +0800
Subject: [PATCH 05/46] =?UTF-8?q?bug#2304:=E6=96=B0=E7=89=88=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE--wiki=EF=BC=9A=E5=A6=82=E5=9B=BE=EF=BC=8C=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form.html.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 845e2b6a0..fe0dcbb1c 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -1,3 +1,6 @@
+<style type="text/css">
+  input.is_public,input.is_public_checkbox{height:12px;}
+</style>
 <div class="fl">
 <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>

From 761840e0a4341fbcfbf81fa91d77f6836cbc1002 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 15 Jun 2015 13:11:35 +0800
Subject: [PATCH 06/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=8F=8F=E8=BF=B0=E6=9F=A5=E7=9C=8B=E5=B7=AE?=
 =?UTF-8?q?=E5=88=AB=E6=97=B6404=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/journals_controller.rb |  2 +-
 app/helpers/issues_helper.rb           | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index f6e17593f..aa3a7e0ea 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -56,7 +56,7 @@ class JournalsController < ApplicationController
     @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
     respond_to do |format|
       format.html {
-        render :layout => 'project_base'
+        render :layout => 'new_base'
       }
     end
   end
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index aae150728..e4f9a7a81 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -361,15 +361,16 @@ module IssuesHelper
       end
     end
 
+    # 之所以注释是因为该功能冗余了
     if detail.property == 'attr' && detail.prop_key == 'description'
       s = l(:text_journal_changed_no_detail, :label => label)
-      unless no_html
-        diff_link = link_to l(:label_diff),
-          {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
-           :detail_id => detail.id, :only_path => options[:only_path]},
-          :title => l(:label_view_diff)
-        s << " (#{ diff_link })"
-      end
+      # unless no_html
+      #   diff_link = link_to l(:label_diff),
+      #     {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
+      #      :detail_id => detail.id, :only_path => options[:only_path]},
+      #     :title => l(:label_view_diff)
+      #   s << " (#{ diff_link })"
+      # end
       s.html_safe
     elsif detail.value.present?
       case detail.property

From 3b2db627c47e8ace32270ff7dd22fb907f78e3e4 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 13:42:09 +0800
Subject: [PATCH 07/46] ...

---
 app/views/attachments/_form.html.erb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index fe0dcbb1c..3dbc8d8ba 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -1,14 +1,13 @@
 <style type="text/css">
   input.is_public,input.is_public_checkbox{height:12px;}
+  input.is_public_checkbox{margin-left:4px;margin-right:4px;}
 </style>
 <div class="fl">
 <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %>
-      <span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><span class="ispublic-label"><%= l(:field_is_public) %>:</span>
       <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
       <%= if attachment.id.nil?
             #待补充代码

From 790e1741abf03d99e56a7d4e4035e95ee0a723ac Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 13:53:32 +0800
Subject: [PATCH 08/46] =?UTF-8?q?bug#2859:=E8=AF=BE=E7=A8=8B=E7=95=99?=
 =?UTF-8?q?=E8=A8=80--=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D=E5=9D=97?=
 =?UTF-8?q?=E8=A2=AB=E6=8C=A4=E4=B8=8B=E6=9D=A5=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_courses_jours.html.erb  | 4 ++--
 app/views/projects/_project_jours.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index 3d25be603..2cb22ce89 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -8,8 +8,8 @@
   div.ke-toolbar .ke-outline{border:none;}
 
   div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
-  div.recall_con{width:600px;}
-  div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
+  div.recall_con{width:570px;}
+  div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
 </style>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
 <div class="msg_box fl" id='leave-message' nhname="new_message">
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 2079d42f9..353223acd 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -8,8 +8,8 @@
   div.ke-toolbar .ke-outline{border:none;}
 
   div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
-  div.recall_con{width:600px;}
-  div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
+  div.recall_con{width:570px;}
+  div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
 </style>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
 <div class="msg_box" id='leave-message' nhname='new_message' style="height:auto;">

From 014f830b1dd16254a7d8f10a95f56761b455605c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 15 Jun 2015 14:51:10 +0800
Subject: [PATCH 09/46] =?UTF-8?q?=E6=B7=BB=E5=8A=A0issue=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb             | 5 +++++
 app/views/journals/diff.html.erb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index e6b091dd4..20cf91aa4 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -107,6 +107,11 @@ class Mailer < ActionMailer::Base
      and (i.updated_on between '#{date_from}' and '#{date_to}') order by i.updated_on desc"
     @issues = Issue.find_by_sql(sql)
 
+    # issue回复
+    @issues_journals = Journal.find_by_sql("select j.* from journals j, members m, projects p, issues i
+     where m.user_id = '#{user.id}' and p.id = m.project_id and i.project_id = p.id and j.journalized_id = i.id
+     and j.journalized_type='Issue' and (j.created_on between '#{date_from}' and '#{date_to}') order by updated_on desc")
+
     # @bids 查询课程作业，包括老师发布的作业，以及user提交作业
     # @attachments查询课程课件更新
     @attachments ||= []
diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb
index d3dfa7d34..5bc823c76 100644
--- a/app/views/journals/diff.html.erb
+++ b/app/views/journals/diff.html.erb
@@ -2,7 +2,7 @@
 <p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p>
 
 <div class="text-diff">
-<%= simple_format_without_paragraph @diff.to_html %>
+  <%= simple_format_without_paragraph @diff.to_html %>
 </div>
 
 <p><%= link_to l(:button_back), issue_path(@issue), :onclick => 'history.back(); return false;' %></p>

From 8ccfcc3d722fca9b7159b1b1f7a3d38611398f60 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 14:52:55 +0800
Subject: [PATCH 10/46] =?UTF-8?q?bug#2847:=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=EF=BC=9A=E5=AF=B9=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E8=BF=9B=E8=A1=8C=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=9C=A8=E4=B8=AD=E9=97=B4=E7=94=A8=E8=99=9A?=
 =?UTF-8?q?=E7=BA=BF=E9=9A=94=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb  | 2 +-
 app/views/boards/_project_show.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 5beee8601..66875d0d7 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -92,7 +92,7 @@
 
           <div class="cl"></div>
 
-          <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>"  style="display: none">
+          <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>"  style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
             <ul>
               <%= render :partial => 'edit',locals:  {:topic => topic} %>
             </ul>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index d5a5a7882..fcc8fa0c8 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -80,7 +80,7 @@
           <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr" style="margin-right:10px;"><%= l(:button_reply) %></a>
         <% end %>
         <div class="cl"></div>
-        <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none">
+        <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
           <ul>
             <%= render :partial => 'edit',locals:  {:topic => topic} %>
           </ul>

From e6b82e5463925829259715984713eeed3b36a06a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 15 Jun 2015 15:06:58 +0800
Subject: [PATCH 11/46] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E5=AD=A6=E7=94=9F=E7=9A=84=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index a222314ab..d8a9d88c3 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -483,6 +483,24 @@ class PollController < ApplicationController
         count_row += 1
       end
     end
+
+    sheet1.row(count_row).default_format = blue
+    sheet1[count_row ,0] = l(:label_bidding_user_studentname)
+    poll_questions.each_with_index do |poll_question, i|
+      sheet1[count_row ,i + 1] = poll_question.question_title
+    end
+    count_row += 1
+    @poll.users.each do |user|
+      sheet1[count_row ,0] = user.show_name
+      poll_questions.each_with_index do |poll_question, i|
+        if poll_question.question_type == 1 || poll_question.question_type == 2
+          sheet1[count_row ,i + 1] = user.poll_votes.where(:poll_question_id => poll_question.id).map{|poll_vote| poll_vote.poll_answer.answer_text.gsub(/<\/?.*?>/,"").gsub(/&nbsp;/," ") if poll_vote.poll_answer}.join(";")
+        else
+          sheet1[count_row ,i + 1] = user.poll_votes.where(:poll_question_id => poll_question.id).map{|poll_vote| poll_vote.vote_text.gsub(/<\/?.*?>/,"").gsub(/&nbsp;/," ")}.join(";")
+        end
+      end
+      count_row += 1
+    end
     book.write xls_report
     xls_report.string
   end

From f39a98ee6851e9ed20f2171857df341990fa83bd Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 15:31:02 +0800
Subject: [PATCH 12/46] =?UTF-8?q?bug#2841:=E8=AF=BE=E7=A8=8B=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=8C=BA=EF=BC=9A=E4=B8=BB=E9=A2=98=E7=9A=84=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=92=8C=E6=8F=8F=E8=BF=B0=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E4=BD=8D=E7=BD=AE=E5=BA=94=E8=AF=A5=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/show.html.erb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index ba9583e7d..40d16cce4 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,4 +1,5 @@
 <style type="text/css">
+    div.talk_new .ke-container{margin-left:57px;}
     /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
     span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
@@ -127,13 +128,17 @@ function nh_init_board(params){
             var editor = params.kindutil.create(params.textarea, {
 //                allowPreviewEmoticons : false,
 //                allowImageUpload : false,
-                resizeType : 1,minWidth:"1px",width:"565px",height:"150px",
+                resizeType : 1,minWidth:"1px",width:"560px",height:"150px",
                 allowFileManager:true,uploadJson:"/kindeditor/upload",
                 fileManagerJson:"/kindeditor/filemanager",
                 afterChange:function(){//按键事件
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
                 },
                 afterCreate:function(){
+                  var userAgent = navigator.userAgent.toLowerCase();
+                  if(/trident/.test(userAgent)){
+                    $("div.talk_new .ke-container").css({'margin-left':'55px'});
+                  }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);

From 4bb674bcae928008096fb11cef4c407177db51c9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 15 Jun 2015 15:43:28 +0800
Subject: [PATCH 13/46] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E6=96=B0=E9=97=BB=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=20=E9=82=AE=E4=BB=B6=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 20cf91aa4..352c1b41a 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -160,13 +160,23 @@ class Mailer < ActionMailer::Base
     end
     # wiki
 
-    #  查询user在课程中发布的通知，项目中发的新闻
+    #  查询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})
                                                     and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") : []
+
+    @course_news_comments =  Comment.find_by_sql("select cm.* from comments cm, members m, courses c, news n
+     where m.user_id = '#{user.id}' and c.id = m.course_id and n.course_id = c.id and cm.commented_id = n.id
+     and cm.commented_type ='News' and (cm.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+
+    # 查询user在项目中添加新闻和回复新闻
     @project_news = (project_ids && !project_ids.empty?) ? News.find_by_sql("select DISTINCT n.* from news n where  n.project_id in (#{project_ids})
                                                      and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") : []
 
+    @project_news_comments =  Comment.find_by_sql("select c.* from comments c, members m, projects p, news n
+     where m.user_id = '#{user.id}' and p.id = m.project_id and n.project_id = p.id and c.commented_id = n.id
+     and c.commented_type ='News' and (c.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+
     # 查询user在课程及个人中留言
     @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT jfm.* from journals_for_messages jfm, members m, courses c
      where m.user_id = '#{user.id}' and c.id = m.course_id and jfm.jour_id = c.id

From 2fd00a10714150094c37536e386dc60292abcaad Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 16:19:11 +0800
Subject: [PATCH 14/46] ...

---
 app/views/boards/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 40d16cce4..1622bc22a 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,5 +1,5 @@
 <style type="text/css">
-    div.talk_new .ke-container{margin-left:57px;}
+    div.talk_new .ke-container{margin-left:2px;}
     /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
     span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}

From 0434219518342e227e19da916e2829e336b00d90 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 16:21:41 +0800
Subject: [PATCH 15/46] ...

---
 app/views/boards/show.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 1622bc22a..bd4ece847 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -138,6 +138,8 @@ function nh_init_board(params){
                   var userAgent = navigator.userAgent.toLowerCase();
                   if(/trident/.test(userAgent)){
                     $("div.talk_new .ke-container").css({'margin-left':'55px'});
+                  }else if(/chrome/.test(userAgent)){
+                    $("div.talk_new .ke-container").css({'margin-left':'57px'});
                   }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');

From 59dcfcbb1a136f095806d2a02af71738dd188153 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 15 Jun 2015 17:44:53 +0800
Subject: [PATCH 16/46] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=EF=BC=88=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E6=96=B0=E9=97=BB=E3=80=81=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E6=9B=B4=E6=96=B0=E5=9B=9E=E5=A4=8D=EF=BC=89=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                          |   4 +-
 .../mailer/send_for_user_activities.html.erb  | 100 +++++++++++++++++-
 2 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 352c1b41a..e19f58e47 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -110,7 +110,7 @@ class Mailer < ActionMailer::Base
     # issue回复
     @issues_journals = Journal.find_by_sql("select j.* from journals j, members m, projects p, issues i
      where m.user_id = '#{user.id}' and p.id = m.project_id and i.project_id = p.id and j.journalized_id = i.id
-     and j.journalized_type='Issue' and (j.created_on between '#{date_from}' and '#{date_to}') order by updated_on desc")
+     and j.journalized_type='Issue' and (j.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
 
     # @bids 查询课程作业，包括老师发布的作业，以及user提交作业
     # @attachments查询课程课件更新
@@ -194,7 +194,7 @@ class Mailer < ActionMailer::Base
     @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,@course_messages,@project_messages,@course_news,@project_news,
+    has_content = [@issues,@issues_journals,@course_messages,@project_messages,@course_news,@course_news_comments,@project_news,@project_news_comments,
                    @course_journal_messages,@user_journal_messages,@project_journal_messages,@forums,@memos,@attachments,@bids,@wiki_contents].any? {|o| !o.empty?}
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 21549be21..5c89be1b8 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -6,6 +6,7 @@
         @course_journal_messages.first|| @course_messages.first || @attachments.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#15bccf; "><%= l(:label_course_overview)%></h3>
+      <!-- 课程通知 -->
       <% 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:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
@@ -35,6 +36,38 @@
           </ul><!--课程通知 end-->
       <% end %>
 
+      <!-- 课程通知回复 -->
+      <% unless @course_news_comments.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:1020px; margin-bottom:15px;">
+            <span class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_course_news) %>
+            </span>
+            <% @course_news_comments.each do |course_news_comment|%>
+                <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:#666; font-weight:bold; float:left;">[</span>
+                  <% unless course_news_comment.commented.nil? %>
+                    <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <% end %>
+                  <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
+
+                  <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice) %></span>
+
+                  <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(course_news_comment.created_on) %></span>
+                </li>
+            <% end %>
+            <div class="cl"></div>
+          </ul><!--课程通知 end-->
+      <% end %>
+
       <!--课程作业-->
       <% unless  @bids.empty? %>
           <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
@@ -162,7 +195,7 @@
 <% end %>
 
 <!--项目相关-->
-<% if @issues.first || @project_messages.first || @wiki_contents.first || @project_news.first || @project_journal_messages.first %>
+<% if @issues.first || @project_messages.first || @wiki_contents.first || @project_news.first || @project_journal_messages.first || @project_news_comments.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#15BCCF; "><%= l(:label_project_overview_new)%></h3>
       <% unless @issues.first.nil? %>
@@ -192,6 +225,41 @@
           </ul><!--问题跟踪 end-->
       <% end %>
 
+      <!-- issues回复 -->
+
+      <% unless @issues_journals.first.nil? %>
+        <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
+            <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_issue_tracking) %>
+            </span>
+          <% @issues_journals.each do |issues_journal| %>
+              <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:#666; font-weight:bold; float:left;">[</span>
+                <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value),
+                            :class=> "wmail_column",
+                            :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
+                <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
+                            :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue) %></span>
+                <% if issues_journal.notes.nil? %>
+                    <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value),
+                            :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                 %>
+                <% else %>
+                    <%= link_to truncate(issues_journal.notes,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
+                                :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                 %>
+                <% end %>
+                <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issues_journal.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:1020px; margin-bottom:15px;">
@@ -284,6 +352,36 @@
           </ul><!-- 项目新闻end -->
       <% end %>
 
+      <!-- 项目新闻回复 -->
+      <% unless @project_news_comments.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:1020px; margin-bottom:15px;">
+            <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_project_news) %>
+            </span>
+            <% @project_news_comments.each do |project_news_comment|%>
+                <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:#666; font-weight:bold; float:left;">[</span>
+                  <% unless project_news_comment.commented.nil? %>
+                    <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <% end %>
+                  <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
+                  <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_notice) %></span>
+
+                  <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(project_news_comment.created_on) %></span>
+                </li>
+            <% end %>
+            <div class="cl"></div>
+          </ul><!-- 项目新闻回复end -->
+      <% end %>
+
       <!--项目留言-->
       <% unless @project_journal_messages.first.nil? %>
           <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">

From 04d4fee17ec8735603583b8b8c0a2957760b2c79 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 16 Jun 2015 09:32:51 +0800
Subject: [PATCH 17/46] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=EF=BC=9A=E6=96=B0=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=9C=A8=E9=82=AE=E4=BB=B6=E4=B8=AD=E4=BD=93?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/mailer/_issue.html.erb              | 31 +++++++++----------
 .../mailer/send_for_user_activities.html.erb  |  1 -
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index 5145dbb2c..49f137df5 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -1,46 +1,43 @@
 <!-- <h1><%#= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1> -->
 <p>
-
-      <span class="c_blue" style="color:#1b55a7;">
+    <span class="c_blue" style="color:#1b55a7;">
         <%= link_to(h("#{@author.login}(#{@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("#{@issue.project.name}"), @project_url, :style=>'color:#1b55a7; font-weight:bold;') %></span><%= l(:mail_issue_title_active)%></p>
+    </span><%= l(:mail_issue_title_userin)%>
+    <span class="c_blue" style="color:#1b55a7;"><%= link_to(h("#{@issue.project.name}"), @project_url, :style=>'color:#1b55a7; font-weight:bold;') %></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;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 526px"><%= link_to(issue.subject, issue_url, :style=>'color:#1b55a7; font-weight:bold;') %></span></li>
-	<li style="list-style-type:none; margin:0; padding:0;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 526px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
-	<li style="list-style-type:none; margin:0; padding:0; float: left; "><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 526px"><%= link_to(issue.subject, issue_url, :style=>'color:#1b55a7; font-weight:bold;') %></span></li>
+    <li style="list-style-type:none; margin:0; padding:0;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 526px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
+    <li style="list-style-type:none; margin:0; padding:0; float: left; "><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
 
         	<% if @journal.nil? %>
-                 <%= issue.description=='' ? l(:label_none) : issue.description %>
+                 <%= issue.description=='' ? l(:label_none) : issue.description.html_safe %>
             <% else %>
-            	<%= @journal.notes=='' ? l(:label_none) : @journal.notes %>
+            	<%= @journal.notes=='' ? l(:label_none) : @journal.notes.html_safe %>
            <% end%>
         </span>
     </li>
     <li style="list-style-type:none; margin:0; padding:0;float: left; ">
       <span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong></span>
       <% if @issue.attachments.count == 0 %>
-        <%= l(:label_none)%>
+          <%= l(:label_none)%>
       <% else %>
         <span style="float: left; width: 526px; margin:0; padding:0;">
           <% @issue.attachments.each do |attach| %>
           <p style="float: left; width: 526px; margin:0; padding:0;"><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false, :style=>'color:#1b55a7; font-weight:bold;')%></p>
         <% end %></span>
       <% end %>
-
-
     </li>
-</ul>
+  </ul>
   <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
   <label  class="mail_reply">
-  	<%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
-  	</label>
+    <%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  </label>
   <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
 </div>
 <!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
-
 <li><%#=l(:field_status)%>: <%#=h issue.status %></li>
 <li><%#=l(:field_priority)%>: <%#=h issue.priority %></li>
 <li><%#=l(:field_assigned_to)%>: <%#=h issue.assigned_to %></li>
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 5c89be1b8..9c64af22e 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -97,7 +97,6 @@
                     </li>
                 <% end %>
             <% end %>
-
             <div class="cl"></div>
           </ul><!--作业动态 end-->
       <% end %>

From d3837ba03cf7d86a271c2f716c90a1cfb9890fbf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Jun 2015 09:34:21 +0800
Subject: [PATCH 18/46] =?UTF-8?q?attachment=5Fcontrol=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 2a772a949..4ecff7a40 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -23,6 +23,7 @@ class AttachmentsController < ApplicationController
   before_filter :delete_authorize, :only => [:destroy]
   before_filter :authorize_global, :only => [:upload]
   before_filter :authorize_attachment_download1, :only => [:download]
+  before_filter :has_login
   #before_filter :login_without_softapplication, only: [:download]
   accept_api_auth :show, :download, :upload
   require 'iconv'
@@ -511,4 +512,8 @@ private
       format.js
     end
   end
+
+  def has_login
+    render_403 unless User.current.logged?
+  end
 end

From c8884c6fd4dcd80b9f418ca4cb11ef52110af3b7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 16 Jun 2015 11:11:59 +0800
Subject: [PATCH 19/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7url=EF=BC=8C=E9=9A=90=E8=97=8Fuserid=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 7 ++++---
 app/models/mailer.rb                   | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index efe5a52ee..6510d65aa 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -413,10 +413,11 @@ class ProjectsController < ApplicationController
     # 2、加入项目、创建角色
     # 3、用户得分
     if params[:mail]
-      user = User.find(params[:user_id])
+      userid = Token.find_by_value(params[:token]).user_id
+      user = User.find(userid)
       user.activate!
-      Member.create(:role_ids => [4], :user_id => params[:user_id],:project_id => params[:id])
-      UserGrade.create(:user_id => params[:user_id], :project_id => params[:id])
+      Member.create(:role_ids => [4], :user_id => userid, :project_id => params[:id])
+      UserGrade.create(:user_id => userid, :project_id => params[:id])
       token = Token.get_token_from_user(user, 'autologin')
       #user = User.try_to_autologin(token.value)
       if user
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index e19f58e47..8b8ed7d73 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -61,8 +61,8 @@ class Mailer < ActionMailer::Base
     InviteList.create(:user_id => user.id, :project_id => project.id)
     User.current = user unless User.current.nil?
     @user = user
-
-    @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true)
+    @token = Token.get_token_from_user(user, 'autologin')
+    @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :mail => true, :token => @token.value)
     mail :to => email, :subject => @subject
   end
 

From e5774f573177982a7ac0f2339c5444613f076809 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 11:13:57 +0800
Subject: [PATCH 20/46] =?UTF-8?q?bug#2853:=E8=B0=B7=E6=AD=8C=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=EF=BC=9A=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=EF=BC=9A=E5=8F=91=E5=B8=83=E5=B8=A6=E6=9C=89=E5=A4=A7?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E5=86=85=E5=AE=B9=E6=97=B6=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=B1=95=E5=BC=80=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb  | 26 ++++++++++++++++++++++++-
 app/views/boards/_project_show.html.erb | 26 ++++++++++++++++++++++++-
 app/views/boards/show.html.erb          | 14 ++++++-------
 3 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 66875d0d7..7eed593d9 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -66,7 +66,31 @@
             <div class="cl"></div>
 
             <script>
-                $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
+              //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
+              //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
+              $(function(){
+                function nh_show_btn(){
+                  if($("#contentmessage<%=topic.id %>").height()>182){
+                    $("#project_show_<%= topic.id%>").show();
+                  }
+                }
+                var div = $("#contentmessage<%=topic.id %>");
+                var imgs = $('img',div);
+                var lens = imgs.length;
+                function nh_load_img_end(){
+                  lens--;
+                  if(lens <= 0){
+                    nh_show_btn();
+                  }
+                }
+                if(lens <= 0){
+                  nh_show_btn();
+                }else{
+                  $('img',div).load(function(){
+                    nh_load_img_end();
+                  });
+                }
+              });
             </script>
             <div  class="project_board_content break_word" id="content_<%=topic.id%>">
               <div id="contentmessage<%=topic.id %>" class="upload_img">
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index fcc8fa0c8..bb36c6f19 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -58,7 +58,31 @@
                 <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
             <% end %>
             <script>
-                $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
+                //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
+                //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
+                $(function(){
+                  function nh_show_btn(){
+                    if($("#contentmessage<%=topic.id %>").height()>182){
+                      $("#project_show_<%= topic.id%>").show();
+                    }
+                  }
+                  var div = $("#contentmessage<%=topic.id %>");
+                  var imgs = $('img',div);
+                  var lens = imgs.length;
+                  function nh_load_img_end(){
+                    lens--;
+                    if(lens <= 0){
+                      nh_show_btn();
+                    }
+                  }
+                  if(lens <= 0){
+                    nh_show_btn();
+                  }else{
+                    $('img',div).load(function(){
+                      nh_load_img_end();
+                    });
+                  }
+                });
             </script>
           </div>
           <div class="cl"></div>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index bd4ece847..fc18b00e8 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,5 +1,5 @@
 <style type="text/css">
-    div.talk_new .ke-container{margin-left:2px;}
+    /*div.talk_new .ke-container{margin-left:2px;}*/
     /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
     span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
@@ -135,12 +135,12 @@ function nh_init_board(params){
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
                 },
                 afterCreate:function(){
-                  var userAgent = navigator.userAgent.toLowerCase();
-                  if(/trident/.test(userAgent)){
-                    $("div.talk_new .ke-container").css({'margin-left':'55px'});
-                  }else if(/chrome/.test(userAgent)){
-                    $("div.talk_new .ke-container").css({'margin-left':'57px'});
-                  }
+                  //var userAgent = navigator.userAgent.toLowerCase();
+                  //if(/trident/.test(userAgent)){
+                    //$("div.talk_new .ke-container").css({'margin-left':'55px'});
+                  //}else if(/chrome/.test(userAgent)){
+                    //$("div.talk_new .ke-container").css({'margin-left':'57px'});
+                  //}
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);

From f3f0a9847f7b20418800739685c762b0735bba69 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 16 Jun 2015 11:45:30 +0800
Subject: [PATCH 21/46] =?UTF-8?q?=E9=82=AE=E4=BB=B6text=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mailer/send_for_user_activities.html.erb  |   7 +-
 .../mailer/send_for_user_activities.text.erb  | 469 +++++++-----------
 2 files changed, 182 insertions(+), 294 deletions(-)

diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 9c64af22e..70dab08f0 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -2,7 +2,7 @@
 <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
   <%= @subject %>
 </h4>
-<% if @attachments.first || @course_news.first || @bids.first ||
+<% if @attachments.first || @course_news.first || @course_news_comments.first || @bids.first ||
         @course_journal_messages.first|| @course_messages.first || @attachments.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#15bccf; "><%= l(:label_course_overview)%></h3>
@@ -65,7 +65,7 @@
                 </li>
             <% end %>
             <div class="cl"></div>
-          </ul><!--课程通知 end-->
+          </ul><!--课程通知回复 end-->
       <% end %>
 
       <!--课程作业-->
@@ -194,7 +194,8 @@
 <% end %>
 
 <!--项目相关-->
-<% if @issues.first || @project_messages.first || @wiki_contents.first || @project_news.first || @project_journal_messages.first || @project_news_comments.first %>
+<% if @issues.first || @project_messages.first || @issues_journals.first || @wiki_contents.first || @project_news.first || @project_news_comments.first || @project_journal_messages.first ||
+        @project_news_comments.first  %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#15BCCF; "><%= l(:label_project_overview_new)%></h3>
       <% unless @issues.first.nil? %>
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
index c46e96f03..43a4dbe9e 100644
--- a/app/views/mailer/send_for_user_activities.text.erb
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -1,344 +1,231 @@
 <%= @subject %>
-<% if @attachments.first || @course_news.first || @bids.first ||
-      @course_journal_messages.first|| @course_messages.first %>
-<%= l(:label_course_overview)%>
-  <% unless @course_news.first.nil? %>
-         <%= l(:label_course_news) %>
-
-
-
+<% if @attachments.first || @course_news.first || @course_news_comments.first || @bids.first ||
+        @course_journal_messages.first|| @course_messages.first || @attachments.first %>
+    <%= l(:label_course_overview)%>
+    <% unless @course_news.first.nil? %>
+        <%= l(:label_course_news) %>
         <% @course_news.each do |course_new|%>
 
-           ▪
-             [
-
-              <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value)%>
-             ]
-
-              <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value)
-                           %>
-             <%= l(:label_project_notice) %>
+            ▪[<%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value)%> ]
 
-              <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value)
-
-
-              %> <%= format_time(course_new.created_on) %>
+            <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value) %>
+            <%= l(:label_project_notice) %>
+            <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value) %>
+            <%= format_time(course_new.created_on) %>
+        <% end %>
+    <% end %>
 
+    <% unless @course_news_comments.first.nil? %>
+        <%= l(:label_course_news) %>
+        <% @course_news_comments.each do |course_news_comment|%>
+            ▪[ <% unless course_news_comment.commented.nil? %>
+                <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value) %>
+            <% end %>
+            ]
+            <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value) %>
+            <%= l(:label_project_notice) %>
+            <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value) %>
+            <%= format_time(course_news_comment.created_on) %>
         <% end %>
+    <% end %>
 
-  <% end %>
-  <% unless  @bids.empty? %>
-    <%= l(:label_homework_overview) %>
+    <% unless  @bids.empty? %>
+        <%= l(:label_homework_overview) %>
         <% unless @bids.first.nil?%>
             <% @bids.each do |bid| %>
-               ▪
-                [
-
-                  <%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course, :token => @token.value)
-
-                                %>
-                 ]
-
-                  <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value)
-                               %>
-               <%= l(:label_course_homework) %>
-
-                  <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value)
-
-
-                  %>
-                 <%= format_time(bid.created_at) %>
-
+                ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course, :token => @token.value) %>]
+                <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value) %>
+                <%= l(:label_course_homework) %>
+                <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value) %>
+                <%= format_time(bid.created_at) %>
             <% end %>
         <% end %>
+        <!--作业动态 end-->
+    <% end %>
 
-
-     <!--作业动态 end-->
-  <% end %>
-
-  <% unless @course_journal_messages.first.nil? %>
-
-          <%= l(:view_course_journals_for_messages) %>
-
-
+    <% unless @course_journal_messages.first.nil? %>
+        <%= l(:view_course_journals_for_messages) %>
         <% @course_journal_messages.each do |course_journal_message|%>
-
-              [
-
-              <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value)
-
-                            %>
-             ]
-
-              <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value)
-                           %>
+            [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value) %>]
+            <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value) %>
             <%= l(:label_send_course_journals_for_messages) %>
-
-              <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value)
-
-
-              %>
-              <%= format_time(course_journal_message.created_on) %>
-
+            <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %>
+            <%= format_time(course_journal_message.created_on) %>
         <% end %>
+    <% end %>
 
-
-  <% end %>
-
-  <% unless @course_messages.first.nil? %>
-
-          <%= l(:view_borad_course) %>
-
-
-
+    <% unless @course_messages.first.nil? %>
+        <%= l(:view_borad_course) %>
         <% @course_messages.each do |course_message|%>
-
-              ▪
-              [
-
-              <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course, :token => @token.value)
-
-                            %>
-              ]
-
-              <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value)
-                           %>
-              <%= l(:label_send_course_messages) %>
-
-              <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value)
-
-
-              %>
-              <%= format_time(course_message.created_on) %>
-
+            ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course, :token => @token.value)%>]
+            <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value) %>
+            <%= l(:label_send_course_messages) %>
+            <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value) %>
+            <%= format_time(course_message.created_on) %>
         <% end %>
+    <% end %>
 
-
-  <% end %>
-
-  <% unless @attachments.first.nil? %>
-
-          <%= l(:label_course_attendingcontestwork_download) %>
-
-
-
+    <% unless @attachments.first.nil? %>
+        <%= l(:label_course_attendingcontestwork_download) %>
         <% @attachments.each do |attachment|%>
-            ▪[
-
-              <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value)
-
-                            %>
-              ]
-
-              <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value)
-                           %>
-              <%= l(:label_course_file_upload) %>
-
-              <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value)
-
-
-              %>
-              <%= format_time(attachment.created_on) %>
-            </li>
+            ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value) %>]
+            <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value) %>
+            <%= l(:label_course_file_upload) %>
+            <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value) %>
+            <%= format_time(attachment.created_on) %>
         <% end %>
-
-      </ul><!--课件下载  end-->
-  <% end %>
+        <!--课件下载  end-->
+    <% end %>
 <% end %><!--课程动态  end-->
 
-<% @issues.first || @project_messages.first || @wiki_contents.first || @project_news.first || @project_journal_messages.first %>
-<%= l(:label_project_overview_new)%>
-  <% unless @issues.first.nil? %>
-
-          <%= l(:label_issue_tracking) %>
-
-
+<!-- 项目动态 -->
+<!--项目相关-->
+<% if @issues.first || @project_messages.first || @issues_journals.first || @wiki_contents.first || @project_news.first || @project_news_comments.first || @project_journal_messages.first ||
+        @project_news_comments.first  %>
+    <%= l(:label_project_overview_new)%>
+    <% unless @issues.first.nil? %>
+        <%= l(:label_issue_tracking) %>
         <% @issues.each do |issue|%>
-            ▪
-             [
-
-              <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value)
-
-                            %>
-              ]
-
-              <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value)
-                           %>
-             <%= l(:label_project_issue) %>
-
-              <%= link_to truncate(issue. subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value)
-
-
-              %>
-              <%= format_time(issue.created_on) %>
+            ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value) %>]
+            <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value) %>
+            <%= l(:label_project_issue) %>
+            <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
+            <%= format_time(issue.created_on) %>
         <% end %>
+        <!--问题跟踪 end-->
+    <% end %>
 
+    <!-- issues回复 -->
+    <% unless @issues_journals.first.nil? %>
+        <%= l(:label_issue_tracking) %>
+        <% @issues_journals.each do |issues_journal| %>
+            ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value) %>]
+            <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value) %>
+            <%= l(:label_project_issue) %>
+            <% if issues_journal.notes.nil? %>
+                <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
+            <% else %>
+                <%= link_to truncate(issues_journal.notes,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value) %>
+            <% end %>
+            <%= format_time(issues_journal.created_on) %>
+        <% end %>
+    <% end %>
 
-  <% end %>
-
-  <% unless @project_messages.first.nil? %>
-
-          <%= l(:project_moule_boards_show) %>
-
-
+    <!-- 讨论区 -->
+    <% unless @project_messages.first.nil? %>
+        <%= l(:project_moule_boards_show) %>
         <% @project_messages.each do |project_message|%>
-          ▪[
-
-              <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value)
-
-                          %>
-        ]
-
-              <%= link_to project_message.author, board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value)
-                           %>
-              <%= l(:label_send_course_messages) %>
-
-              <%= link_to truncate(project_message. subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value)
-
-
-              %>
-              <%= format_time(project_message.created_on) %>
+            ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value) %>]
+            <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value) %>
+            <%= l(:label_send_course_messages) %>
+            <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value) %>
+            <%= format_time(project_message.created_on) %>
         <% end %>
+        <!--项目论坛 end-->
+    <% end %>
 
+    <!--项目wiki-->
     <% unless @wiki_contents.first.nil? %>
-
-              <%= l(:label_wiki) %>
-
-          <% @wiki_contents.each do |wikicontent|%>
-              ▪[
-                <% unless wikicontent.page.nil? %>
-                    <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value)
-                               %>
-                <% end %>
-                ]
-                <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value) %>
-                <%= l(:label_project_notice) %>
-                <% unless wikicontent.page.nil? %>
-                    <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value) %>
-                <% end %>
-                <%= format_time(wikicontent.updated_on) %>
-
-          <% end %>
+        <%= l(:label_wiki) %>
+        <% @wiki_contents.each do |wikicontent|%>
+            ▪[<% unless wikicontent.page.nil? %>
+                <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value) %>
+            <% end %>
+            ]
+            <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value) %>
+            <%= l(:label_wiki_mail_notification) %>
+            <% unless wikicontent.page.nil? %>
+                <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value) %>
+            <% end %>
+            <%= format_time(wikicontent.updated_on) %>
+        <% end %>
     <% end %>
 
     <!--项目新闻-->
     <% unless @project_news.first.nil? %>
+        <%= l(:label_project_news) %>
+        <% @project_news.each do |project_new|%>
+            ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value) %> ]
+            <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value) %>
+            <%= l(:label_project_mail_notice) %>
+            <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %>
+            <%= format_time(project_new.created_on) %>
+        <% end %>
+    <% end %>
 
-              <%= l(:label_project_news) %>
-
-          <% @project_news.each do |project_new|%>
-             ▪[
-
-                <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value)
-                            %>
-               ]
-                <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value)
-                           %>
-                <%= l(:label_project_notice) %>
-
-                <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value)
-                            %>
-                <%= format_time(project_new.created_on) %>
-
-          <% end %>
+    <!-- 项目新闻回复 -->
+    <% unless @project_news_comments.first.nil? %>
+        <%= l(:label_project_news) %>
+        <% @project_news_comments.each do |project_news_comment|%>
+            ▪[ <% unless project_news_comment.commented.nil? %>
+                <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value) %>
+            <% end %>]
+            <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value) %>
+            <%= l(:label_project_mail_notice) %>
+            <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value) %>
+            <%= format_time(project_news_comment.created_on) %>
+        <% end %>
+        <!-- 项目新闻回复end -->
     <% end %>
 
     <!--项目留言-->
     <% unless @project_journal_messages.first.nil? %>
-              <%= l(:label_project_mail_feedback) %>
-
-          <% @project_journal_messages.each do |project_journal_message|%>
-              ▪[
-
-                <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value)
-                            %>
-                ]
-
-                <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value) %>
-                <%= l(:label_send_course_journals_for_messages) %>
-
-                <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project,:token => @token.value)
-                %>
-                <%= format_time(project_journal_message.created_on) %>
-          <% end %>
+        <%= l(:label_project_mail_feedback) %>
+        <% @project_journal_messages.each do |project_journal_message|%>
+            ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value) %> ]
+            <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value) %>
+            <%= l(:label_send_course_journals_for_messages) %>
+            <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project,:token => @token.value) %>
+            <%= format_time(project_journal_message.created_on) %>
+        <% end %>
+        <!--项目留言 end-->
     <% end %>
+    </div>
+<% end %><!-- 项目动态end -->
 
-  <% end %>
 
 
 <% unless @user_journal_messages.first.nil? %>
-<%= l(:label_activities) %>
-
-
-          <%= l(:label_user_message) %>
-          (<%= @user_journal_messages.count %>)
-
-        <% @user_journal_messages.each do |user_journal_message|%>
-           ▪
-
-              <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value)
-
-                            %>
-              <%= l(:label_show_your_message) %>
-
-              <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'), feedback_url(@user,:token => @token.value)
-
-
-              %>
-             <%= format_time(user_journal_message.created_on) %>
-
-        <% end %>
-
-
+    <%= l(:label_activities) %>
+    <%= l(:label_user_message) %>
+    (<%= @user_journal_messages.count %>)
+    <% @user_journal_messages.each do |user_journal_message|%>
+        ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value)%>
+        <%= l(:label_show_your_message) %>
+        <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %>
+        <%= format_time(user_journal_message.created_on) %>
+    <% end %>
 <% end %>
+
 <% if @forums.first || @memos.first %>
     <%= l(:lable_bar_active) %>
-      <% unless @forums.first.nil? %>
-
-              <%= l(:label_user_forum) %>
-
-
-            <% @forums.each do |forum|%>
-                ▪
-
-                  <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
-                  <%= l(:label_forum_new) %>
-
-                  <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value)
-                             %>
-                  <%= format_time(forum.created_at) %>
-
-            <% end %>
-
-          <!-- 新建贴吧 end-->
-      <% end %>
-      <% unless @memos.first.nil? %>
-
-              <%= l(:label_user_message_forum) %>
-
-
-            <% @memos.each do |memo|%>
-                ▪
-
-                  <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
-                  <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
-
-                  <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))
-                              %>
-                  <%= format_time(memo.created_at) %>
-
-            <% end %>
-
-
-         <!-- 新建贴吧 end-->
-      <% end %>
+    <% unless @forums.first.nil? %>
+        <%= l(:label_user_forum) %>
+        <% @forums.each do |forum|%>
+            ▪<%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
+            <%= l(:label_forum_new) %>
+            <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %>
+            <%= format_time(forum.created_at) %>
+        <% end %>
+        <!-- 新建贴吧 end-->
+    <% end %>
+    <% unless @memos.first.nil? %>
+        <%= l(:label_user_message_forum) %>
+        <% @memos.each do |memo|%>
+            ▪<%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
+            <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
+            <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%>
+            <%= format_time(memo.created_at) %>
+        <% end %>
+     <!-- 新建贴吧 end-->
+    <% end %>
     <!--贴吧动态 end-->
 <% end %>
 
 <% [: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 %>
-    <%= l(mail_option) %>
-  <% 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 %>
+    <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
+        <%= l(mail_option) %>
+    <% 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 %>

From 6cfc5d6a5d68434db36bc5b13d5ec2ebb1ef672e Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 12:01:06 +0800
Subject: [PATCH 22/46] ...

---
 app/views/boards/_form_course.html.erb  |  2 +-
 app/views/boards/_form_project.html.erb | 18 +++++++++---------
 app/views/boards/show.html.erb          | 12 +++++-------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/views/boards/_form_course.html.erb b/app/views/boards/_form_course.html.erb
index 65e750b57..423434b1b 100644
--- a/app/views/boards/_form_course.html.erb
+++ b/app/views/boards/_form_course.html.erb
@@ -39,7 +39,7 @@
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
   <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
-  <div class="content">
+  <div class="content <%= replying ? '':'ml55' %>">
     <% if replying%>
 
         <%= f.text_area :content,
diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index 525869901..a6c8d405e 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -1,13 +1,13 @@
 <style>
-    .comment{
-        position: relative;
-        width: 330px;
-        padding: 10px;
-    }
-    .comment .ke-toolbar{
-        position: absolute;
-        bottom: -18px;
-    }
+    /*.comment{*/
+        /*position: relative;*/
+        /*width: 330px;*/
+        /*padding: 10px;*/
+    /*}*/
+    /*.comment .ke-toolbar{*/
+        /*position: absolute;*/
+        /*bottom: -18px;*/
+    /*}*/
 
 </style>
 <%= error_messages_for 'message' %>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index fc18b00e8..10383ff00 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,5 +1,5 @@
 <style type="text/css">
-    /*div.talk_new .ke-container{margin-left:2px;}*/
+    div.talk_new .ke-container{margin-left:2px;}
     /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
     span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
@@ -135,12 +135,10 @@ function nh_init_board(params){
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
                 },
                 afterCreate:function(){
-                  //var userAgent = navigator.userAgent.toLowerCase();
-                  //if(/trident/.test(userAgent)){
-                    //$("div.talk_new .ke-container").css({'margin-left':'55px'});
-                  //}else if(/chrome/.test(userAgent)){
-                    //$("div.talk_new .ke-container").css({'margin-left':'57px'});
-                  //}
+                  var userAgent = navigator.userAgent.toLowerCase();
+                  if(/trident/.test(userAgent)){
+                    $("div.talk_new .ke-container").css({'margin-left':'0px'});
+                  }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);

From 4e1cf3e16d838928b146a3539850d769a2b4c5bf Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 12:04:14 +0800
Subject: [PATCH 23/46] ...

---
 public/assets/kindeditor/kindeditor.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index b2c13c3f7..1695b10f7 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -5620,8 +5620,9 @@ _plugin('core', function(K) {
         afterUpload : function(data) {
             if (data.error === 0) {
                 var url = K.formatUrl(data.url, 'absolute');
-                //self.exec('insertimage', url, 'image','','','1','left');
-                self.insertHtml('<img src="'+url+'"/>');
+                self.exec('insertimage', url, 'image','','','1','');
+				//self.exec('insertimage', url, 'image','','','1','left');
+                //self.insertHtml('<img src="'+url+'"/>');
                 var asset_id  = data.asset_id;
                 if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) {
                     parent.document.getElementById('asset_id').value += asset_id.toString();

From 9606ce1caaceec7914a869e83f94cdf180f3cc9e Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 13:35:11 +0800
Subject: [PATCH 24/46] =?UTF-8?q?bug#2846:=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=89=93=E5=BC=80=E8=A1=A8=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9B=B8=E5=85=B3=E8=A1=A8=E6=83=85=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=B9=E5=87=BA=E7=9A=84=E8=A1=A8=E6=83=85=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/emoticons/emoticons.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/assets/kindeditor/plugins/emoticons/emoticons.js b/public/assets/kindeditor/plugins/emoticons/emoticons.js
index a9900668b..c89e0c6ee 100644
--- a/public/assets/kindeditor/plugins/emoticons/emoticons.js
+++ b/public/assets/kindeditor/plugins/emoticons/emoticons.js
@@ -13,6 +13,7 @@ KindEditor.plugin('emoticons', function(K) {
 		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
 		currentPageNum = 1;
 	self.clickToolbar(name, function() {
+		this.edit.focus();//���û����� �����ȡ�������� ����_getSel()Ϊ�� ���� 
 		var rows = 5, cols = 9, total = 135, startNum = 0,
 			cells = rows * cols, pages = Math.ceil(total / cells),
 			colsHalf = Math.floor(cols / 2),

From e1b059b3d26722bbf5b3fcbaccd9f11ac71b6391 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 16 Jun 2015 14:57:35 +0800
Subject: [PATCH 25/46] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B7=BB=E5=8A=A0=E5=88=B0=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=8C=89=E5=A4=A9=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                          |  7 ++++-
 .../mailer/send_for_user_activities.html.erb  | 31 +++++++++++++++++++
 .../mailer/send_for_user_activities.text.erb  | 12 +++++++
 config/locales/projects/en.yml                |  4 ++-
 config/locales/projects/zh.yml                |  4 ++-
 5 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 8b8ed7d73..729da17c3 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -127,6 +127,11 @@ class Mailer < ActionMailer::Base
 
       end
     end
+
+    # 项目附件
+    @project_attachments = Attachment.find_by_sql("select DISTINCT a.* from members m, attachments a
+     where a.container_id = m.project_id and m.user_id='#{user.id}' and container_type = 'Project' and (a.created_on between '#{date_from}' and '#{date_to}') order by a.created_on desc")
+
     # user 提交的作业
     # @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc")
 
@@ -194,7 +199,7 @@ class Mailer < ActionMailer::Base
     @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,@issues_journals,@course_messages,@project_messages,@course_news,@course_news_comments,@project_news,@project_news_comments,
+    has_content = [@issues,@issues_journals,@course_messages,@project_messages,@course_news,@course_news_comments,@project_news,@project_news_comments,@project_attachments,
                    @course_journal_messages,@user_journal_messages,@project_journal_messages,@forums,@memos,@attachments,@bids,@wiki_contents].any? {|o| !o.empty?}
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 70dab08f0..324e20cb3 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -382,6 +382,37 @@
           </ul><!-- 项目新闻回复end -->
       <% end %>
 
+      <!-- 项目上传资源 -->
+      <% unless @project_attachments.first.nil? %>
+        <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
+            <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_project_mail_attachments) %>
+            </span>
+          <% @project_attachments.each do |project_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:#666; font-weight:bold; float:left;">[</span>
+
+                <%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value),
+                            :class=> "wmail_column",
+                            :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
+
+                <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value), :class => "wmail_name",
+                            :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_upload) %></span>
+
+                <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project,:token => @token.value),
+                            :class => 'wmail_info',
+                            :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                %>
+                <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(project_attachment.created_on) %></span>
+              </li>
+          <% end %>
+          <div class="cl"></div>
+        </ul><!-- 项目上传资源  end-->
+      <% end %>
+
       <!--项目留言-->
       <% unless @project_journal_messages.first.nil? %>
           <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
index 43a4dbe9e..bcafb896f 100644
--- a/app/views/mailer/send_for_user_activities.text.erb
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -168,6 +168,18 @@
         <!-- 项目新闻回复end -->
     <% end %>
 
+    <!-- 项目上传资源 -->
+    <% unless @project_attachments.first.nil? %>
+        <%= l(:label_project_mail_attachments) %>
+         <% @project_attachments.each do |project_attachment|%>
+              ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value) %>]
+              <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value) %>
+              <%= l(:label_project_mail_upload) %>
+              <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project,:token => @token.value) %>
+              <%= format_time(project_attachment.created_on) %>
+          <% end %> <!-- 项目上传资源  end-->
+    <% end %>
+
     <!--项目留言-->
     <% unless @project_journal_messages.first.nil? %>
         <%= l(:label_project_mail_feedback) %>
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index 57ef221b0..b142c6ca8 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -41,7 +41,9 @@ en:
   lable_sure_exit_project: "Are you sure exit from the projcet"  
   
   label_member: "Members"
-  project_module_attachments: "Resources"  
+  project_module_attachments: "Resources"
+   label_project_mail_attachments: Project Resources
+    label_project_mail_upload: had uploaded project resources
 
   label_invite: Invitation
   label_invite_new_user: "Send email to invite new user"
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 42eea8dcc..5bf8957bf 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -62,7 +62,9 @@ zh:
   label_development_team: 开发模式
 
   label_member: 成员
-  project_module_attachments: 资源  
+  project_module_attachments: 资源
+  label_project_mail_attachments: 项目资源
+  label_project_mail_upload: 上传了资源
 
   label_invite: 邀请
   

From 41fb1255a91b63546243ec1ab85e2220988b22b2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 16 Jun 2015 15:36:03 +0800
Subject: [PATCH 26/46] =?UTF-8?q?=E6=89=80=E6=9C=89=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E9=80=9A=E7=9F=A5=E9=82=AE=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/mailer/attachments_added.html.erb       | 15 ++++++++++++---
 app/views/mailer/attachments_added.text.erb       | 12 +++++++++++-
 .../mailer/send_for_user_activities.html.erb      |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/views/mailer/attachments_added.html.erb b/app/views/mailer/attachments_added.html.erb
index 11d1cf54c..32d0ab0ea 100644
--- a/app/views/mailer/attachments_added.html.erb
+++ b/app/views/mailer/attachments_added.html.erb
@@ -1,5 +1,14 @@
 <%= link_to h(@added_to), @added_to_url %><br />
 
-<ul><% @attachments.each do |attachment | %>
-<li><%=h attachment.filename %></li>
-<% end %></ul>
+<ul>
+  <% @attachments.each do |attachment | %>
+      <li>
+        <%= link_to attachment.author, user_activities_url(attachment.author),
+        :style => "color:#1B55A7; float:left;display:block; margin-right:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+        <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_upload) %></span>
+        <%= link_to truncate(attachment.filename,length: 30,omission: '...'), project_files_url(attachment.project),
+        :style => "color:#1B55A7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+       %>
+      </li>
+  <% end %>
+</ul>
diff --git a/app/views/mailer/attachments_added.text.erb b/app/views/mailer/attachments_added.text.erb
index 28cb8285e..c271c0024 100644
--- a/app/views/mailer/attachments_added.text.erb
+++ b/app/views/mailer/attachments_added.text.erb
@@ -1,4 +1,14 @@
 <%= @added_to %><% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
+- <%= attachment.author %> <%= l(:label_project_mail_upload) %> <%=h attachment.filename %><% end %>
 
 <%= @added_to_url %>
+
+
+<%= link_to h(@added_to), @added_to_url %>
+
+<% @attachments.each do |attachment | %>
+    <%= link_to attachment.author, user_activities_url(attachment.author) %>
+    <%= l(:label_project_mail_upload) %>
+    <%= link_to truncate(attachment.filename,length: 30,omission: '...'), project_files_url(attachment.project) %>
+<% end %>
+
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 324e20cb3..63b256421 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -402,7 +402,7 @@
                             :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_upload) %></span>
 
-                <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project,:token => @token.value),
+                <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'), project_files_url(project_attachment.project,:token => @token.value),
                             :class => 'wmail_info',
                             :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>

From ed8a134a011332b8c54927c32c9167d0946a0408 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 16 Jun 2015 15:47:50 +0800
Subject: [PATCH 27/46] =?UTF-8?q?text=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/mailer/attachments_added.text.erb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/views/mailer/attachments_added.text.erb b/app/views/mailer/attachments_added.text.erb
index c271c0024..ce62c6341 100644
--- a/app/views/mailer/attachments_added.text.erb
+++ b/app/views/mailer/attachments_added.text.erb
@@ -1,9 +1,3 @@
-<%= @added_to %><% @attachments.each do |attachment | %>
-- <%= attachment.author %> <%= l(:label_project_mail_upload) %> <%=h attachment.filename %><% end %>
-
-<%= @added_to_url %>
-
-
 <%= link_to h(@added_to), @added_to_url %>
 
 <% @attachments.each do |attachment | %>

From 0f8061094d7c3619b4a15c322d108cba21901765 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 16:53:20 +0800
Subject: [PATCH 28/46] =?UTF-8?q?bug#2854:=E5=9C=A8=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=90=8C=E6=97=B6=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=B8=96=E5=AD=90=E5=92=8C=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=9A=84=E7=BC=96=E8=BE=91=E5=99=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E6=96=B0=E5=BB=BA=E5=B8=96=E5=AD=90=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E4=B8=AD=E8=B4=B4=E5=9B=BE=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=B8=AA=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=AD?=
 =?UTF-8?q?=E5=8D=B4=E6=98=BE=E7=A4=BA=E5=A4=9A=E4=B8=AA=E8=B4=B4=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/paste/paste.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/assets/kindeditor/plugins/paste/paste.js b/public/assets/kindeditor/plugins/paste/paste.js
index f2d080dcf..943c0bbe7 100644
--- a/public/assets/kindeditor/plugins/paste/paste.js
+++ b/public/assets/kindeditor/plugins/paste/paste.js
@@ -293,7 +293,13 @@ https://github.com/layerssss/paste.js
 KindEditor.plugin('paste', function(K) {
     var editor = this,
         name = 'paste';
-    var contentWindow = document.getElementsByTagName('iframe')[0].contentWindow;
+    //����ò�ƶ�༭���Ͳ����ͻ��
+    if(editor.edit == undefined || editor.edit.iframe == undefined){
+        return;
+    }
+    var contentWindow = editor.edit.iframe[0].contentWindow;
+    //var contentWindow = editor.iframeDoc;
+    //var contentWindow = document.getElementsByTagName('iframe')[0].contentWindow;
     var nodeBody = contentWindow.document.getElementsByTagName('body')[0];
     console.log(nodeBody);
     $(nodeBody).pastableContenteditable();

From 742506f52b8fd000f8d4160ed50e9ed8c523cd95 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 16 Jun 2015 21:13:40 +0800
Subject: [PATCH 29/46] =?UTF-8?q?IE8=E4=B8=8D=E8=83=BD=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb |   6 +-
 app/views/student_work/edit.html.erb  |   4 +-
 config/settings.yml                   |   6 +
 public/javascripts/attachments.js     | 257 +++++++++++++++++---------
 4 files changed, 181 insertions(+), 92 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 20b855fd8..9ce107f8b 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -219,7 +219,7 @@ class WelcomeController < ApplicationController
   # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法
   def entry_select
     url = request.original_url.gsub('/','')
-    if url.include?(Setting.host_course.gsub('/',''))
+    if url.include?(Setting.url_course.gsub('/',''))
       if @first_page.show_course == 1
         course
         render :course
@@ -228,7 +228,7 @@ class WelcomeController < ApplicationController
       end
 
       return 0
-    elsif url.include?(Setting.host_contest.gsub('/',''))
+    elsif url.include?(Setting.url_contest.gsub('/',''))
       if @first_page.show_contest == 1
         contest
         render :contest
@@ -237,7 +237,7 @@ class WelcomeController < ApplicationController
       end
 
       return 0
-    elsif url.include?(Setting.host_user.gsub('/',''))
+    elsif url.include?(Setting.url_user.gsub('/',''))
       #redirect_to(:controller => "users", :action => "index")
     end
       
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index f63c1792b..dfa995f47 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -12,7 +12,7 @@
   <!--</div>-->
   <div class="hwork_ctt">
     <div class="hwork_dis" id="tbc_01">
-      <%= labelled_form_for @work do |f|%>
+      <%= labelled_form_for @work,:html => { :multipart => true }  do |f|%>
       <div class="N_con">
         <p>
           <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
@@ -57,4 +57,4 @@
   </div>
 </div>
 </div><!--新建作业结束-->
-<div class="cl"></div>
\ No newline at end of file
+<div class="cl"></div>
diff --git a/config/settings.yml b/config/settings.yml
index cf98025e0..f952e23bf 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -89,6 +89,12 @@ host_user:
    default: user.trustie.net
 host_repository:
   default: repository.trustie.net
+url_course:
+  default: course.trustie.net
+url_contest:
+  default: contest.trustie.net
+url_user:
+   default: user.trustie.net
 protocol:
   default: http
 feeds_limit:
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 3df755a7f..9c32e41dc 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -1,8 +1,7 @@
 /* Redmine - project management software
  Copyright (C) 2006-2013  Jean-Philippe Lang */
 
-function postUpMsg(attachmentId)
-{
+function postUpMsg(attachmentId) {
     $.ajax({
         url: '/attachments/renderTag',
         type: "GET",
@@ -30,28 +29,57 @@ function addFile_board(inputEl, file, eagerUpload, id) {
         deleteallfiles = $(inputEl).data('deleteAllFiles');
         var attachmentId = addFile.nextAttachmentId++;
 
-        var fileSpan = $('<span>', { 'id': 'attachments_' + attachmentId, 'class':'attachment' });
+        var fileSpan = $('<span>', {
+            'id': 'attachments_' + attachmentId,
+            'class': 'attachment'
+        });
 
         fileSpan.append(
-            $('<input>', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
-            $('<input>', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload),
-            $('<span >'+$(inputEl).data('fieldIsPublic')+':</span>').attr({  'class': 'ispublic-label' }) ,
-            $('<input>', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload),
-            $('<a>&nbsp</a>').attr({ 'href': "#", 'class': 'remove-upload', 'data-containerid':id }).click(function(){
-                if(confirm($(inputEl).data('areYouSure'))){
+            $('<input>', {
+                'type': 'text',
+                'class': 'filename readonly',
+                'name': 'attachments[' + attachmentId + '][filename]',
+                'readonly': 'readonly'
+            }).val(file.name),
+            $('<input>', {
+                'type': 'text',
+                'class': 'description',
+                'name': 'attachments[' + attachmentId + '][description]',
+                'maxlength': 254,
+                'placeholder': $(inputEl).data('descriptionPlaceholder')
+            }).toggle(!eagerUpload),
+            $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
+                'class': 'ispublic-label'
+            }),
+            $('<input>', {
+                'type': 'checkbox',
+                'class': 'is_public_checkbox',
+                'value': 1,
+                'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
+                checked: 'checked'
+            }).toggle(!eagerUpload),
+            $('<a>&nbsp</a>').attr({
+                'href': "#",
+                'class': 'remove-upload',
+                'data-containerid': id
+            }).click(function() {
+                if (confirm($(inputEl).data('areYouSure'))) {
                     removeFile();
-                    if(!eagerUpload){
-                        (function(e){
+                    if (!eagerUpload) {
+                        (function(e) {
                             reload(e);
                         })(fileSpan);
                     }
                 }
 
             }).toggle(!eagerUpload),
-            $('<div>', {  'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
+            $('<div>', {
+                'class': 'div_attachments',
+                'name': 'div_' + 'attachments_' + attachmentId
+            })
         ).appendTo(attachments_frame);
 
-        if(eagerUpload) {
+        if (eagerUpload) {
             ajaxUpload(file, attachmentId, fileSpan, inputEl);
 
         }
@@ -59,6 +87,7 @@ function addFile_board(inputEl, file, eagerUpload, id) {
     }
     return null;
 }
+
 function addFile(inputEl, file, eagerUpload) {
 
     var attachments_frame = '#attachments_fields';
@@ -66,28 +95,56 @@ function addFile(inputEl, file, eagerUpload) {
         deleteallfiles = $(inputEl).data('deleteAllFiles');
         var attachmentId = addFile.nextAttachmentId++;
 
-        var fileSpan = $('<span>', { 'id': 'attachments_' + attachmentId, 'class':'attachment' });
+        var fileSpan = $('<span>', {
+            'id': 'attachments_' + attachmentId,
+            'class': 'attachment'
+        });
 
         fileSpan.append(
-            $('<input>', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
-            $('<input>', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload),
-            $('<span >'+$(inputEl).data('fieldIsPublic')+':</span>').attr({  'class': 'ispublic-label' }) ,
-            $('<input>', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload),
-            $('<a>&nbsp</a>').attr({ 'href': "#", 'class': 'remove-upload' }).click(function(){
-                if(confirm($(inputEl).data('areYouSure'))){
+            $('<input>', {
+                'type': 'text',
+                'class': 'filename readonly',
+                'name': 'attachments[' + attachmentId + '][filename]',
+                'readonly': 'readonly'
+            }).val(file.name),
+            $('<input>', {
+                'type': 'text',
+                'class': 'description',
+                'name': 'attachments[' + attachmentId + '][description]',
+                'maxlength': 254,
+                'placeholder': $(inputEl).data('descriptionPlaceholder')
+            }).toggle(!eagerUpload),
+            $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
+                'class': 'ispublic-label'
+            }),
+            $('<input>', {
+                'type': 'checkbox',
+                'class': 'is_public_checkbox',
+                'value': 1,
+                'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
+                checked: 'checked'
+            }).toggle(!eagerUpload),
+            $('<a>&nbsp</a>').attr({
+                'href': "#",
+                'class': 'remove-upload'
+            }).click(function() {
+                if (confirm($(inputEl).data('areYouSure'))) {
                     removeFile();
-                    if(!eagerUpload){
-                        (function(e){
+                    if (!eagerUpload) {
+                        (function(e) {
                             reload(e);
                         })(fileSpan);
                     }
                 }
 
             }).toggle(!eagerUpload),
-            $('<div>', {  'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
+            $('<div>', {
+                'class': 'div_attachments',
+                'name': 'div_' + 'attachments_' + attachmentId
+            })
         ).appendTo('#attachments_fields');
 
-        if(eagerUpload) {
+        if (eagerUpload) {
             ajaxUpload(file, attachmentId, fileSpan, inputEl);
 
         }
@@ -106,8 +163,8 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
     }
 
     function onProgress(e) {
-        if(e.lengthComputable) {
-            this.progressbar( 'value', e.loaded * 100 / e.total );
+        if (e.lengthComputable) {
+            this.progressbar('value', e.loaded * 100 / e.total);
         }
     }
 
@@ -116,18 +173,17 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
         ajaxUpload.uploading++;
 
         uploadBlob(file, $(inputEl).data('upload-path'), attachmentId, {
-            loadstartEventHandler: onLoadstart.bind(progressSpan),
-            progressEventHandler: onProgress.bind(progressSpan)
-        })
+                loadstartEventHandler: onLoadstart.bind(progressSpan),
+                progressEventHandler: onProgress.bind(progressSpan)
+            })
             .done(function(result) {
-                progressSpan.progressbar( 'value', 100 ).remove();
+                progressSpan.progressbar('value', 100).remove();
                 fileSpan.find('input.description, a').css('display', 'inline-block');
                 fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block');
             })
             .fail(function(result) {
                 progressSpan.text(result.statusText);
-                if($("#network_issue"))
-                {
+                if ($("#network_issue")) {
                     $("#network_issue").show();
                 }
             }).always(function() {
@@ -143,33 +199,37 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
         //gcm files count and add delete_all link
 
         //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  start
-        var containerid=$(inputEl).data('containerid');
-        if(containerid==undefined){
-            var count=$('#attachments_fields>span').length;
-            $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+$(inputEl).data('fileCount'));
-            if(count>=1){
-                var add_attachs=$('.add_attachment');
-                var delete_all=$('.remove_all');
-                if(delete_all.length<1){
-                    add_attachs.append($("<a>&nbsp</a>").attr({"href":"javascript:void(0)", 'class': 'remove_all',"onclick": "removeAll()"}));
+        var containerid = $(inputEl).data('containerid');
+        if (containerid == undefined) {
+            var count = $('#attachments_fields>span').length;
+            $('#upload_file_count').html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
+            if (count >= 1) {
+                var add_attachs = $('.add_attachment');
+                var delete_all = $('.remove_all');
+                if (delete_all.length < 1) {
+                    add_attachs.append($("<a>&nbsp</a>").attr({
+                        "href": "javascript:void(0)",
+                        'class': 'remove_all',
+                        "onclick": "removeAll()"
+                    }));
                 }
             }
-        }else{
-            var count=$('#attachments_fields'+containerid+'>span').length;
-            $('#upload_file_count'+containerid).html("<span id=\"count\">"+count+"</span>"+$(inputEl).data('fileCount'));
-            if(count>=1){
-                var add_attachs=$('.add_attachment').filter(function(index){
-                    return $(this).data('containerid')==containerid;
+        } else {
+            var count = $('#attachments_fields' + containerid + '>span').length;
+            $('#upload_file_count' + containerid).html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
+            if (count >= 1) {
+                var add_attachs = $('.add_attachment').filter(function(index) {
+                    return $(this).data('containerid') == containerid;
                 });
-                var delete_all=$('.remove_all').filter(function(index){
-                    return $(this).data('containerid')==containerid;
+                var delete_all = $('.remove_all').filter(function(index) {
+                    return $(this).data('containerid') == containerid;
                 });
-                if(delete_all.length<1){
+                if (delete_all.length < 1) {
                     add_attachs.append($("<a>&nbsp</a>").attr({
-                        "href":"javascript:void(0)",
+                        "href": "javascript:void(0)",
                         'class': 'remove_all',
                         'data-containerid': containerid,
-                        "onclick": "removeAll('"+containerid+"')"
+                        "onclick": "removeAll('" + containerid + "')"
                     }));
                 }
             }
@@ -186,7 +246,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
 
     var maxSyncUpload = $(inputEl).data('max-concurrent-uploads');
 
-    if(maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload)
+    if (maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload)
         actualUpload(file, attachmentId, fileSpan, inputEl);
     else
         $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl));
@@ -201,23 +261,23 @@ function removeFile() {
 
 //gcm delete all file
 //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  start
-function removeAll(containerid){
-    if(confirm(deleteallfiles)){
-        if(containerid==undefined){
-            $(".remove-upload").removeAttr("data-confirm");
-            $(".remove-upload").click();
-        }else{
-            var arr = $(".remove-upload").filter(function(){
-                return $(this).data('containerid')==containerid;
-            });
-            arr.removeAttr("data-confirm");
-            arr.click();
+function removeAll(containerid) {
+        if (confirm(deleteallfiles)) {
+            if (containerid == undefined) {
+                $(".remove-upload").removeAttr("data-confirm");
+                $(".remove-upload").click();
+            } else {
+                var arr = $(".remove-upload").filter(function() {
+                    return $(this).data('containerid') == containerid;
+                });
+                arr.removeAttr("data-confirm");
+                arr.click();
+            }
         }
+        //	return false;
     }
-//	return false;
-}
-//modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  end
-//gcm
+    //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  end
+    //gcm
 
 function uploadBlob(blob, uploadUrl, attachmentId, options) {
 
@@ -225,9 +285,9 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
         loadstartEventHandler: $.noop,
         progressEventHandler: $.noop
     }, options);
-    if(uploadUrl.indexOf('?') > 0){
+    if (uploadUrl.indexOf('?') > 0) {
         uploadUrl = uploadUrl + '&attachment_id=' + attachmentId;
-    }else{
+    } else {
         uploadUrl = uploadUrl + '?attachment_id=' + attachmentId;
     }
     if (blob instanceof window.File) {
@@ -254,7 +314,6 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
 
 function addInputFiles(inputEl) {
     // var clearedFileInput = $(inputEl).clone().val('');
-
     if (inputEl.files) {
         // upload files using ajax
         uploadAndAttachFiles(inputEl.files, inputEl);
@@ -263,15 +322,22 @@ function addInputFiles(inputEl) {
         // browser not supporting the file API, upload on form submission
         var attachmentId;
         var aFilename = inputEl.value.split(/\/|\\/);
-        attachmentId = addFile(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false);
+        var count = $('#attachments_fields>span').length;
+        attachmentId = addFile(inputEl, {
+            name: aFilename[aFilename.length - 1]
+        }, false);
         if (attachmentId) {
-            $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]'}).hide();
-            $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+$(inputEl).data('fileCount'));
+            $(inputEl).attr({
+                name: 'attachments[' + attachmentId + '][file]'
+            }).hide();
+            if (count <= 0) count = 1;
+            $('#upload_file_count').html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
         }
     }
 
     //clearedFileInput.insertAfter('#attachments_fields');
 }
+
 function addInputFiles_board(inputEl, id) {
     // var clearedFileInput = $(inputEl).clone().val('');
 
@@ -283,15 +349,20 @@ function addInputFiles_board(inputEl, id) {
         // browser not supporting the file API, upload on form submission
         var attachmentId;
         var aFilename = inputEl.value.split(/\/|\\/);
-        attachmentId = addFile_board(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false, id);
+        attachmentId = addFile_board(inputEl, {
+            name: aFilename[aFilename.length - 1]
+        }, false, id);
         if (attachmentId) {
-            $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]'}).hide();
-            $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+$(inputEl).data('fileCount'));
+            $(inputEl).attr({
+                name: 'attachments[' + attachmentId + '][file]'
+            }).hide();
+            $('#upload_file_count').html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
         }
     }
 
     //clearedFileInput.insertAfter('#attachments_fields');
 }
+
 function uploadAndAttachFiles(files, inputEl) {
 
     var maxFileSize = $(inputEl).data('max-file-size');
@@ -299,14 +370,19 @@ function uploadAndAttachFiles(files, inputEl) {
 
     var sizeExceeded = false;
     $.each(files, function() {
-        if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {sizeExceeded=true;}
+        if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {
+            sizeExceeded = true;
+        }
     });
     if (sizeExceeded) {
         window.alert(maxFileSizeExceeded);
     } else {
-        $.each(files, function() {addFile(inputEl, this, true);});
+        $.each(files, function() {
+            addFile(inputEl, this, true);
+        });
     }
 }
+
 function uploadAndAttachFiles_board(files, inputEl, id) {
 
     var maxFileSize = $(inputEl).data('max-file-size');
@@ -314,14 +390,19 @@ function uploadAndAttachFiles_board(files, inputEl, id) {
 
     var sizeExceeded = false;
     $.each(files, function() {
-        if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {sizeExceeded=true;}
+        if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {
+            sizeExceeded = true;
+        }
     });
     if (sizeExceeded) {
         window.alert(maxFileSizeExceeded);
     } else {
-        $.each(files, function() {addFile_board(inputEl, this, true, id);});
+        $.each(files, function() {
+            addFile_board(inputEl, this, true, id);
+        });
     }
 }
+
 function handleFileDropEvent(e) {
 
     $(this).removeClass('fileover');
@@ -345,7 +426,9 @@ function dragOutHandler(e) {
 function setupFileDrop() {
     if (window.File && window.FileList && window.ProgressEvent && window.FormData) {
 
-        $.event.fixHooks.drop = { props: [ 'dataTransfer' ] };
+        $.event.fixHooks.drop = {
+            props: ['dataTransfer']
+        };
 
         $('form div.box').has('input:file').each(function() {
             $(this).on({
@@ -358,18 +441,18 @@ function setupFileDrop() {
 }
 
 $(document).ready(setupFileDrop);
-$(function(){
+$(function() {
     $(".file_selector").each(function() {
         deleteallfiles = $(this).data('deleteAllFiles');
         var containerid = $(this).data('containerid');
-        if (containerid == undefined)containerid = '';
+        if (containerid == undefined) containerid = '';
         var count = $('#attachments_fields' + containerid + '>span').length;
         if (count >= 1) {
             $('#upload_file_count' + containerid).html("<span id=\"count\">" + count + "</span>" + $(this).data('fileCount'));
-            var add_attachs = $('.add_attachment').filter(function (index) {
+            var add_attachs = $('.add_attachment').filter(function(index) {
                 return $(this).data('containerid') == containerid;
             });
-            var delete_all = $('.remove_all').filter(function (index) {
+            var delete_all = $('.remove_all').filter(function(index) {
                 return $(this).data('containerid') == containerid;
             });
             if (delete_all.length < 1) {
@@ -383,4 +466,4 @@ $(function(){
 
         }
     });
-});
\ No newline at end of file
+});

From 3b3b8661c88689ed7ceb5678fe7dee9fdc64b158 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Wed, 17 Jun 2015 15:42:52 +0800
Subject: [PATCH 30/46] =?UTF-8?q?bug#2827:IE=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=EF=BC=9A=E8=AE=A8=E8=AE=BA=E5=8C=BA=EF=BC=9A=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=97=B6=EF=BC=8C=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/show.html.erb             | 1 +
 app/views/courses/_courses_jours.html.erb  | 1 +
 app/views/projects/_project_jours.html.erb | 1 +
 app/views/users/_user_jours.html.erb       | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 10383ff00..452ad81e3 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -123,6 +123,7 @@ function nh_check_field(params){
 function nh_init_board(params){
     //发帖/编辑/回复按钮的click
     params.showbtn.click(function(){
+        params.textarea.removeAttr('placeholder');
         if(params.textarea.data('init') == undefined){
             //初始化编辑器
             var editor = params.kindutil.create(params.textarea, {
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index 2cb22ce89..5813fc807 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -56,6 +56,7 @@
   $(function(){
 
     function init_editor(params){
+      params.textarea.removeAttr('placeholder');
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
         items:['emoticons'],
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 353223acd..1a7d3c5d5 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -45,6 +45,7 @@
   $(function(){
 
     function init_editor(params){
+      params.textarea.removeAttr('placeholder');
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
         items:['emoticons'],
diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb
index ee8d14841..c74f68a24 100644
--- a/app/views/users/_user_jours.html.erb
+++ b/app/views/users/_user_jours.html.erb
@@ -69,6 +69,7 @@
   $(function(){
 
     function init_editor(params){
+      params.textarea.removeAttr('placeholder');
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
         items:['emoticons'],

From cf9455e465545034b87ffa8b5e8323e869c2483f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 17 Jun 2015 16:25:30 +0800
Subject: [PATCH 31/46] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B7=BB=E5=8A=A0=E5=88=B0=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 5 +++++
 app/models/mailer.rb                          | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 06bc1fd38..648108e47 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -3,6 +3,7 @@ class HomeworkCommonController < ApplicationController
   before_filter :find_course, :only => [:index,:new,:create]
   before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
   before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
+  after_create :send_mail
 
   def index
     homeworks = @course.homework_commons.order("created_at desc")
@@ -183,6 +184,10 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  def send_mail
+    Mailer.run.homework_added(self)
+  end
+
   private
   #获取课程
   def find_course
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 729da17c3..8d027da12 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -517,6 +517,15 @@ class Mailer < ActionMailer::Base
     end
   end
 
+  # Builds a Mail::Message object used to email recipients of a course when an homework are posted.
+  #
+  # Example:
+  #   attachments_added(attachments) => Mail::Message object
+  #   Mailer.attachments_added(attachments).deliver => sends an email to the project's recipients
+  def homework_added
+
+  end
+
   # Builds a Mail::Message object used to email recipients of a news' project when a news item is added.
   #
   # Example:

From d793a8119ad23f6d6beeb97f3628b17455090d2a Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 17 Jun 2015 17:01:03 +0800
Subject: [PATCH 32/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B2=98=E5=9B=BE?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A0=E8=BD=BD=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/edit.html.erb                  |   4 +-
 app/views/boards/show.html.erb                |   4 +-
 app/views/courses/_courses_jours.html.erb     |   4 +-
 app/views/forums/edit.html.erb                |   2 +-
 app/views/forums/new.html.erb                 |   2 +-
 app/views/homework_common/edit.html.erb       |   4 +-
 app/views/homework_common/new.html.erb        |   4 +-
 app/views/issues/new.html.erb                 |   2 +-
 app/views/issues/show.html.erb                |   2 +-
 app/views/layouts/base_forums.html.erb        |   2 +-
 app/views/memos/edit.html.erb                 |   2 +-
 app/views/memos/new.html.erb                  |   2 +-
 app/views/memos/show.html.erb                 |   2 +-
 app/views/messages/_form_course.html.erb      |   2 +-
 app/views/news/_course_form.html.erb          |   4 +-
 app/views/news/_course_show.html.erb          |   4 +-
 app/views/news/_project_form.html.erb         |   4 +-
 app/views/news/edit.html.erb                  |   4 +-
 app/views/projects/_project_jours.html.erb    |   4 +-
 app/views/users/_user_jours.html.erb          |   2 +-
 .../lib/rails_kindeditor/helper.rb            |   7 +-
 public/assets/kindeditor/kindeditor.js        |   3 +
 public/assets/kindeditor/pasteimg.js          | 385 ++++++++++++++++++
 23 files changed, 422 insertions(+), 33 deletions(-)
 create mode 100644 public/assets/kindeditor/pasteimg.js

diff --git a/app/views/bids/edit.html.erb b/app/views/bids/edit.html.erb
index 37121d720..da3d19267 100644
--- a/app/views/bids/edit.html.erb
+++ b/app/views/bids/edit.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
 <%= labelled_form_for @bid,:html => { :multipart => true } do |f| %>
     <%= render :partial => 'new_homework_form', :locals => { :bid => @bid, :bid_id => "edit_bid_#{@bid.id}",:f=>f,:edit_mode => true} %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 10383ff00..b49b4a960 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -34,7 +34,7 @@
     else if (window.attachEvent)
         window.attachEvent("onload", buildsubmenus)
 </script>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
 
 <% if @project %>
@@ -227,4 +227,4 @@ function nh_init_board(params){
 }
 
 
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index 2cb22ce89..03adc2fd7 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -11,7 +11,7 @@
   div.recall_con{width:570px;}
   div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="msg_box fl" id='leave-message' nhname="new_message">
   <%# reply_allow = JournalsForMessage.create_by_user? User.current %>
   <h4><%= l(:label_leave_message) %></h4>
@@ -207,4 +207,4 @@
       });
     });
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb
index 9fe72fdb7..0a40120c7 100644
--- a/app/views/forums/edit.html.erb
+++ b/app/views/forums/edit.html.erb
@@ -1,4 +1,4 @@
 <!-- added by fq -->
 <h1>编辑讨论区</h1>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= render 'form_edit_mode' %>
diff --git a/app/views/forums/new.html.erb b/app/views/forums/new.html.erb
index 35814d843..9bce17416 100644
--- a/app/views/forums/new.html.erb
+++ b/app/views/forums/new.html.erb
@@ -5,7 +5,7 @@
 <% @nav_dispaly_forum_label = 1%>
 <!-- added by fq -->
 <h1 style="margin-top: 2%; margin-left: 49%"><%= l :label_forum_new %></h1>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= render 'form_create_mode' %>
 
 <%#= link_to l(:button_back), forums_path %>
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index f9d3f8b70..50feca946 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= error_messages_for 'homework_common' %>
 
 <div class="project_r_h">
@@ -13,4 +13,4 @@
       <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
   <% end%>
 </div><!--hwork_new end-->
-<div class="cl"></div>
\ No newline at end of file
+<div class="cl"></div>
diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb
index b0fdc5299..dc67b5079 100644
--- a/app/views/homework_common/new.html.erb
+++ b/app/views/homework_common/new.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= error_messages_for 'homework_common' %>
 
 <div class="project_r_h">
@@ -14,4 +14,4 @@
       <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
   <% end%>
 </div><!--hwork_new end-->
-<div class="cl"></div>
\ No newline at end of file
+<div class="cl"></div>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 77f3baf31..26aff7d61 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="project_r_h" xmlns="http://www.w3.org/1999/html">
   <h2 class="project_h2"><%= l(:label_issue_new) %></h2>
 </div>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 59ad0b1d2..1bd956074 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_issue_edit) %></h2>
 </div>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 4d79f50f9..fdeb609c8 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -12,7 +12,7 @@
 		<meta name="keywords" content="issue,bug,tracker" />
 		<%= csrf_meta_tag %>
 		<%= favicon %>
-        <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+        <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_heads %>
diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index b7aa08abd..6fc361d27 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -1,6 +1,6 @@
 <!-- <h1>New memo</h1> -->
 <% @replying = !@memo.parent.nil? %>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <h3><%=l(:label_memo_edit)%></h3>
 <%= labelled_form_for(@memo, :url => forum_memo_path(@memo.forum_id, @memo)) do |f|  %>
   <% if @memo.errors.any? %>
diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb
index 8a1863047..792c8d55a 100644
--- a/app/views/memos/new.html.erb
+++ b/app/views/memos/new.html.erb
@@ -4,7 +4,7 @@
    @nav_dispaly_main_contest_label = 1 %>
 <% @nav_dispaly_forum_label = 1%>
 <!-- <h1>New memo</h1> -->
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
     <div class="top-content">
         <table>
             <tr>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 05358c32a..55a2410b0 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -4,7 +4,7 @@
       margin-bottom: 13px;
   }
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="lz">
   <!-- 在这里添加赞和踩-->
   <span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span>
diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb
index 1161e9f8a..7952e4820 100644
--- a/app/views/messages/_form_course.html.erb
+++ b/app/views/messages/_form_course.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
 <% extra_option = replying ? { hidden: "hidden"} : { maxlength: 200 } %>
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index 1769c98f3..0a5488714 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <li>
     <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
     <input  type="text" name="news[title]" class="hwork_input" id="news_title" size="60" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
@@ -37,4 +37,4 @@
     <% end %>
     <div class="cl"></div>
   </li>
-  <!-- <#%= wikitoolbar_for 'news_description'%>-->
\ No newline at end of file
+  <!-- <#%= wikitoolbar_for 'news_description'%>-->
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 4d1242883..f39eb8266 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_course_news) %></h2>
 </div>
@@ -76,4 +76,4 @@
   <% end %>
 
 
-<% html_title @news.title -%>
\ No newline at end of file
+<% html_title @news.title -%>
diff --git a/app/views/news/_project_form.html.erb b/app/views/news/_project_form.html.erb
index b9698497d..dfe1fb937 100644
--- a/app/views/news/_project_form.html.erb
+++ b/app/views/news/_project_form.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <li>
   <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
   <input  type="text" name="news[title]" class="hwork_input_news" id="news_title" width="576px" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
@@ -33,4 +33,4 @@
   <% end %>
   <div class="cl"></div>
 </li>
-<!-- <#%= wikitoolbar_for 'news_description'%>-->
\ No newline at end of file
+<!-- <#%= wikitoolbar_for 'news_description'%>-->
diff --git a/app/views/news/edit.html.erb b/app/views/news/edit.html.erb
index 758976d1b..5fbae6f72 100644
--- a/app/views/news/edit.html.erb
+++ b/app/views/news/edit.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_course_news) %></h2>
 </div>
@@ -8,4 +8,4 @@
       <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
   <% end %>
   <div id="preview" class="wiki"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 353223acd..93974579f 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -11,7 +11,7 @@
   div.recall_con{width:570px;}
   div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="msg_box" id='leave-message' nhname='new_message' style="height:auto;">
   <% reply_allow = JournalsForMessage.create_by_user? User.current %>
   <h4><%= l(:label_user_response) %></h4>
@@ -196,4 +196,4 @@
       });
     });
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb
index ee8d14841..aeb3a71ea 100644
--- a/app/views/users/_user_jours.html.erb
+++ b/app/views/users/_user_jours.html.erb
@@ -11,7 +11,7 @@
   div.recall_con{width:600px;}
   div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="dis">
   <div class="msg_box" id='leave-message'>
     <% reply_allow = JournalsForMessage.create_by_user? User.current %>
diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
index 1f4c867ba..d5f91ebf8 100644
--- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
+++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
@@ -16,7 +16,8 @@ module RailsKindeditor
       input_html = input_html.merge(style: 'display:none')
       output_buffer = ActiveSupport::SafeBuffer.new
       output_buffer << build_text_area_tag(name, method, self, options, input_html)
-      output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true')))
+      output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true',
+                                                                                afterCreate: 'eval(function(){enablePasteImg(self);})')))
     end
     
     def kindeditor_upload_json_path(*args)
@@ -52,12 +53,12 @@ module RailsKindeditor
         "var old_onload_#{random_name};
         if(typeof window.onload == 'function') old_onload_#{random_name} = window.onload;
         window.onload = function() {
-          #{editor_id}KindEditor.create('##{dom_id}', #{get_options(options).to_json}).loadPlugin('paste');
+          #{editor_id}KindEditor.create('##{dom_id}', #{get_options(options).to_json});
           if(old_onload_#{random_name}) old_onload_#{random_name}();
         }"
       else
         "KindEditor.ready(function(K){
-          #{editor_id}K.create('##{dom_id}', #{get_options(options).to_json}).loadPlugin('paste');
+          #{editor_id}K.create('##{dom_id}', #{get_options(options).to_json});
         });"
       end
     end
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 1695b10f7..a9633861e 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -5097,6 +5097,9 @@ KEditor.prototype = {
 				}
 				self.afterCreate();
 				if (self.options.afterCreate) {
+          if (typeof self.options.afterCreate == 'string'){
+            self.options.afterCreate = eval(self.options.afterCreate);
+          }
 					self.options.afterCreate.call(self);
 				}
 			}
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
new file mode 100644
index 000000000..c413bbcb9
--- /dev/null
+++ b/public/assets/kindeditor/pasteimg.js
@@ -0,0 +1,385 @@
+// Generated by CoffeeScript 1.9.0
+
+/* 
+paste.js is an interface to read data ( text / image ) from clipboard in different browsers. It also contains several hacks.
+https://github.com/layerssss/paste.js
+ */
+
+(function() {
+    var $, Paste, createHiddenEditable, dataURLtoBlob;
+
+    $ = window.jQuery;
+
+    $.paste = function(pasteContainer) {
+        var pm;
+        if (typeof console !== "undefined" && console !== null) {
+            console.log("DEPRECATED: This method is deprecated. Please use $.fn.pastableNonInputable() instead.");
+        }
+        pm = Paste.mountNonInputable(pasteContainer);
+        return pm._container;
+    };
+
+    $.fn.pastableNonInputable = function() {
+        var el, _i, _len;
+        for (_i = 0, _len = this.length; _i < _len; _i++) {
+            el = this[_i];
+            Paste.mountNonInputable(el);
+        }
+        return this;
+    };
+
+    $.fn.pastableTextarea = function() {
+        var el, _i, _len;
+        for (_i = 0, _len = this.length; _i < _len; _i++) {
+            el = this[_i];
+            Paste.mountTextarea(el);
+        }
+        return this;
+    };
+
+    $.fn.pastableContenteditable = function() {
+        var el, _i, _len;
+        for (_i = 0, _len = this.length; _i < _len; _i++) {
+            el = this[_i];
+            Paste.mountContenteditable(el);
+        }
+        return this;
+    };
+
+    dataURLtoBlob = function(dataURL, sliceSize) {
+        var b64Data, byteArray, byteArrays, byteCharacters, byteNumbers, contentType, i, m, offset, slice, _ref;
+        if (sliceSize == null) {
+            sliceSize = 512;
+        }
+        if (!(m = dataURL.match(/^data\:([^\;]+)\;base64\,(.+)$/))) {
+            return null;
+        }
+        _ref = m, m = _ref[0], contentType = _ref[1], b64Data = _ref[2];
+        byteCharacters = atob(b64Data);
+        byteArrays = [];
+        offset = 0;
+        while (offset < byteCharacters.length) {
+            slice = byteCharacters.slice(offset, offset + sliceSize);
+            byteNumbers = new Array(slice.length);
+            i = 0;
+            while (i < slice.length) {
+                byteNumbers[i] = slice.charCodeAt(i);
+                i++;
+            }
+            byteArray = new Uint8Array(byteNumbers);
+            byteArrays.push(byteArray);
+            offset += sliceSize;
+        }
+        return new Blob(byteArrays, {
+            type: contentType
+        });
+    };
+
+    createHiddenEditable = function() {
+        return $(document.createElement('div')).attr('contenteditable', true).css({
+            width: 1,
+            height: 1,
+            position: 'fixed',
+            left: -100,
+            overflow: 'hidden'
+        });
+    };
+
+    Paste = (function() {
+        Paste.prototype._target = null;
+
+        Paste.prototype._container = null;
+
+        Paste.mountNonInputable = function(nonInputable) {
+            var paste;
+            paste = new Paste(createHiddenEditable().appendTo(nonInputable), nonInputable);
+            $(nonInputable).on('click', (function(_this) {
+                return function() {
+                    return paste._container.focus();
+                };
+            })(this));
+            paste._container.on('focus', (function(_this) {
+                return function() {
+                    return $(nonInputable).addClass('pastable-focus');
+                };
+            })(this));
+            return paste._container.on('blur', (function(_this) {
+                return function() {
+                    return $(nonInputable).removeClass('pastable-focus');
+                };
+            })(this));
+        };
+
+        Paste.mountTextarea = function(textarea) {
+            var ctlDown, paste;
+            if (-1 !== navigator.userAgent.toLowerCase().indexOf('chrome')) {
+                return this.mountContenteditable(textarea);
+            }
+            paste = new Paste(createHiddenEditable().insertBefore(textarea), textarea);
+            ctlDown = false;
+            $(textarea).on('keyup', function(ev) {
+                var _ref;
+                if ((_ref = ev.keyCode) === 17 || _ref === 224) {
+                    return ctlDown = false;
+                }
+            });
+            $(textarea).on('keydown', function(ev) {
+                var _ref;
+                if ((_ref = ev.keyCode) === 17 || _ref === 224) {
+                    ctlDown = true;
+                }
+                if (ctlDown && ev.keyCode === 86) {
+                    return paste._container.focus();
+                }
+            });
+            $(paste._target).on('pasteImage', (function(_this) {
+                return function() {
+                    return $(textarea).focus();
+                };
+            })(this));
+            $(paste._target).on('pasteText', (function(_this) {
+                return function() {
+                    return $(textarea).focus();
+                };
+            })(this));
+            $(textarea).on('focus', (function(_this) {
+                return function() {
+                    return $(textarea).addClass('pastable-focus');
+                };
+            })(this));
+            return $(textarea).on('blur', (function(_this) {
+                return function() {
+                    return $(textarea).removeClass('pastable-focus');
+                };
+            })(this));
+        };
+
+        Paste.mountContenteditable = function(contenteditable) {
+            var paste;
+            paste = new Paste(contenteditable, contenteditable);
+            $(contenteditable).on('focus', (function(_this) {
+                return function() {
+                    return $(contenteditable).addClass('pastable-focus');
+                };
+            })(this));
+            return $(contenteditable).on('blur', (function(_this) {
+                return function() {
+                    return $(contenteditable).removeClass('pastable-focus');
+                };
+            })(this));
+        };
+
+        function Paste(_at__container, _at__target) {
+            this._container = _at__container;
+            this._target = _at__target;
+            this._container = $(this._container);
+            this._target = $(this._target).addClass('pastable');
+            this._container.on('paste', (function(_this) {
+                return function(ev) {
+                    var clipboardData, file, item, reader, text, _i, _j, _len, _len1, _ref, _ref1, _ref2, _ref3, _results;
+                    if (((_ref = ev.originalEvent) != null ? _ref.clipboardData : void 0) != null) {
+                        clipboardData = ev.originalEvent.clipboardData;
+                        if (clipboardData.items) {
+                            _ref1 = clipboardData.items;
+                            for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+                                item = _ref1[_i];
+                                if (item.type.match(/^image\//)) {
+                                    reader = new FileReader();
+                                    reader.onload = function(event) {
+                                        return _this._handleImage(event.target.result);
+                                    };
+                                    reader.readAsDataURL(item.getAsFile());
+                                }
+                                if (item.type === 'text/plain') {
+                                    item.getAsString(function(string) {
+                                        return _this._target.trigger('pasteText', {
+                                            text: string
+                                        });
+                                    });
+                                }
+                            }
+                        } else {
+                            if (-1 !== Array.prototype.indexOf.call(clipboardData.types, 'text/plain')) {
+                                text = clipboardData.getData('Text');
+                                _this._target.trigger('pasteText', {
+                                    text: text
+                                });
+                            }
+                            _this._checkImagesInContainer(function(src) {
+                                return _this._handleImage(src);
+                            });
+                        }
+                    }
+                    if (clipboardData = window.clipboardData) {
+                        if ((_ref2 = (text = clipboardData.getData('Text'))) != null ? _ref2.length : void 0) {
+                            return _this._target.trigger('pasteText', {
+                                text: text
+                            });
+                        } else {
+                            _ref3 = clipboardData.files;
+                            _results = [];
+                            for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
+                                file = _ref3[_j];
+                                _this._handleImage(URL.createObjectURL(file));
+                                _results.push(_this._checkImagesInContainer(function() {}));
+                            }
+                            return _results;
+                        }
+                    }
+                };
+            })(this));
+        }
+
+        Paste.prototype._handleImage = function(src) {
+            var loader;
+            loader = new Image();
+            loader.onload = (function(_this) {
+                return function() {
+                    var blob, canvas, ctx, dataURL;
+                    canvas = document.createElement('canvas');
+                    canvas.width = loader.width;
+                    canvas.height = loader.height;
+                    ctx = canvas.getContext('2d');
+                    ctx.drawImage(loader, 0, 0, canvas.width, canvas.height);
+                    dataURL = null;
+                    try {
+                        dataURL = canvas.toDataURL('image/png');
+                        blob = dataURLtoBlob(dataURL);
+                    } catch (_error) {}
+                    if (dataURL) {
+                        return _this._target.trigger('pasteImage', {
+                            blob: blob,
+                            dataURL: dataURL,
+                            width: loader.width,
+                            height: loader.height
+                        });
+                    }
+                };
+            })(this);
+            return loader.src = src;
+        };
+
+        Paste.prototype._checkImagesInContainer = function(cb) {
+            var img, timespan, _i, _len, _ref;
+            timespan = Math.floor(1000 * Math.random());
+            _ref = this._container.find('img');
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+                img = _ref[_i];
+                img["_paste_marked_" + timespan] = true;
+            }
+            return setTimeout((function(_this) {
+                return function() {
+                    var _j, _len1, _ref1, _results;
+                    _ref1 = _this._container.find('img');
+                    _results = [];
+                    for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+                        img = _ref1[_j];
+                        if (!img["_paste_marked_" + timespan]) {
+                            cb(img.src);
+                        }
+                        _results.push($(img).remove());
+                    }
+                    return _results;
+                };
+            })(this), 1);
+        };
+
+        return Paste;
+
+    })();
+
+}).call(this);
+
+function enablePasteImg(_editor) {
+    var editor = _editor,
+        name = 'paste';
+    //����ò�ƶ�༭���Ͳ����ͻ��
+    if(editor.edit == undefined || editor.edit.iframe == undefined){
+        return;
+    }
+    var contentWindow = editor.edit.iframe[0].contentWindow;
+    //var contentWindow = editor.iframeDoc;
+    //var contentWindow = document.getElementsByTagName('iframe')[0].contentWindow;
+    var nodeBody = contentWindow.document.getElementsByTagName('body')[0];
+    console.log(nodeBody);
+    $(nodeBody).pastableContenteditable();
+
+    dataURItoBlob = function(dataURI) {
+      // convert base64/URLEncoded data component to raw binary data held in a string
+      var byteString;
+      if (dataURI.split(',')[0].indexOf('base64') >= 0)
+        byteString = atob(dataURI.split(',')[1]);
+      else
+        byteString = unescape(dataURI.split(',')[1]);
+
+      // separate out the mime component
+      var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
+
+      // write the bytes of the string to a typed array
+      var ia = new Uint8Array(byteString.length);
+      for (var i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i);
+      }
+
+      return new Blob([ia], {type:mimeString});
+    };
+
+    $(nodeBody).on('pasteImage', function(ev, data) {
+        console.log('pasteImage');
+        console.log("dataURL: " + data.dataURL);
+        console.log("width: " + data.width);
+        console.log("height: " + data.height);
+        console.log(data.blob);
+        var blob = dataURItoBlob(data.dataURL);
+        if (data.blob !== null) {
+            var data = new FormData();
+            data.append("imgFile",blob, "imageFilename.png");
+            console.log(data);
+            $.ajax({
+              url: '/kindeditor/upload?dir=image',
+              contentType: false,
+              type: 'POST',
+              data: data,
+              processData: false,
+              success: function(data) {
+                editor.exec('insertimage', JSON.parse(data).url);
+              }
+            });
+        }
+
+    });
+    return;
+    contentWindow.document.getElementsByTagName('body')[0].onpaste = function(event) {
+        // use event.originalEvent.clipboard for newer chrome versions
+        var items = (event.clipboardData || event.originalEvent.clipboardData).items;
+        console.log(JSON.stringify(items)); // will give you the mime types
+        // find pasted image among pasted items
+        var blob = null;
+        for (var i = 0; i < items.length; i++) {
+            if (items[i].type.indexOf("image") === 0) {
+                blob = items[i].getAsFile();
+            }
+        }
+        // load image if there is a pasted image
+        if (blob !== null) {
+            var reader = new FileReader();
+            reader.onload = function(event) {
+                console.log(event.target.result); // data url!
+                var data = new FormData();
+                data.append("imgFile", blob, "imageFilename.png");
+                console.log(blob);
+                $.ajax({
+                    url: '/kindeditor/upload?dir=image',
+                    contentType: false,
+                    type: 'POST',
+                    data: data,
+                    processData: false,
+                    success: function(data) {
+                        editor.exec('insertimage', JSON.parse(data).url);
+                    }
+                });
+            };
+            reader.readAsDataURL(blob);
+        }
+    }
+};

From 23a1f84ae70e61fa6b40fc1368272b5a953af3e5 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 17 Jun 2015 20:59:43 +0800
Subject: [PATCH 33/46] =?UTF-8?q?kindeditor=20js=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_forums.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index fdeb609c8..eae133184 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -12,10 +12,10 @@
 		<meta name="keywords" content="issue,bug,tracker" />
 		<%= csrf_meta_tag %>
 		<%= favicon %>
-        <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_heads %>
+    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 		<%= heads_for_theme %>
 
 		<%= call_hook :view_layouts_base_html_head %>

From f58b5304843e5ce91e572e2faf7d43bab5dfda95 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 18 Jun 2015 09:13:20 +0800
Subject: [PATCH 34/46] =?UTF-8?q?=E7=BB=99=E8=AF=BE=E7=A8=8B=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=85=A2=E5=8A=A0=E4=B8=8A=E7=BC=93=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E5=8A=A0=E5=85=A5=E4=BA=86=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb       | 33 +++++++++++++--------
 app/helpers/application_helper.rb           |  7 +++++
 app/models/activity.rb                      |  2 ++
 app/models/forge_activity.rb                |  1 +
 app/views/courses/show.html.erb             |  2 +-
 app/views/files/_course_list.html.erb       |  6 ++--
 app/views/files/_project_file_list.html.erb |  6 ++--
 config/settings.yml                         |  3 +-
 lib/trustie/cache/clear_course_event.rb     | 17 +++++++++++
 9 files changed, 58 insertions(+), 19 deletions(-)
 create mode 100644 lib/trustie/cache/clear_course_event.rb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 61354add7..524bde9d7 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -695,21 +695,28 @@ class CoursesController < ApplicationController
       # 显示老师和助教的活动
       # @authors = searchTeacherAndAssistant(@course)
       @authors = course_all_member(@course)
+      Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require file }
       events = []
-      @authors.each do |author|
-        @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
-                                                   :with_subprojects => false,
-                                                   :author => author.user)
-
-        @activity.scope_select {|t| has["show_#{t}"]}
-        # modify by nwb
-        # 添加私密性判断
-        if User.current.member_of_course?(@course)|| User.current.admin?
-          events += @activity.events(@days, @course.created_at)
-        else
-          events += @activity.events(@days, @course.created_at, :is_public => 1)
+      key = "course_events_#{@course.id}".to_sym
+      if Rails.env.production? && Setting.course_cahce_enabled?
+        events = Rails.cache.read(key) || []
+      end
+      if events.empty? 
+        @authors.each do |author|
+          @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
+                                                     :with_subprojects => false,
+                                                     :author => author.user)
+
+          @activity.scope_select {|t| has["show_#{t}"]}
+          # modify by nwb
+          # 添加私密性判断
+          if User.current.member_of_course?(@course)|| User.current.admin?
+            events += @activity.events(@days, @course.created_at)
+          else
+            events += @activity.events(@days, @course.created_at, :is_public => 1)
+          end
         end
-
+        Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
       end
     else
     # @author = @course.teacher
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5ae70fd7c..5af4e2038 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2330,4 +2330,11 @@ module ApplicationHelper
   def cur_user_works_for_homework homework
     homework.student_works.where("user_id = ?",User.current).first
   end
+
+  def file_preview_tag(file, html_options={})
+    if %w(pdf pptx doc docx xls xlsx).any?{|x| file.filename.downcase.end_with?(x)}
+      link_to '预览', download_named_attachment_path(file.id, file.filename, preview: true),html_options
+    end
+  end
+
 end
diff --git a/app/models/activity.rb b/app/models/activity.rb
index e871ae735..5ec778641 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -5,4 +5,6 @@ class Activity < ActiveRecord::Base
   validates :act_id, presence: true
   validates :act_type, presence: true
   validates :user_id, presence: true
+
+  include Trustie::Cache::ClearCourseEvent
 end
diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index e94a29867..6b75552c0 100644
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@@ -19,4 +19,5 @@ class ForgeActivity < ActiveRecord::Base
   validates :project_id,presence: true
   validates :forge_act_id,presence: true
   validates :forge_act_type, presence: true
+
 end
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 09d1aa27d..654c25a42 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -126,4 +126,4 @@
       });
       nh_new_notify_count_show();
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 7f3e426fc..8bb6f8970 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -25,7 +25,9 @@
       <% if file.is_public? || User.current.member_of_course?(course) %>
           <div class="re_con_box" id="container_files_<%= file.id %>">
             <div class="">
-              <%= link_to truncate(file.filename,length: 35, omission: '...'), download_named_attachment_path(file.id, file.filename, preview: true),:title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+              <%= link_to truncate(file.filename,length: 35, omission: '...'), 
+              download_named_attachment_path(file.id, file.filename),
+              :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
               <% if User.current.logged? %>
                   <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
                       <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
@@ -40,7 +42,7 @@
                   <% else %>
                       <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
                   <% end %>
-                  <%= link_to_attachment file, text: '下载', class: 'f_l re_open' %>
+                  <%= file_preview_tag(file, class: 'f_l re_open') %>
               <% else %>
               <% end %>
             </div>
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index 81b69d754..9f9e86cff 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -18,7 +18,9 @@
   <% project_attachments.each do |file| %>
       <div class="re_con_box">
         <div class="">
-          <%= link_to truncate(file.filename,length: 35, omission: '...'), download_named_attachment_path(file.id, file.filename, preview: true),:title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+          <%= link_to truncate(file.filename,length: 35, omission: '...'),
+            download_named_attachment_path(file.id, file.filename),
+            :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
           <% if User.current.logged? %>
               <% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
                   <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
@@ -30,7 +32,7 @@
               <% else %>
                   <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
               <% end %>
-              <%= link_to_attachment file, text: '下载', class: 'f_l re_open' %>
+              <%= file_preview_tag(file, class: 'f_l re_open') %>
           <% end %>
         </div>
         <div class="cl"></div>
diff --git a/config/settings.yml b/config/settings.yml
index f952e23bf..d0af6d7a1 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -66,7 +66,8 @@ upload_avatar_max_size:
 ### delayjob for send email.
 delayjob_enabled:
   default: 1
-
+course_cahce_enabled:
+  default: 1
 bcc_recipients:
   default: 1
 plain_text_mail:
diff --git a/lib/trustie/cache/clear_course_event.rb b/lib/trustie/cache/clear_course_event.rb
new file mode 100644
index 000000000..98ec8b4fd
--- /dev/null
+++ b/lib/trustie/cache/clear_course_event.rb
@@ -0,0 +1,17 @@
+#coding=utf-8
+
+module Trustie
+  module Cache
+    module ClearCourseEvent
+      def self.included(base)
+        base.class_eval{
+          after_create :clear_course_events
+        }
+      end
+      def clear_course_events
+        Rails.cache.delete("course_events_#{self.act.course_id}".to_sym) if Rails.env.production? && Setting.course_cahce_enabled?
+      end
+    end
+  end
+end
+

From 2f8f07aa31d3b663874259c86a683ee64d1b69b3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 18 Jun 2015 09:24:19 +0800
Subject: [PATCH 35/46] =?UTF-8?q?403=E5=90=8E=E9=80=80=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=B7=AF=E7=94=B1=E6=97=B6=E7=BD=AE=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/common/403.html | 46 +++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/app/views/common/403.html b/app/views/common/403.html
index a89be932d..d063b315e 100644
--- a/app/views/common/403.html
+++ b/app/views/common/403.html
@@ -1,25 +1,33 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>没有访问权限</title>
-<style>
-body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
-div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
-div,img,tr,td{ border:0;}
-table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
-a{ text-decoration:none; }
-a:hover{ }
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>没有访问权限</title>
+    <style>
+        body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+        div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
+        div,img,tr,td{ border:0;}
+        table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+        ul,li{ list-style-type:none}
+        .cl{ clear:both; overflow:hidden; }
+        a{ text-decoration:none !important; }
+        a:hover{ }
 
-.error_content{ width:550px; height:200px; margin:0 auto; padding:10px 0;}
-.error_left{color:#15bccf; font-size:100px; font-weight:bold; font-style:oblique; width:200px; height:120px; padding-right:30px; float:left;}
-.error_right{ width:240px; height:120px; float:left;color:#15bccf; font-size: 17px; font-weight:bold; padding-left:30px; margin-top:40px; border-left:1px dashed #CCC; }
-.error_link{ margin-top:8px;}
-.error_link a{ display:block; width:80px; height:28px; font-size:14px; font-weight:bold; color:#fff; text-align:center; background:#15bccf; float:left; margin-right:10px;}
-.error_link a:hover{ background:#ff8417;}
-</style>
+        .error_content{ width:550px; height:200px; margin:0 auto; padding:10px 0;}
+        .error_left{color:#15bccf; font-size:100px; font-weight:bold; font-style:oblique; width:200px; height:120px; padding-right:30px; float:left;}
+        .error_right{ width:240px; height:120px; float:left;color:#15bccf; font-size: 17px; font-weight:bold; padding-left:30px; margin-top:40px; border-left:1px dashed #CCC; }
+        .error_link{ margin-top:8px;}
+        .error_link a{ display:block; width:80px; height:28px; font-size:14px; font-weight:bold; color:#fff; text-align:center; background:#15bccf; float:left; margin-right:10px;}
+        .error_link a:hover{ background:#ff8417;}
+    </style>
+    <script type="text/javascript">
+        $(function(){
+            if(window.history.length == 1)
+            {
+                $("#history_back").css("background","#CCC");
+            }
+        });
+    </script>
 </head>
 
 <body>
@@ -31,7 +39,7 @@ a:hover{ }
         没有访问权限！建议您</p>
         <div class="error_link">
         	<!---<a href="http://forge.trustie.net/" target="_blank">返回首页</a>---->
-            <a href="javascript:history.back()">后退一步</a>
+            <a href="javascript:history.back()" id="history_back">后退一步</a>
             <a href="http://user.trustie.net/users/5/user_newfeedback">给我留言</a>
         </div>
     </div>

From d76aa7cab2c5ae6b87c400f5315ff12a93e77851 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 18 Jun 2015 09:31:31 +0800
Subject: [PATCH 36/46] =?UTF-8?q?=E9=9D=9E=E8=AF=BE=E7=A8=8B=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E4=B8=8D=E5=8F=AF=E8=AE=BF=E9=97=AE=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 06bc1fd38..d5e62127d 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -3,6 +3,7 @@ class HomeworkCommonController < ApplicationController
   before_filter :find_course, :only => [:index,:new,:create]
   before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
   before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
+  before_filter :member_of_course, :only => [:index]
 
   def index
     homeworks = @course.homework_commons.order("created_at desc")
@@ -203,6 +204,11 @@ class HomeworkCommonController < ApplicationController
     render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
   end
 
+  #当前用户是不是课程的成员
+  def member_of_course
+    render_403 unless User.current.member_of_course?(@course) || User.current.admin?
+  end
+
   def get_assigned_homeworks(student_works, n, index)
     student_works += student_works
     student_works[index + 1 .. index + n]

From 9a4e0d6be75b83b1515a499cf4082708d86dc75a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 18 Jun 2015 10:11:04 +0800
Subject: [PATCH 37/46] =?UTF-8?q?=E6=89=B9=E9=98=85=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/courses.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 769136f2d..f4e72019f 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -666,7 +666,7 @@ input#score{ width:40px;}
 .ui-slider .ui-slider-handle:active{background-image:none;}
 .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;}
+.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; white-space: nowrap; text-overflow:ellipsis;}
 .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; }

From 28e9c090ec563adea8eccc856ccc669b2b146f1c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 18 Jun 2015 10:23:51 +0800
Subject: [PATCH 38/46] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=EF=BC=9A=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb |  5 ---
 app/models/document.rb                        |  2 +-
 app/models/homework_common.rb                 |  7 +++-
 app/models/mailer.rb                          | 37 ++++++++++++++++++-
 app/views/mailer/forum_message_added.html.erb | 22 +++++------
 app/views/mailer/homework_added.html.erb      | 30 +++++++++++++++
 app/views/mailer/homework_added.text.erb      | 17 +++++++++
 config/locales/mailers/zh.yml                 |  3 ++
 8 files changed, 103 insertions(+), 20 deletions(-)
 create mode 100644 app/views/mailer/homework_added.html.erb
 create mode 100644 app/views/mailer/homework_added.text.erb

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 648108e47..06bc1fd38 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -3,7 +3,6 @@ class HomeworkCommonController < ApplicationController
   before_filter :find_course, :only => [:index,:new,:create]
   before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
   before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
-  after_create :send_mail
 
   def index
     homeworks = @course.homework_commons.order("created_at desc")
@@ -184,10 +183,6 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
-  def send_mail
-    Mailer.run.homework_added(self)
-  end
-
   private
   #获取课程
   def find_course
diff --git a/app/models/document.rb b/app/models/document.rb
index 6bfb4b8ff..37983d6d4 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -85,7 +85,7 @@ class Document < ActiveRecord::Base
   # Description 新创建的document要在公共表ForgeActivity中记录
   def act_as_forge_activity
     self.forge_acts << ForgeActivity.new(:user_id => self.user_id,
-                                         :project_id => self.project_id)
+                                            :project_id => self.project_id)
   end
 
   def send_mail
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index ac10b2516..291c14563 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -18,7 +18,7 @@ class HomeworkCommon < ActiveRecord::Base
                 :description => :description,
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
-  after_create :act_as_activity
+  after_create :act_as_activity, :send_mail
   after_destroy :delete_kindeditor_assets
 
   def act_as_activity
@@ -28,4 +28,9 @@ class HomeworkCommon < ActiveRecord::Base
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::HOMEWORKCOMMON
   end
+
+  def send_mail
+    Mailer.run.homework_added(self)
+  end
+
 end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 8d027da12..164e2b2ae 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -517,13 +517,46 @@ class Mailer < ActionMailer::Base
     end
   end
 
+
+
+  def forum_message_added(memo)
+    @memo = memo
+    redmine_headers 'Memo' => memo.id
+    @forum = memo.forum
+    @author = memo.author
+    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => @forum.id)
+    @issue_author_url = url_for(user_activities_url(@author))
+    recipients ||= []
+    #将帖子创建者邮箱地址加入数组
+    recipients << @forum.creator.mail
+    #回复人邮箱地址加入数组
+    recipients << @author.mail
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+
+    @memo_url = url_for(forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)))
+    mail :to => recipients,
+         :subject => "[ #{l(:label_message_plural)} : #{memo.subject} #{l(:label_memo_create_succ)}]",
+         :filter => true
+  end
+
   # Builds a Mail::Message object used to email recipients of a course when an homework are posted.
   #
   # Example:
   #   attachments_added(attachments) => Mail::Message object
   #   Mailer.attachments_added(attachments).deliver => sends an email to the project's recipients
-  def homework_added
-
+  def homework_added(homework_common)
+    @homework_common = homework_common
+    @author = homework_common.user
+    @homework_common_url = url_for(:controller => "homework_common", :action =>"index", :homework => @homework_common.id)
+    @homework_author_url = url_for(user_activities_url(@author))
+    recipients ||= []
+    #将帖子创建者邮箱地址加入数组
+    @homework_common.course.members.each do |member|
+      recipients << member.user.mail
+    end
+    mail :to => recipients,
+         :subject => "[ #{l(:label_user_homework)} : #{homework_common.name} #{l(:label_memo_create_succ)}]",
+         :filter => true
   end
 
   # Builds a Mail::Message object used to email recipients of a news' project when a news item is added.
diff --git a/app/views/mailer/forum_message_added.html.erb b/app/views/mailer/forum_message_added.html.erb
index 58657d46b..ddd93c5b5 100644
--- a/app/views/mailer/forum_message_added.html.erb
+++ b/app/views/mailer/forum_message_added.html.erb
@@ -1,25 +1,25 @@
-
 <p>
-      <span class="c_blue" style="color:#1b55a7;">
-        <%= link_to(h("#{@author.login}(#{@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(@forum.name), @forum_url,:style=>'color:#1b55a7; font-weight:bold;') %>
-
-  </span><%= l(:mail_issue_title_active)%></p>
+     <%= link_to(h("#{@author.login}(#{@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(@forum.name), @forum_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  </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>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_subject) %></strong></span>
       <span style="float: left; width: 526px">  <%= link_to(h(@memo.subject), @memo_url,:style=>'color:#1b55a7; font-weight:bold;') %></span></li>
-    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from) %></strong></span>
       <%= link_to(h(@forum.name), @forum_url,:style=>'color:#1b55a7; font-weight:bold;') %>
     </li>
-    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+    <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">
         	<%= @memo.content.html_safe %>
         </span>
     </li>
-
   </ul>
   <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
   <label  class="mail_reply">
diff --git a/app/views/mailer/homework_added.html.erb b/app/views/mailer/homework_added.html.erb
new file mode 100644
index 000000000..214b80723
--- /dev/null
+++ b/app/views/mailer/homework_added.html.erb
@@ -0,0 +1,30 @@
+<p>
+  <span class="c_blue" style="color:#1b55a7;">
+    <%= link_to(h("#{@homework_common.user.login}(#{@homework_common.user.show_name})"), @homework_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+    </span><%= l(:mail_course_title_userin)%>
+  <span class="c_blue" style="color:#1b55a7;">
+    <%=h @homework_common.course.name %>
+  </span>
+  <%= l(:mail_course_homework_active) %> ：
+  <span class="c_blue" style="color:#1b55a7;">
+   <%= link_to(h(@homework_common.name), @homework_common_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  </span>
+  <%= l(:mail_attention) %>
+</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>
+      <span style="float: left; width: 526px">  <%= link_to(h(@homework_common.name), @homework_common_url, :style=>'color:#1b55a7; font-weight:bold;') %></span>
+    </li>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span>
+       <span style="float: left; width: 526px"><%=h @homework_common.course.name %></span>
+    </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">
+            <%= @homework_common.description.html_safe %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/mailer/homework_added.text.erb b/app/views/mailer/homework_added.text.erb
new file mode 100644
index 000000000..8e657ee80
--- /dev/null
+++ b/app/views/mailer/homework_added.text.erb
@@ -0,0 +1,17 @@
+<%= link_to(h("#{@homework_common.user.login}(#{@homework_common.user.show_name})"), @homework_author_url ) %>
+<%= l(:mail_course_title_userin)%>
+
+<%=h @homework_common.course.name %>
+<%= l(:mail_course_homework_active) %> ：
+<%= link_to(h(@homework_common.name), @homework_common_url) %>
+
+<%= l(:mail_attention) %>
+<%= l(:mail_issue_subject)%>
+<%= link_to(h(@homework_common.name), @homework_common_url) %>
+<%= l(:mail_issue_sent_from)%>
+<%=h @homework_common.course.name %>
+<%= l(:mail_issue_content)%>
+
+<%= @homework_common.description.html_safe %>
+
+
diff --git a/config/locales/mailers/zh.yml b/config/locales/mailers/zh.yml
index 46666ee25..211f2e62d 100644
--- a/config/locales/mailers/zh.yml
+++ b/config/locales/mailers/zh.yml
@@ -21,3 +21,6 @@ zh:
   mail_issue_from_project: "项目问题跟踪"
   mail_issue_attachments: "附件："
   mail_issue_reply: "我要回复"
+  mail_course_title_userin: "在课程"
+  mail_course_homework_active: "中发布了作业"
+  mail_attention: "请您关注!"

From 7a9b5712c06d4a359a00b6f5ef9997da1fa11746 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 18 Jun 2015 10:54:28 +0800
Subject: [PATCH 39/46] =?UTF-8?q?message=E7=9A=84=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/trustie/cache/clear_course_event.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/trustie/cache/clear_course_event.rb b/lib/trustie/cache/clear_course_event.rb
index 98ec8b4fd..a5f44bf45 100644
--- a/lib/trustie/cache/clear_course_event.rb
+++ b/lib/trustie/cache/clear_course_event.rb
@@ -8,9 +8,23 @@ module Trustie
           after_create :clear_course_events
         }
       end
+
       def clear_course_events
-        Rails.cache.delete("course_events_#{self.act.course_id}".to_sym) if Rails.env.production? && Setting.course_cahce_enabled?
+        if Rails.env.production? && Setting.course_cahce_enabled?
+          Rails.cache.delete(cache_key) 
+        end
+      end
+
+      def cache_key
+        course_id = nil
+        if Message === self.act
+          course_id = self.act.board.course_id
+        elsif self.act.respond_to?(:course_id)
+          course_id = self.act.course_id
+        end
+        "course_events_#{course_id}".to_sym
       end
+
     end
   end
 end

From 8a3a0af20f897710454077d2729f2e3aaa1eac13 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 18 Jun 2015 10:59:18 +0800
Subject: [PATCH 40/46] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A7=AF=E5=88=86=E5=BC=B9=E6=A1=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/member.rb                          | 10 ++++++++++
 app/views/courses/_show_member_score.html.erb |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/models/member.rb b/app/models/member.rb
index 5b1e277d7..057ea9570 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -129,6 +129,16 @@ class Member < ActiveRecord::Base
     StudentWork.select("homework_commons.name, student_works.final_score").joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}")
   end
 
+  #当前课程的作业列表
+  def homework_common_list
+    HomeworkCommon.where(:course_id => self.course_id)
+  end
+
+  #当前学生在指定作业内的得分
+  def homework_common_score homework_common
+    StudentWork.select("final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
+  end
+
   def student_work_score_avg
     StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").average(:final_score).try(:round, 2).to_f
   end
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index 0fd1248c6..b471bc17f 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -17,13 +17,14 @@
     <h2><%= @member_score.user.name %> 历次作业积分</h2>
     <ul class="tscore_box">
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>
-      <% @member_score.student_work_score.each do |homework_score| %>
+      <% @member_score.homework_common_list.each do |homework_common| %>
             <li>
               <span class="c_grey02 w280">
-                <%= homework_score.name %>
+                <%= homework_common.name %>
               </span>
               <span class="c_red w70">
-                <%= format("%0.2f",homework_score.final_score.nil? ? 0 : homework_score.final_score) %>
+                <% final_score = @member_score.homework_common_score(homework_common).first%>
+                <%= final_score.nil? || final_score.final_score.nil? ? "--" : format("%0.2f", final_score.final_score) %>
               </span>
             </li>
        <% end %>

From 43363e8bcb89021e5e7ad5eaa2de8e596d3c3813 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 18 Jun 2015 17:56:28 +0800
Subject: [PATCH 41/46] =?UTF-8?q?=E7=BC=BA=E8=AF=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    | 11 +++-
 app/helpers/student_work_helper.rb            | 10 ++++
 app/views/student_work/index.html.erb         |  2 +-
 .../student_work_absence_penalty.html.erb     | 54 +++++++++++++++++++
 config/routes.rb                              |  1 +
 public/stylesheets/courses.css                |  6 ++-
 public/stylesheets/public.css                 |  1 +
 7 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 app/views/student_work/student_work_absence_penalty.html.erb

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 30fd0ff50..3dd5e9890 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -2,7 +2,7 @@ class StudentWorkController < ApplicationController
   layout "base_courses"
   include StudentWorkHelper
   require 'bigdecimal'
-  before_filter :find_homework, :only => [:new, :index, :create]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty]
   before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
@@ -233,6 +233,15 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  #评价列表显示
+  def student_work_absence_penalty
+    render_403 unless User.current.allowed_to?(:as_teacher,@course)
+    @stundet_works = @homework.student_works
+    respond_to do |format|
+      format.html
+    end
+  end
+
   private
   #获取作业
   def find_homework
diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index 990a563c4..7c85dc5c4 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -60,4 +60,14 @@ module StudentWorkHelper
   def is_praise_homework user_id, obj_id
     PraiseTread.where("user_id = #{user_id} AND praise_tread_object_id = #{obj_id} AND praise_tread_object_type = 'StudentWork'").empty?
   end
+
+  #获取指定学生在指定作业内应匿评的数量
+  def all_evaluation_count user,homework
+    StudentWorksEvaluationDistribution.joins(:student_work).where("student_works_evaluation_distributions.user_id = #{user.id} AND student_works.homework_common_id = #{homework.id}").count
+  end
+
+  #获取指定学生在指定作业内已匿评的数量
+  def has_evaluation_count user,homework
+    StudentWorksScore.joins(:student_work).where("student_works_scores.user_id = #{user.id} AND student_works.homework_common_id = #{homework.id}").count
+  end
 end
\ No newline at end of file
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index c9e8cd4c6..09d1c8f60 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -18,7 +18,6 @@
   返<br/>回<br/>顶<br/>部
 </div>
 <div class="cl"></div>
-
 <div id="contentbox">
   <div id="tb_" class="hwork_tb_">
     <ul>
@@ -37,6 +36,7 @@
       <% 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_1($(this).prev(),'<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
+        <%= link_to "缺评情况",student_work_absence_penalty_student_work_index_path(:homework => @homework.id), :class => "student_work_search fl", :target => "_blank"%>
       <% end%>
       <% if @is_teacher%>
           <div class="fr">
diff --git a/app/views/student_work/student_work_absence_penalty.html.erb b/app/views/student_work/student_work_absence_penalty.html.erb
new file mode 100644
index 000000000..a0d6cdc04
--- /dev/null
+++ b/app/views/student_work/student_work_absence_penalty.html.erb
@@ -0,0 +1,54 @@
+<div class="project_r_h">
+  <h2 class="project_h2">
+    缺评情况
+  </h2>
+</div>
+<div class="cl"></div>
+
+<div class="st_box">
+  <ul class="st_box_top">
+    <li  class="ml10" style="padding-right: 15px;">
+      <a href="javascript:void(0)">学号</a>
+    </li>
+    <li  class="ml90" style="padding-right: 5px;">
+      <a href="javascript:void(0)">姓名</a>
+    </li>
+    <li class="ml320">
+      <a href="javascript:void(0)">应评</a>
+    </li>
+    <li class="ml30">
+      <a href="javascript:void(0)">实评</a>
+    </li>
+    <li class="ml30">
+      <a href="javascript:void(0)">缺评</a>
+    </li>
+  </ul>
+  <div class="cl"></div><!--st_box_top end-->
+
+  <% @stundet_works.each do |student_work|%>
+      <ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
+        <li class="hwork_num_ab mr10 ml10">
+            <span>
+              <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+            </span>
+        </li>
+        <li class=" hwork_name_ab ">
+          <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
+        </li>
+        <%
+           all_count = all_evaluation_count student_work.user,@homework
+           has_count =  has_evaluation_count student_work.user,@homework
+           absence = all_count - has_count
+        %>
+        <li class="absence c_grey">
+          <%= all_count%>
+        </li>
+        <li class="absence c_grey">
+          <%= has_count%>
+        </li>
+        <li class="absence <%= absence == 0 ? 'c_green' : 'c_red'%>">
+          <%= absence%>
+        </li>
+      </ul>
+  <% end%>
+</div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index c92c732d2..b5a244345 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -97,6 +97,7 @@ RedmineApp::Application.routes.draw do
     collection do
       post 'add_score_reply'
       get 'destroy_score_reply'
+      get 'student_work_absence_penalty'
     end
   end
 
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index f4e72019f..b2e68085a 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -635,6 +635,8 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
 .mr18{ margin-right:18px;}
 a.hwork_center{ display:block; width:60px;  margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
 .hwork_name{ display:block;width:80px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.absence_penalty{ display:block;width:45px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.border_ce {border: 1px solid #e4e4e4;}
 .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;}
@@ -657,7 +659,9 @@ a:hover.down_btn{ background:#14ad5a; color:#fff; border:1px solid #14ad5a;}
 .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;}
 /*返回顶部*/
 .to_top{width: 19px;height: 74px;position: fixed;top: 50px;right: 1px;color: white;background: #15bccf; line-height: 1.2; padding-top: 10px;padding-left: 5px;font-size: 14px;cursor: pointer;}
-
+.hwork_num_ab{ width:120px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_name_ab{ display:block;width:340px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.absence{width: 50px;text-align: center;}
 /* 评分插件 */
 input#score{ width:40px;}
 .ui-slider{position:relative;width:200px;float:left;margin-right:10px;height:14px; margin-top:2px;background:#e2e2e2; }
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 0ed497127..cdcde2559 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -69,6 +69,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml90{ margin-left:90px;}
 .ml100{ margin-left:100px;}
 .ml110{ margin-left:110px;}
+.ml320{ margin-left:320px;}
 .mr5{ margin-right:5px;}
 .mr10{ margin-right:10px;}
 .mr20{ margin-right:20px;}

From 4aeac1bd649c0f0412453c7498f9de7153e6a5cf Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 18 Jun 2015 21:39:12 +0800
Subject: [PATCH 42/46] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=AC=A1=E6=95=B0=E4=B8=8D=E7=B4=AF=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 4ecff7a40..09ca29178 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -68,6 +68,7 @@ class AttachmentsController < ApplicationController
   end
 
   def direct_download
+    @attachment.increment_download
     send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
       :type => detect_content_type(@attachment),
       :disposition => 'attachment'    #inline can open in browser
@@ -78,7 +79,6 @@ class AttachmentsController < ApplicationController
     # 下载添加权限设置
     candown = attachment_candown @attachment
     if candown || User.current.admin? || User.current.id == @attachment.author_id
-      @attachment.increment_download
       if stale?(:etag => @attachment.digest)
         if params[:preview] == 'true'
           convered_file = @attachment.diskfile

From 64da95e900c59818c7069675161de33834645227 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 19 Jun 2015 09:23:36 +0800
Subject: [PATCH 43/46] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 164e2b2ae..d0ee99421 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -517,28 +517,6 @@ class Mailer < ActionMailer::Base
     end
   end
 
-
-
-  def forum_message_added(memo)
-    @memo = memo
-    redmine_headers 'Memo' => memo.id
-    @forum = memo.forum
-    @author = memo.author
-    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => @forum.id)
-    @issue_author_url = url_for(user_activities_url(@author))
-    recipients ||= []
-    #将帖子创建者邮箱地址加入数组
-    recipients << @forum.creator.mail
-    #回复人邮箱地址加入数组
-    recipients << @author.mail
-    # cc = wiki_content.page.wiki.watcher_recipients - recipients
-
-    @memo_url = url_for(forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)))
-    mail :to => recipients,
-         :subject => "[ #{l(:label_message_plural)} : #{memo.subject} #{l(:label_memo_create_succ)}]",
-         :filter => true
-  end
-
   # Builds a Mail::Message object used to email recipients of a course when an homework are posted.
   #
   # Example:

From c64b761f46dba724f713c636afde9da4a0532e6d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 09:56:39 +0800
Subject: [PATCH 44/46] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=BA=E8=AF=84?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=B7=B2=E8=AF=84=E3=80=81=E6=9C=AA=E8=AF=84=E3=80=81=E7=BC=BA?=
 =?UTF-8?q?=E8=AF=84=E7=9A=84=E6=95=B0=E9=87=8F=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb       | 12 +++++++++++-
 .../student_work_absence_penalty.html.erb        | 16 ++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 3dd5e9890..c8cbde626 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -236,7 +236,17 @@ class StudentWorkController < ApplicationController
   #评价列表显示
   def student_work_absence_penalty
     render_403 unless User.current.allowed_to?(:as_teacher,@course)
-    @stundet_works = @homework.student_works
+    order = params[:order] || "desc"
+    work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
+    @stundet_works = StudentWork.find_by_sql("SELECT *,(all_count - has_count) AS absence FROM(
+      SELECT * ,
+        (SELECT COUNT(*) FROM `student_works_evaluation_distributions` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS all_count,
+        (SELECT COUNT(*) FROM `student_works_scores` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS has_count
+      FROM `student_works`
+      WHERE homework_common_id = 213
+    ) AS table_1
+    ORDER BY absence #{order}")
+    @order = order == "desc" ? "asc" : "desc"
     respond_to do |format|
       format.html
     end
diff --git a/app/views/student_work/student_work_absence_penalty.html.erb b/app/views/student_work/student_work_absence_penalty.html.erb
index a0d6cdc04..e9054561f 100644
--- a/app/views/student_work/student_work_absence_penalty.html.erb
+++ b/app/views/student_work/student_work_absence_penalty.html.erb
@@ -20,7 +20,8 @@
       <a href="javascript:void(0)">实评</a>
     </li>
     <li class="ml30">
-      <a href="javascript:void(0)">缺评</a>
+      <%= link_to "缺评",student_work_absence_penalty_student_work_index_path(:homework => @homework.id,:order => @order)%>
+      <a href="javascript:void(0);" class="<%= @order == 'desc' ? 'st_up' : 'st_down'%>" ></a>
     </li>
   </ul>
   <div class="cl"></div><!--st_box_top end-->
@@ -35,19 +36,14 @@
         <li class=" hwork_name_ab ">
           <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
         </li>
-        <%
-           all_count = all_evaluation_count student_work.user,@homework
-           has_count =  has_evaluation_count student_work.user,@homework
-           absence = all_count - has_count
-        %>
         <li class="absence c_grey">
-          <%= all_count%>
+          <%= student_work.all_count%>
         </li>
         <li class="absence c_grey">
-          <%= has_count%>
+          <%= student_work.has_count%>
         </li>
-        <li class="absence <%= absence == 0 ? 'c_green' : 'c_red'%>">
-          <%= absence%>
+        <li class="absence <%= student_work.absence == 0 ? 'c_green' : 'c_red'%>">
+          <%= student_work.absence%>
         </li>
       </ul>
   <% end%>

From 1f4f1b4eb65915d9fb20fabc627d0d956318f10a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 09:59:06 +0800
Subject: [PATCH 45/46] =?UTF-8?q?=E8=80=81=E5=B8=88=E6=89=8D=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=9F=A5=E7=9C=8B=E7=BC=BA=E8=AF=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 09d1c8f60..6325abc09 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -36,7 +36,7 @@
       <% 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_1($(this).prev(),'<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
-        <%= link_to "缺评情况",student_work_absence_penalty_student_work_index_path(:homework => @homework.id), :class => "student_work_search fl", :target => "_blank"%>
+        <%= link_to "缺评情况",student_work_absence_penalty_student_work_index_path(:homework => @homework.id), :class => "student_work_search fl", :target => "_blank" if @is_teacher%>
       <% end%>
       <% if @is_teacher%>
           <div class="fr">

From 7f0da03fea166f86125ea8ad266864e275b9fc37 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 19 Jun 2015 10:21:42 +0800
Subject: [PATCH 46/46] =?UTF-8?q?=E9=9D=9E=E9=A1=B9=E7=9B=AE=E6=88=90?=
 =?UTF-8?q?=E5=91=98URL=E8=AE=BF=E9=97=AE=E7=A7=81=E6=9C=89=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 6510d65aa..6ad450315 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -457,7 +457,6 @@ class ProjectsController < ApplicationController
       end
     end
     @members = paginateHelper @members
-    render :layout => 'base_courses' if @project.project_type == 1
   end
 
   #判断指定用户是否为课程教师
@@ -676,9 +675,9 @@ class ProjectsController < ApplicationController
 
   def memberAccess
     # 是课程，则判断当前用户是否参加了课程
-    return 0 if @project.project_type == Project::ProjectType_project
-    currentUser = User.current
-    render_403 unless currentUser.member_of?(@project)
+    # return 0 if @project.project_type == Project::ProjectType_project
+    # currentUser = User.current
+    render_403 unless User.current.member_of?(@project)
   end
 
   def toggleCourse