annotate .svn/pristine/eb/eba575f0f35d5fa34b9a800fc6641ac537b6126c.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 <div class="contextual">
Chris@909 2 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
Chris@909 3 </div>
Chris@909 4
Chris@909 5 <%= render_timelog_breadcrumb %>
Chris@909 6
Chris@909 7 <h2><%= l(:label_spent_time) %></h2>
Chris@909 8
Chris@909 9 <% form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
Chris@909 10 <%= render :partial => 'date_range' %>
Chris@909 11 <% end %>
Chris@909 12
Chris@909 13 <div class="total-hours">
Chris@909 14 <p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
Chris@909 15 </div>
Chris@909 16
Chris@909 17 <% unless @entries.empty? %>
Chris@909 18 <%= render :partial => 'list', :locals => { :entries => @entries }%>
Chris@909 19 <p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
Chris@909 20
Chris@909 21 <% other_formats_links do |f| %>
Chris@909 22 <%= f.link_to 'Atom', :url => params.merge({:issue_id => @issue, :key => User.current.rss_key}) %>
Chris@909 23 <%= f.link_to 'CSV', :url => params %>
Chris@909 24 <% end %>
Chris@909 25 <% end %>
Chris@909 26
Chris@909 27 <% html_title l(:label_spent_time), l(:label_details) %>
Chris@909 28
Chris@909 29 <% content_for :header_tags do %>
Chris@909 30 <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
Chris@909 31 <% end %>