summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/my/blocks/_timelog.html.erb32
1 files changed, 12 insertions, 20 deletions
diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb
index 6f4081f4e..bbdb194de 100644
--- a/app/views/my/blocks/_timelog.html.erb
+++ b/app/views/my/blocks/_timelog.html.erb
@@ -14,44 +14,36 @@ entries_by_day = entries.group_by(&:spent_on)
</h3>
<% if entries.any? %>
+<%= form_tag({}, :data => {:cm_url => time_entries_context_menu_path}) do %>
<table class="list time-entries">
<thead><tr>
<th><%= l(:label_activity) %></th>
<th><%= l(:label_project) %></th>
<th><%= l(:field_comments) %></th>
<th><%= l(:field_hours) %></th>
-<th></th>
</tr></thead>
<tbody>
<% entries_by_day.keys.sort.reverse.each do |day| %>
- <tr class="odd">
+ <tr class="odd">
<td><strong><%= day == User.current.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"><%= entry.activity %></td>
+ </tr>
+ <% entries_by_day[day].each do |entry| -%>
+ <tr class="time-entry hascontextmenu" style="border-bottom: 1px solid #f5f5f5;">
+ <td class="activity">
+ <%= check_box_tag("ids[]", entry.id, false, :style => 'display:none;', :id => nil) %>
+ <%= entry.activity %>
+ </td>
<td class="subject"><%= entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
<td class="comments"><%= entry.comments %></td>
<td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
- <td class="buttons">
- <% if entry.editable_by?(@user) -%>
- <%= link_to l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => entry},
- :title => l(:button_edit),
- :class => 'icon-only icon-edit' %>
- <%= link_to l(:button_delete), {:controller => 'timelog', :action => 'destroy', :id => entry},
- :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,
- :title => l(:button_delete),
- :class => 'icon-only icon-del' %>
- <% end -%>
- </td>
- </tr>
- <% end -%>
+ </tr>
+ <% end -%>
<% end -%>
</tbody>
</table>
+<% end %>
<% else %>
<p class="nodata"><%= l(:label_no_data) %></p>
<% end %>