From 3300248d58d5aff42f91f49d48788864779a1b43 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Wed, 30 Sep 2015 16:48:32 +0200 Subject: [PATCH] Apply new table styling on my-project-page --- .../blocks/_spent_time.html.erb | 131 ++++++++++++------ 1 file changed, 89 insertions(+), 42 deletions(-) diff --git a/app/views/my_projects_overviews/blocks/_spent_time.html.erb b/app/views/my_projects_overviews/blocks/_spent_time.html.erb index 9fa13a7e82..7a7bac669b 100644 --- a/app/views/my_projects_overviews/blocks/_spent_time.html.erb +++ b/app/views/my_projects_overviews/blocks/_spent_time.html.erb @@ -38,47 +38,94 @@ See doc/COPYRIGHT.md for more details. <% if entries.any? %> - - - - - - - - - - <% entries_by_day.keys.sort.reverse.each do |day| %> - - - - - +
+
+
<%= l(:label_activity) %><%= Project.model_name.human %><%= TimeEntry.human_attribute_name(:comments) %><%= TimeEntry.human_attribute_name(:hours) %>
<%= day == Date.today ? l(:label_today).titleize : format_date(day) %><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %>
+ + + + + + + + + + + + + + - <% entries_by_day[day].each do |entry| -%> - - - - - - - - <% end -%> - <% end -%> - -
+
+
+ + <%= l(:label_activity) %> + +
+
+ 		+
+
+ + <%= Project.model_name.human %> + +
+
+ 		+
+
+ + <%= TimeEntry.human_attribute_name(:comments) %> + +
+
+ 		+
+
+ + <%= TimeEntry.human_attribute_name(:hours) %> + +
+
+
<%=h entry.activity %><%=h entry.project %> <%= ' - '.html_safe + link_to_work_package(entry.work_package, :truncate => 50) if entry.work_package%><%=h entry.comments %><%= html_hours("%.2f" % entry.hours) %> - <% if entry.editable_by?(@user) -%> - <%= link_to icon_wrapper('icon-context icon-edit', t(:button_edit)), - {:controller => '/timelog', :action => 'edit', :id => entry}, - :alt => l(:button_edit), - :class => 'no-decoration-on-hover', - :title => l(:button_edit) %> - <%= link_to icon_wrapper('icon-context icon-delete', t(:button_delete)), - {:controller => '/timelog', :action => 'destroy', :id => entry}, - :confirm => l(:text_are_you_sure), - :method => :delete, - :class => 'no-decoration-on-hover', - :alt => l(:button_delete), - :title => l(:button_delete) %> - <% end -%> -
+ + + <% entries_by_day.keys.sort.reverse.each do |day| %> + + <%= day == Date.today ? l(:label_today).titleize : format_date(day) %> + + + <%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %> + + + <% entries_by_day[day].each do |entry| -%> + + <%=h entry.activity %> + <%=h entry.project %> <%= ' - '.html_safe + link_to_work_package(entry.work_package, :truncate => 50) if entry.work_package%> + <%=h entry.comments %> + <%= html_hours("%.2f" % entry.hours) %> + + <% if entry.editable_by?(@user) -%> + <%= link_to icon_wrapper('icon-context icon-edit', t(:button_edit)), + {:controller => '/timelog', :action => 'edit', :id => entry}, + :alt => l(:button_edit), + :class => 'no-decoration-on-hover', + :title => l(:button_edit) %> + <%= link_to icon_wrapper('icon-context icon-delete', t(:button_delete)), + {:controller => '/timelog', :action => 'destroy', :id => entry}, + :confirm => l(:text_are_you_sure), + :method => :delete, + :class => 'no-decoration-on-hover', + :alt => l(:button_delete), + :title => l(:button_delete) %> + <% end -%> + + + <% end -%> + <% end -%> + + +
+ + <% end %>