summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-11-30 13:38:07 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-11-30 13:38:07 +0000
commit0399b85ab61858e593a8831039b5086444e5c7b1 (patch)
treeee70c90cd3348f066b775ec040f5cf2c2993415a /app/views
parent9e5edfb7282c450108289364d90406af54b0ca82 (diff)
downloadredmine-0399b85ab61858e593a8831039b5086444e5c7b1.tar.gz
redmine-0399b85ab61858e593a8831039b5086444e5c7b1.zip
Adds links between account and user's activity pages.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2070 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r--app/views/account/show.rhtml2
-rw-r--r--app/views/projects/activity.rhtml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml
index c86fa59c4..8cdf98704 100644
--- a/app/views/account/show.rhtml
+++ b/app/views/account/show.rhtml
@@ -31,7 +31,7 @@
<div class="splitcontentright">
<% unless @events_by_day.empty? %>
-<h3><%=l(:label_activity)%></h3>
+<h3><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :user_id => @user, :from => @events_by_day.keys.first %></h3>
<p>
<%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index 585393e84..784a5ac39 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -1,4 +1,4 @@
-<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, @author.to_s) %></h2>
+<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2>
<p class="subtitle"><%= "#{l(:label_date_from)} #{format_date(@date_to - @days)} #{l(:label_date_to).downcase} #{format_date(@date_to-1)}" %></p>
<div id="activity">