From 881d66103b80578dee2101c0a259841e63b5b213 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 12 Jun 2015 14:59:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A=E6=8E=89?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mailer/send_for_user_activities.html.erb  | 12 -----
 .../mailer/send_for_user_activities.text.erb  | 50 +++++++++----------
 2 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 1b4e2c255..21549be21 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -10,7 +10,6 @@
           <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 class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @course_news.count %>)</span>-->
             </span>
             <% @course_news.each do |course_new|%>
                 <li style="clear: both; list-style: none;">
@@ -41,7 +40,6 @@
           <ul class="wmail_ul" style="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_homework_overview) %>
-              <!--<span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @bids.count %>)</span>-->
             </span>
             <% unless @bids.first.nil?%>
                 <% @bids.each do |bid| %>
@@ -76,7 +74,6 @@
           <ul class="wmail_ul" style="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(:view_course_journals_for_messages) %>
-              <!--<span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @course_journal_messages.count %>)</span>-->
             </span>
 
             <% @course_journal_messages.each do |course_journal_message|%>
@@ -109,7 +106,6 @@
           <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(:view_borad_course) %>
-              <!--<span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @course_messages.count %>)</span>-->
             </span>
             <% @course_messages.each do |course_message|%>
                 <li style="clear: both; list-style: none;">
@@ -137,7 +133,6 @@
           <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_course_attendingcontestwork_download) %>
-              <!--<span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @attachments.count %>)</span>-->
             </span>
             <% @attachments.each do |attachment|%>
                 <li style="clear: both; list-style: none;">
@@ -174,7 +169,6 @@
           <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 class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @issues.count %>)</span>-->
             </span>
             <% @issues.each do |issue|%>
                 <li style="clear: both; list-style: none;">
@@ -203,7 +197,6 @@
           <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(:project_moule_boards_show) %>
-              <!--<span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @project_messages.count %>)</span>-->
             </span>
             <% @project_messages.each do |project_message|%>
                 <li style="clear: both; list-style: none;">
@@ -236,7 +229,6 @@
           <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_wiki) %>
-              <!--<span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @project_news.count %>)</span>-->
             </span>
             <% @wiki_contents.each do |wikicontent|%>
                 <li style="clear: both; list-style: none;">
@@ -268,7 +260,6 @@
           <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 class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @project_news.count %>)</span>-->
             </span>
             <% @project_news.each do |project_new|%>
                 <li style="clear: both; list-style: none;">
@@ -298,7 +289,6 @@
           <ul class="wmail_ul" style="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_mail_feedback) %>
-              <!--<span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @course_journal_messages.count %>)</span>-->
             </span>
 
             <% @project_journal_messages.each do |project_journal_message|%>
@@ -336,7 +326,6 @@
       <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_user_message) %>
-          <!--<span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @user_journal_messages.count %>)</span>-->
         </span>
 
         <% @user_journal_messages.each do |user_journal_message|%>
@@ -395,7 +384,6 @@
           <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:#474646; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_user_message_forum) %>
-              <!--<span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%#= @memos.count %>)</span>-->
             </span>
 
             <% @memos.each do |memo|%>
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
index f09dcb299..c46e96f03 100644
--- a/app/views/mailer/send_for_user_activities.text.erb
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -15,13 +15,13 @@
               <%= 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)  
+              <%= 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 %>
@@ -35,7 +35,7 @@
                 [
 
                   <%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course, :token => @token.value)
-                               
+
                                 %>
                  ]
 
@@ -44,8 +44,8 @@
                <%= 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) %>
 
@@ -66,17 +66,17 @@
               [
 
               <%= 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 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) %>
 
@@ -97,7 +97,7 @@
               [
 
               <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course, :token => @token.value)
-                           
+
                             %>
               ]
 
@@ -106,8 +106,8 @@
               <%= 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) %>
 
@@ -126,7 +126,7 @@
             ▪[
 
               <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value)
-                           
+
                             %>
               ]
 
@@ -135,8 +135,8 @@
               <%= 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>
@@ -158,7 +158,7 @@
              [
 
               <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value)
-                           
+
                             %>
               ]
 
@@ -167,8 +167,8 @@
              <%= l(:label_project_issue) %>
 
               <%= link_to truncate(issue. subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value)
-                           
-                           
+
+
               %>
               <%= format_time(issue.created_on) %>
         <% end %>
@@ -185,7 +185,7 @@
           ▪[
 
               <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value)
-                           
+
                           %>
         ]
 
@@ -194,8 +194,8 @@
               <%= 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 %>
@@ -277,13 +277,13 @@
            ▪
 
               <%= 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) %>