| @@ -1,68 +1,69 | |||
|
|
1 | 1 | <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2> |
|
|
2 | 2 | <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p> |
|
|
3 | 3 | |
|
|
4 | 4 | <div id="activity"> |
|
|
5 | 5 | <% @events_by_day.keys.sort.reverse.each do |day| %> |
|
|
6 | 6 | <h3><%= format_activity_day(day) %></h3> |
|
|
7 | 7 | <dl> |
|
|
8 | 8 | <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%> |
|
|
9 | 9 | <dt class="<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>"> |
|
|
10 | 10 | <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %> |
|
|
11 | 11 | <span class="time"><%= format_time(e.event_datetime, false) %></span> |
|
|
12 | 12 | <%= content_tag('span', e.project, :class => 'project') if @project.nil? || @project != e.project %> |
|
|
13 | 13 | <%= link_to format_activity_title(e.event_title), e.event_url %> |
|
|
14 | 14 | </dt> |
|
|
15 | 15 | <dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span> |
|
|
16 | 16 | <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd> |
|
|
17 | 17 | <% end -%> |
|
|
18 | 18 | </dl> |
|
|
19 | 19 | <% end -%> |
|
|
20 | 20 | </div> |
|
|
21 | 21 | |
|
|
22 | 22 | <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %> |
|
|
23 | 23 | |
|
|
24 | 24 | <div style="float:left;"> |
|
|
25 | 25 | <%= link_to_content_update("\xc2\xab " + l(:label_previous), |
|
|
26 | 26 | params.merge(:from => @date_to - @days - 1), |
|
|
27 | 27 | :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1)), |
|
|
28 | 28 | :accesskey => accesskey(:previous)) %> |
|
|
29 | 29 | </div> |
|
|
30 | 30 | <div style="float:right;"> |
|
|
31 | 31 | <%= link_to_content_update(l(:label_next) + " \xc2\xbb", |
|
|
32 | 32 | params.merge(:from => @date_to + @days - 1), |
|
|
33 | 33 | :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1)), |
|
|
34 | 34 | :accesskey => accesskey(:next)) unless @date_to >= User.current.today %> |
|
|
35 | 35 | </div> |
|
|
36 | 36 | |
|
|
37 | 37 | <% other_formats_links do |f| %> |
|
|
38 | 38 | <%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %> |
|
|
39 | 39 | <% end %> |
|
|
40 | 40 | |
|
|
41 | 41 | <% content_for :header_tags do %> |
|
|
42 | 42 | <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %> |
|
|
43 | 43 | <% end %> |
|
|
44 | 44 | |
|
|
45 | 45 | <% content_for :sidebar do %> |
|
|
46 | 46 | <%= form_tag({}, :method => :get) do %> |
|
|
47 | 47 | <h3><%= l(:label_activity) %></h3> |
|
|
48 | 48 | <ul> |
|
|
49 | 49 | <% @activity.event_types.each do |t| %> |
|
|
50 | 50 | <li> |
|
|
51 | 51 | <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> |
|
|
52 | 52 | <label for="show_<%=t%>"> |
|
|
53 | 53 | <%= link_to(l("label_#{t.singularize}_plural"), |
|
|
54 | 54 | {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%> |
|
|
55 | 55 | </label> |
|
|
56 | 56 | </li> |
|
|
57 | 57 | <% end %> |
|
|
58 | 58 | </ul> |
|
|
59 | 59 | <% if @project && @project.descendants.active.any? %> |
|
|
60 | 60 | <%= hidden_field_tag 'with_subprojects', 0, :id => nil %> |
|
|
61 | 61 | <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p> |
|
|
62 | 62 | <% end %> |
|
|
63 | 63 | <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %> |
|
|
64 | <%= hidden_field_tag('from', params[:from]) unless params[:from].blank? %> | |
|
|
64 | 65 | <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => 'submit' %></p> |
|
|
65 | 66 | <% end %> |
|
|
66 | 67 | <% end %> |
|
|
67 | 68 | |
|
|
68 | 69 | <% html_title(l(:label_activity), @author) -%> |
General Comments 0
You need to be logged in to leave comments.
Login now