##// END OF EJS Templates
Don't render an empty li tag (#23192)....
Jean-Philippe Lang -
r15215:aadddc9427b4
parent child
Show More
@@ -1,72 +1,72
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 <span class="pagination">
25 25 <ul class="pages">
26 26 <li class="previous page">
27 27 <%= link_to_content_update("\xc2\xab " + l(:label_previous),
28 28 params.merge(:from => @date_to - @days - 1),
29 29 :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1)),
30 30 :accesskey => accesskey(:previous)) %>
31 </li><li class="next page">
31 </li><% unless @date_to >= User.current.today %><li class="next page">
32 32 <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
33 33 params.merge(:from => @date_to + @days - 1),
34 34 :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1)),
35 :accesskey => accesskey(:next)) unless @date_to >= User.current.today %>
35 :accesskey => accesskey(:next)) %><% end %>
36 36 </li>
37 37 </ul>
38 38 </span>
39 39 &nbsp;
40 40 <% other_formats_links do |f| %>
41 41 <%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
42 42 <% end %>
43 43
44 44 <% content_for :header_tags do %>
45 45 <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
46 46 <% end %>
47 47
48 48 <% content_for :sidebar do %>
49 49 <%= form_tag({}, :method => :get) do %>
50 50 <h3><%= l(:label_activity) %></h3>
51 51 <ul>
52 52 <% @activity.event_types.each do |t| %>
53 53 <li>
54 54 <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
55 55 <label for="show_<%=t%>">
56 56 <%= link_to(l("label_#{t.singularize}_plural"),
57 57 {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%>
58 58 </label>
59 59 </li>
60 60 <% end %>
61 61 </ul>
62 62 <% if @project && @project.descendants.active.any? %>
63 63 <%= hidden_field_tag 'with_subprojects', 0, :id => nil %>
64 64 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
65 65 <% end %>
66 66 <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
67 67 <%= hidden_field_tag('from', params[:from]) unless params[:from].blank? %>
68 68 <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => 'submit' %></p>
69 69 <% end %>
70 70 <% end %>
71 71
72 72 <% html_title(l(:label_activity), @author) -%>
General Comments 0
You need to be logged in to leave comments. Login now