X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4127b85f2c1af611bb70d5ab469adac126d0a7a4..8dd84d8f667aa40b9c8ce91d1a9248e1a7218039:/apps/workbench/app/views/users/activity.html.erb?ds=sidebyside diff --git a/apps/workbench/app/views/users/activity.html.erb b/apps/workbench/app/views/users/activity.html.erb index 4517b7d57c..eaf296af09 100644 --- a/apps/workbench/app/views/users/activity.html.erb +++ b/apps/workbench/app/views/users/activity.html.erb @@ -2,8 +2,12 @@ table#users-activity-table th { overflow-x: hidden; } +table#users-activity-table .cell-for-span-This-month, +table#users-activity-table .cell-for-span-Last-month { + background: #eee; +} <% end %> - +
@@ -18,7 +22,7 @@ table#users-activity-table th { <% @spans.each do |span, start_at, end_at| %> - <% @spans.each do |span, _| %> - - - + + + <% end %> @@ -39,13 +43,17 @@ table#users-activity-table th { <% @spans.each do |span, _| %> <% ['logins', 'jobs', 'pipeline_instances'].each do |type| %> -
User + <%= span %>
<%= start_at.strftime('%b %-d') %> @@ -29,9 +33,9 @@ table#users-activity-table th {
LoginsJobsPipelinesLoginsJobsPipelines
+ <% if user.uuid %> <%= link_to_if_arvados_object user, friendly_name: true %> + <% else %> + Total + <% end %> + <%= @user_activity[user.uuid][span + " " + type].to_s %>