##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: New multi-line macros regexp is too eager (#11736)....
Fixed: New multi-line macros regexp is too eager (#11736). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10276 e93f8b46-1217-0410-a6f0-8f06a7374b81
Jean-Philippe Lang - - Load All Authors

File last commit:

r9754:7b40767428ac
r10093:8b72710d7ee3
Show More
_timelog.html.erb
52 lines | 2.3 KiB | text/plain | TextLexer
/ app / views / my / blocks / _timelog.html.erb
History | Source | Raw |Copy content |Copy permalink
Jean-Philippe Lang
Add a time tracking block for 'My page' (#615)....
 r1245 <h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
Toshi MARUYAMA
remove trailing white-spaces from app/views/my/blocks/_timelog.html.erb...
 r7100 <%
Jean-Philippe Lang
Add a time tracking block for 'My page' (#615)....
 r1245 entries = TimeEntry.find(:all,
Toshi MARUYAMA
replace tabs to spaces at app/views/my/blocks/_timelog.html.erb...
 r7207 :conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
:include => [:activity, :project, {:issue => [:tracker, :status]}],
:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
Jean-Philippe Lang
Add a time tracking block for 'My page' (#615)....
 r1245 entries_by_day = entries.group_by(&:spent_on)
%>
<div class="total-hours">
<p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
</div>
<% if entries.any? %>
<table class="list time-entries">
Jean-Philippe Lang
Adds missing thead tags (#5440)....
 r3620 <thead><tr>
Jean-Philippe Lang
Add a time tracking block for 'My page' (#615)....
 r1245 <th><%= l(:label_activity) %></th>
<th><%= l(:label_project) %></th>
<th><%= l(:field_comments) %></th>
<th><%= l(:field_hours) %></th>
<th></th>
Jean-Philippe Lang
Adds missing thead tags (#5440)....
 r3620 </tr></thead>
Jean-Philippe Lang
Add a time tracking block for 'My page' (#615)....
 r1245 <tbody>
<% entries_by_day.keys.sort.reverse.each do |day| %>
<tr class="odd">
<td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
<td colspan="2"></td>
<td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
<td></td>
</tr>
<% entries_by_day[day].each do |entry| -%>
<tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
<td class="activity"><%=h entry.activity %></td>
Jean-Philippe Lang
Fixed that the issue link is escaped on my page spent time (#10991)....
 r9526 <td class="subject"><%=h entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
Jean-Philippe Lang
Add a time tracking block for 'My page' (#615)....
 r1245 <td class="comments"><%=h entry.comments %></td>
<td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
<td align="center">
<% if entry.editable_by?(@user) -%>
<%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
:title => l(:button_edit) %>
<%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
Jean-Philippe Lang
Deprecated :confirm => 'Text' option....
 r9754 :data => {:confirm => l(:text_are_you_sure)},
Eric Davis
Use HTTP DELETE when deleting a time entry. #6674...
 r4145 :method => :delete,
Jean-Philippe Lang
Add a time tracking block for 'My page' (#615)....
 r1245 :title => l(:button_delete) %>
<% end -%>
</td>
</tr>
<% end -%>
<% end -%>
Jean-Philippe Lang
Typos/fixes in views (#2654)....
 r2356 </tbody>
Jean-Philippe Lang
Add a time tracking block for 'My page' (#615)....
 r1245 </table>
<% end %>