annotate .svn/pristine/e0/e0ded1cb3e9db9162722719b443602d020469fa5.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2>
Chris@909 2 <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
Chris@909 3
Chris@909 4 <div id="activity">
Chris@909 5 <% @events_by_day.keys.sort.reverse.each do |day| %>
Chris@909 6 <h3><%= format_activity_day(day) %></h3>
Chris@909 7 <dl>
Chris@909 8 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
Chris@909 9 <dt class="<%= e.event_type %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
Chris@909 10 <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
Chris@909 11 <span class="time"><%= format_time(e.event_datetime, false) %></span>
Chris@909 12 <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
Chris@909 13 <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
Chris@909 14 <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
Chris@909 15 <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
Chris@909 16 <% end -%>
Chris@909 17 </dl>
Chris@909 18 <% end -%>
Chris@909 19 </div>
Chris@909 20
Chris@909 21 <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
Chris@909 22
Chris@909 23 <div style="float:left;">
Chris@909 24 <%= link_to_content_update("\xc2\xab " + l(:label_previous),
Chris@909 25 params.merge(:from => @date_to - @days - 1),
Chris@909 26 :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1))) %>
Chris@909 27 </div>
Chris@909 28 <div style="float:right;">
Chris@909 29 <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
Chris@909 30 params.merge(:from => @date_to + @days - 1),
Chris@909 31 :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %>
Chris@909 32 </div>
Chris@909 33 &nbsp;
Chris@909 34 <% other_formats_links do |f| %>
Chris@909 35 <%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
Chris@909 36 <% end %>
Chris@909 37
Chris@909 38 <% content_for :header_tags do %>
Chris@909 39 <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
Chris@909 40 <% end %>
Chris@909 41
Chris@909 42 <% content_for :sidebar do %>
Chris@909 43 <% form_tag({}, :method => :get) do %>
Chris@909 44 <h3><%= l(:label_activity) %></h3>
Chris@909 45 <p><% @activity.event_types.each do |t| %>
Chris@909 46 <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
Chris@909 47 <label for="show_<%=t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%></label>
Chris@909 48 <br />
Chris@909 49 <% end %></p>
Chris@909 50 <% if @project && @project.descendants.active.any? %>
Chris@909 51 <%= hidden_field_tag 'with_subprojects', 0 %>
Chris@909 52 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
Chris@909 53 <% end %>
Chris@909 54 <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
Chris@909 55 <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
Chris@909 56 <% end %>
Chris@909 57 <% end %>
Chris@909 58
Chris@909 59 <% html_title(l(:label_activity), @author) -%>