Revision 1298:4f746d8966dd app/views/activities

View differences:

app/views/activities/index.html.erb
15 15 
<% @events_by_day.keys.sort.reverse.each do |day| %>
16 16 
<h3><%= format_activity_day(day) %></h3>
17 17 
<dl>
18 
<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
19 
  <dt class="<%= e.event_type %>  <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
18 
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
19 
  <dt class="<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
20 20 
  <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
21 21 
  <span class="time"><%= format_time(e.event_datetime, false) %></span>
22 22 
  <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
23 
  <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
24 
  <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
23 
  <%= link_to format_activity_title(e.event_title), e.event_url %>
24 
  </dt>
25 
  <dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span>
25 26 
  <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
26 27 
<% end -%>
27 28 
</dl>
......
54 55 
<h3><%= l(:label_activity) %></h3>
55 56 
<p><% @activity.event_types.each do |t| %>
56 57 
<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
57 
<label for="show_<%=t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%></label>
58 
<label for="show_<%=t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%></label>
58 59 
<br />
59 60 
<% end %></p>
60 61 
<% if @project && @project.descendants.active.any? %>

Also available in: Unified diff