diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index ae5604099..7fdd737e3 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -16,16 +16,16 @@
▪
[
- <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value),
+ <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to course_new.author, user_activities_url(course_new.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_project_notice) %>
- <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
+ <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -39,17 +39,17 @@
▪
[
<% 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),
+ <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<% end %>
]
- <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_project_notice_reply) %>
- <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value),
+ <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -72,16 +72,16 @@
▪
[
- <%= link_to truncate(bid.course.name,length: 30,omission: '...'), course_url(bid.course, :token => @token.value),
+ <%= link_to truncate(bid.course.name,length: 30,omission: '...'), course_url(bid.course),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value), :class => "wmail_name",
+ <%= link_to bid.user, user_activities_url(bid.user), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_course_homework) %>
- <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_url(:homework => bid.id,:token => @token.value),
+ <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_url(:homework => bid.id),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -105,16 +105,16 @@
▪
[
- <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value),
+ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
+ <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_send_course_journals_for_messages) %>
- <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value),
+ <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -135,14 +135,14 @@
▪
[
- <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id, :token => @token.value),
+ <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to course_message.author, user_activities_url(course_message.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_send_course_messages) %>
- <%= link_to truncate(course_message.subject.html_safe,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value),
+ <%= link_to truncate(course_message.subject.html_safe,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<%= format_time(course_message.created_on) %>
@@ -163,16 +163,16 @@
▪
[
- <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value),
+ <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to attachment.author, user_activities_url(attachment.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_course_file_upload) %>
- <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value),
+ <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -199,14 +199,14 @@
▪
[
- <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value),
+ <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to issue.author, user_activities_url(issue.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_project_issue) %>
- <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue, :token => @token.value),
+ <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue),
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
<%= format_time(issue.created_on) %>
@@ -217,14 +217,14 @@
▪
[
- <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value),
+ <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
+ <%= link_to issues_journal.user, user_activities_url(issues_journal.user), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_project_issue_update) %>
- <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue, :token => @token.value),
+ <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue),
:style => "color:#2E8DD7;float:left;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;",
:onmouseover =>"message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))"
@@ -251,16 +251,16 @@
▪
[
- <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value),
+ <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to project_message.author, user_activities_url(project_message.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= 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),
+ <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -283,16 +283,16 @@
▪
[
<% unless wikicontent.page.nil? %>
- <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value),
+ <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<% end %>
]
- <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to wikicontent.author, user_activities_url(wikicontent.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_wiki_mail_notification) %>
<% unless wikicontent.page.nil? %>
- <%= link_to wikicontent.text.gsub("","").gsub("
","").gsub("
","").html_safe, project_wiki_url(wikicontent.page.wiki,:token => @token.value),
+ <%= link_to wikicontent.text.gsub("","").gsub("
","").gsub("
","").html_safe, project_wiki_url(wikicontent.page.wiki),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; max-width:400px;height:23px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<% end %>
@@ -314,15 +314,15 @@
▪
[
- <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value),
+ <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to project_new.author, user_activities_url(project_new.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_project_mail_notice) %>
- <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value),
+ <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<%= format_time(project_new.created_on) %>
@@ -336,16 +336,16 @@
▪
[
<% 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),
+ <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<% end %>
]
- <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:lable_project_mail_notice_reply) %>
- <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value),
+ <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<%= format_time(project_news_comment.created_on) %>
@@ -366,16 +366,16 @@
▪
[
- <%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value),
+ <%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value), :class => "wmail_name",
+ <%= link_to project_attachment.author, user_activities_url(project_attachment.author), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_project_mail_upload) %>
- <%= 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),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -398,16 +398,16 @@
▪
[
- <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value),
+ <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project),
:class=> "wmail_column",
:style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
]
- <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value), :class => "wmail_name",
+ <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<%= l(:label_send_course_journals_for_messages) %>
- <%= link_to project_journal_message.notes.gsub("","").gsub("
","").gsub("
","").html_safe, project_feedback_url(project_journal_message.project,:token => @token.value),
+ <%= link_to project_journal_message.notes.gsub("","").gsub("
","").gsub("
","").html_safe, project_feedback_url(project_journal_message.project),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -434,12 +434,12 @@
▪
- <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value),
+ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user),
:class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<%= l(:label_show_your_message) %>
- <%= link_to user_journal_message.notes.gsub("","").gsub("
","").gsub("
","").html_safe,feedback_url(@user,:token => @token.value),
+ <%= link_to user_journal_message.notes.gsub("","").gsub("
","").gsub("
","").html_safe,feedback_url(@user),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -466,12 +466,12 @@
▪
- <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value),
+ <%= link_to forum.creator, user_activities_url(forum.creator),
:class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<%= l(:label_forum_new) %>
- <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value),
+ <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum),
:class => 'wmail_info',
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
@@ -492,7 +492,7 @@
▪
- <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value),
+ <%= link_to memo.author, user_activities_url(memo.author),
:class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
@@ -516,7 +516,7 @@
<% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == 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;" %>
+ <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
<% end %>
<% end %>
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
index f86dec62d..f4c354790 100644
--- a/app/views/mailer/send_for_user_activities.text.erb
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -6,11 +6,11 @@
<%= 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 truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course)%> ]
- <%= 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) %>
<%= l(:label_project_notice) %>
- <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value) %>
+ <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new) %>
<%= format_time(course_new.created_on) %>
<% end %>
<% end %>
@@ -19,12 +19,12 @@
<%= 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) %>
+ <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course) %>
<% end %>
]
- <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value) %>
+ <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author) %>
<%= l(:label_project_notice_reply) %>
- <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value) %>
+ <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented) %>
<%= format_time(course_news_comment.created_on) %>
<% end %>
<% end %>
@@ -33,10 +33,10 @@
<%= 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) %>
+ ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course) %>]
+ <%= link_to bid.user, user_activities_url(bid.user) %>
<%= l(:label_course_homework) %>
- <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value) %>
+ <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id) %>
<%= format_time(bid.created_at) %>
<% end %>
<% end %>
@@ -46,10 +46,10 @@
<% 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) %>]
+ <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user) %>
<%= l(:label_send_course_journals_for_messages) %>
- <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %>
+ <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course) %>
<%= format_time(course_journal_message.created_on) %>
<% end %>
<% end %>
@@ -57,10 +57,10 @@
<% 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) %>
+ ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course)%>]
+ <%= link_to course_message.author, user_activities_url(course_message.author) %>
<%= 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) %>
+ <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id) %>
<%= format_time(course_message.created_on) %>
<% end %>
<% end %>
@@ -68,10 +68,10 @@
<% unless @attachments.first.nil? %>
<%= l(:label_course_mail_files) %>
<% @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) %>
+ ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course) %>]
+ <%= link_to attachment.author, user_activities_url(attachment.author) %>
<%= l(:label_course_file_upload) %>
- <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value) %>
+ <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course) %>
<%= format_time(attachment.created_on) %>
<% end %>
@@ -86,10 +86,10 @@
<% 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) %>
+ ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project) %>]
+ <%= link_to issue.author, user_activities_url(issue.author) %>
<%= l(:label_project_issue) %>
- <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue, :token => @token.value) %>
+ <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue) %>
<%= format_time(issue.created_on) %>
<% end %>
@@ -99,13 +99,13 @@
<% 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) %>
+ ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project) %>]
+ <%= link_to issues_journal.user, user_activities_url(issues_journal.user) %>
<%= l(:label_project_issue_update) %>
<% if issues_journal.notes.nil? %>
- <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue, :token => @token.value) %>
+ <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue) %>
<% else %>
- <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue, :token => @token.value) %>
+ <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue) %>
<% end %>
<%= format_time(issues_journal.created_on) %>
<% end %>
@@ -115,10 +115,10 @@
<% 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, user_activities_url(project_message.author,:token => @token.value) %>
+ ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project) %>]
+ <%= link_to project_message.author, user_activities_url(project_message.author) %>
<%= 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) %>
+ <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id) %>
<%= format_time(project_message.created_on) %>
<% end %>
@@ -129,13 +129,13 @@
<%= 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) %>
+ <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project) %>
<% end %>
]
- <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value) %>
+ <%= link_to wikicontent.author, user_activities_url(wikicontent.author) %>
<%= 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) %>
+ <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki) %>
<% end %>
<%= format_time(wikicontent.updated_on) %>
<% end %>
@@ -145,10 +145,10 @@
<% 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) %>
+ ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project) %> ]
+ <%= link_to project_new.author, user_activities_url(project_new.author) %>
<%= l(:label_project_mail_notice) %>
- <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %>
+ <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new) %>
<%= format_time(project_new.created_on) %>
<% end %>
<% end %>
@@ -158,11 +158,11 @@
<%= 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) %>
+ <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project) %>
<% end %>]
- <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value) %>
+ <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author) %>
<%= l(:lable_project_mail_notice_reply) %>
- <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value) %>
+ <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented) %>
<%= format_time(project_news_comment.created_on) %>
<% end %>
@@ -172,10 +172,10 @@
<% 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) %>
+ ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project) %>]
+ <%= link_to project_attachment.author, user_activities_url(project_attachment.author) %>
<%= l(:label_project_mail_upload) %>
- <%= 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) %>
<%= format_time(project_attachment.created_on) %>
<% end %>
<% end %>
@@ -184,10 +184,10 @@
<% 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) %>
+ ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project) %> ]
+ <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user) %>
<%= 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) %>
+ <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project) %>
<%= format_time(project_journal_message.created_on) %>
<% end %>
@@ -202,9 +202,9 @@
<%= 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)%>
+ ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user)%>
<%= l(:label_show_your_message) %>
- <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %>
+ <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user) %>
<%= format_time(user_journal_message.created_on) %>
<% end %>
<% end %>
@@ -214,9 +214,9 @@
<% unless @forums.first.nil? %>
<%= l(:label_user_forum) %>
<% @forums.each do |forum|%>
- ▪<%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
+ ▪<%= link_to forum.creator, user_activities_url(forum.creator) %>
<%= l(:label_forum_new) %>
- <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %>
+ <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum) %>
<%= format_time(forum.created_at) %>
<% end %>
@@ -224,7 +224,7 @@
<% 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)%>
+ ▪<%= link_to memo.author, user_activities_url(memo.author)%>
<%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
<%= link_to truncate(memo.subject.html_safe,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%>
<%= format_time(memo.created_at) %>
@@ -238,6 +238,6 @@
<% 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;" %>
+ <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
<% end %>
<% end %>