Revision 912:5e80956cc792 app/views/activities

View differences:

app/views/activities/index.html.erb
7 7 
<dl>
8 8 
<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
9 9 
  <dt class="<%= e.event_type %>  <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
10 
	<%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
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', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
13 13 
  <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
14 14 
  <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
15 
  <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
15 
  <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
16 16 
<% end -%>
17 17 
</dl>
18 18 
<% end -%>
......
21 21 
<%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
22 22 

  		




  23
  23
  
    
<div style="float:left;">


  		




  24
  
  
    
<%= link_to_content_update('&#171; ' + l(:label_previous), 


  		




  
  24
  
    
<%= link_to_content_update("\xc2\xab " + l(:label_previous),


  		




  25
  25
  
    
                   params.merge(:from => @date_to - @days - 1),


  		




  26
  26
  
    
                   :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1))) %>


  		




  27
  27
  
    
</div>


  		




  28
  28
  
    
<div style="float:right;">


  		




  29
  
  
    
<%= link_to_content_update(l(:label_next) + ' &#187;', 


  		




  
  29
  
    
<%= link_to_content_update(l(:label_next) + " \xc2\xbb",


  		




  30
  30
  
    
                   params.merge(:from => @date_to + @days - 1),


  		




  31
  31
  
    
                   :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %>


  		




  32
  32
  
    
</div>


  		




  33
  33
  
    
&nbsp;


  		




  34
  34
  
    
<% other_formats_links do |f| %>


  		




  35
  
  
    
	<%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>


  		




  
  35
  
    
  <%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>


  		




  36
  36
  
    
<% end %>


  		




  37
  37
  
    

  		




  38
  38
  
    
<% content_for :header_tags do %>


  		




  ......




  44
  44
  
    
<h3><%= l(:label_activity) %></h3>


  		




  45
  45
  
    
<p><% @activity.event_types.each do |t| %>


  		




  46
  46
  
    
<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>


  		




  47
  
  
    
<%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%>


  		




  
  47
  
    
<label for="show_<%=t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%></label>


  		




  48
  48
  
    
<br />


  		




  49
  49
  
    
<% end %></p>


  		




  50
  50
  
    
<% if @project && @project.descendants.active.any? %>


  		




  51
  
  
    
	  <%= hidden_field_tag 'with_subprojects', 0 %>


  		




  
  51
  
    
    <%= hidden_field_tag 'with_subprojects', 0 %>


  		




  52
  52
  
    
    <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>


  		




  53
  53
  
    
<% end %>


  		




  54
  54
  
    
<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>


  		












Also available in:  Unified diff