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 @@
<%= l(:label_course_news) %>
-
<% @course_news.each do |course_new|%>
-
@@ -41,7 +40,6 @@
<%= l(:label_homework_overview) %>
-
<% unless @bids.first.nil?%>
<% @bids.each do |bid| %>
@@ -76,7 +74,6 @@
<%= l(:view_course_journals_for_messages) %>
-
<% @course_journal_messages.each do |course_journal_message|%>
@@ -109,7 +106,6 @@
<%= l(:view_borad_course) %>
-
<% @course_messages.each do |course_message|%>
-
@@ -137,7 +133,6 @@
<%= l(:label_course_attendingcontestwork_download) %>
-
<% @attachments.each do |attachment|%>
-
@@ -174,7 +169,6 @@
<%= l(:label_issue_tracking) %>
-
<% @issues.each do |issue|%>
-
@@ -203,7 +197,6 @@
<%= l(:project_moule_boards_show) %>
-
<% @project_messages.each do |project_message|%>
-
@@ -236,7 +229,6 @@
<%= l(:label_wiki) %>
-
<% @wiki_contents.each do |wikicontent|%>
-
@@ -268,7 +260,6 @@
<%= l(:label_project_news) %>
-
<% @project_news.each do |project_new|%>
-
@@ -298,7 +289,6 @@
<%= l(:label_project_mail_feedback) %>
-
<% @project_journal_messages.each do |project_journal_message|%>
@@ -336,7 +326,6 @@
<%= l(:label_user_message) %>
-
<% @user_journal_messages.each do |user_journal_message|%>
@@ -395,7 +384,6 @@
<%= l(:label_user_message_forum) %>
-
<% @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) %>
@@ -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) %>