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