From f3f0a9847f7b20418800739685c762b0735bba69 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 16 Jun 2015 11:45:30 +0800 Subject: [PATCH] =?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 | 471 +++++++----------- 2 files changed, 183 insertions(+), 295 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 @@

<%= @subject %>

-<% 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 %>

<%= l(:label_course_overview)%>

@@ -65,7 +65,7 @@ <% 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 %>

<%= l(:label_project_overview_new)%>

<% 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.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value) - - - %> <%= format_time(course_new.created_on) %> + ▪[<%= 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.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value) %> + <%= format_time(course_new.created_on) %> <% end %> + <% end %> - <% end %> - <% unless @bids.empty? %> - <%= l(:label_homework_overview) %> + <% 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 %> + + <% 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 %> - - <% 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) %> - + ▪[<%= 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 %> - - - <% 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 %> + + <% 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 %> + <% 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 %> <% 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 %> - <% 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 %> - <% 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 %> + <% 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 %> + <% 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 %> <% [: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 %>