jro_apps/redmine Commit - r2068:0399b85ab618

Adds links between account and user's activity pages....

Jean-Philippe Lang -

r2068:0399b85ab618

parent child

Context file:

r2068:0399b85ab618

Collapse all files

app/views/account/show.rhtml +1 -1

             <div class="contextual">
             <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
             </div>
             <h2><%= avatar @user %> <%=h @user.name %></h2>
             <div class="splitcontentleft">
             <p>
             <%= mail_to(h(@user.mail)) unless @user.pref.hide_mail %>
             <ul>
                 <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
             <% for custom_value in @custom_values %>
             <% if !custom_value.value.empty? %>
                 <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
             <% end %>
             <% end %>
             </ul>
             </p>
             <% unless @memberships.empty? %>
             <h3><%=l(:label_project_plural)%></h3>
             <ul>
             <% for membership in @memberships %>
             	<li><%= link_to(h(membership.project.name), :controller => 'projects', :action => 'show', :id => membership.project) %>
                 (<%=h membership.role.name %>, <%= format_date(membership.created_on) %>)</li>
             <% end %>
             </ul>
             <% end %>
             </div>
             <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]) %>
             </p>
             <div id="activity">
             <% @events_by_day.keys.sort.reverse.each do |day| %>
             <h4><%= format_activity_day(day) %></h4>
             <dl>
             <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
               <dt class="<%= e.event_type %>">
               <span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', h(e.project), :class => 'project') %>
               <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
               <dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd>
             <% end -%>
             </dl>
             <% end -%>
             </div>
             <p class="other-formats">
                 <%= l(:label_export_to) %>
                 <%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key}, :class => 'feed' %>
             </p>
             <% content_for :header_tags do %>
             		<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
             <% end %>
             <% end %>
             </div>
             <% html_title @user.name %>

app/views/projects/activity.rhtml +1 -1

-            <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">
             <% @events_by_day.keys.sort.reverse.each do |day| %>
             <h3><%= format_activity_day(day) %></h3>
             <dl>
             <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
               <dt class="<%= e.event_type %>  <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
             	<%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
               <span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
               <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
               <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
               <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
             <% end -%>
             </dl>
             <% end -%>
             </div>
             <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
             <div style="float:left;">
             <%= link_to_remote(('&#171; ' + l(:label_previous)),
                                {:update => "content", :url => params.merge(:from => @date_to - @days - 1), :complete => 'window.scrollTo(0,0)'},
                                {:href => url_for(params.merge(:from => @date_to - @days - 1)),
                                 :title => "#{l(:label_date_from)} #{format_date(@date_to - 2*@days)} #{l(:label_date_to).downcase} #{format_date(@date_to - @days - 1)}"}) %>
             </div>
             <div style="float:right;">
             <%= link_to_remote((l(:label_next) + ' &#187;'),
                                {:update => "content", :url => params.merge(:from => @date_to + @days - 1), :complete => 'window.scrollTo(0,0)'},
                                {:href => url_for(params.merge(:from => @date_to + @days - 1)),
                                 :title => "#{l(:label_date_from)} #{format_date(@date_to)} #{l(:label_date_to).downcase} #{format_date(@date_to + @days - 1)}"}) unless @date_to >= Date.today %>
             </div>
             &nbsp;
             <p class="other-formats">
                 <%= l(:label_export_to) %>
                 <%= link_to 'Atom', params.merge(:format => :atom, :from => nil, :key => User.current.rss_key), :class => 'feed' %>
             </p>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
             <% end %>
             <% content_for :sidebar do %>
             <% form_tag({}, :method => :get) do %>
             <h3><%= l(:label_activity) %></h3>
             <p><% @activity.event_types.each do |t| %>
             <label><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
             <% end %></p>
             <% if @project && @project.active_children.any? %>
                 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
                 <%= hidden_field_tag 'with_subprojects', 0 %>
             <% end %>
             <%= hidden_field_tag 'user_id', params[:user_id] %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
             <% end %>
             <% end %>
             <% html_title(l(:label_activity), @author) -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages