Merge branch '18947-githttpd'

[arvados.git] / apps / workbench / app / views / users / activity.html.erb

diff --git a/apps/workbench/app/views/users/activity.html.erb b/apps/workbench/app/views/users/activity.html.erb
index 619081ff6f73847f89171e13360611fcef219738..64be1ea4a7ae44eea532af07deb008ad1d5b81d6 100644 (file)
--- a/apps/workbench/app/views/users/activity.html.erb
+++ b/apps/workbench/app/views/users/activity.html.erb
@@ -1,9 +1,17 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
 <% content_for :css do %>
 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 %>
-<table class="table table-bordered table-condensed table-fixedlayout" id="users-activity-table">
+<table class="table table-condensed arv-index" id="users-activity-table">
   <colgroup>
     <col width="28%" />
   </colgroup>
@@ -16,16 +24,22 @@ table#users-activity-table th {
   <% end %>
 
   <tr>
-    <th rowspan="2">User</th>
+    <th scope="col" rowspan="2">User</th>
     <% @spans.each do |span, start_at, end_at| %>
-    <th colspan="3" title="<%= start_at.to_s.sub(/ .*/, '') %> to <%= (end_at-1.second).to_s.sub(/ .*/, '') %>"><%= span %></th>
+    <th scope="col" colspan="3" class="cell-for-span-<%= span.gsub ' ','-' %>">
+      <%= span %>
+      <br />
+      <%= start_at.strftime('%b %-d') %>
+      -
+      <%= (end_at-1.second).strftime('%b %-d') %>
+    </th>
     <% end %>
   </tr>
   <tr>
     <% @spans.each do |span, _| %>
-    <th>Logins</th>
-    <th>Jobs</th>
-    <th>Pipelines</th>
+    <th scope="col" class="cell-for-span-<%= span.gsub ' ','-' %>">Logins</th>
+    <th scope="col" class="cell-for-span-<%= span.gsub ' ','-' %>">Jobs</th>
+    <th scope="col" class="cell-for-span-<%= span.gsub ' ','-' %>">Pipelines</th>
     <% end %>
   </tr>
 
@@ -33,15 +47,19 @@ table#users-activity-table th {
   <tr>
     <td>
       <small>
-       <%= link_to_if_arvados_object user, friendly_name: true %>
+        <% if user.uuid %>
+        <%= link_to_if_arvados_object user, friendly_name: true %>
+        <% else %>
+        <b>Total</b>
+        <% end %>
       </small>
     </td>
 
     <% @spans.each do |span, _| %>
     <% ['logins', 'jobs', 'pipeline_instances'].each do |type| %>
-    <td>
+    <td class="cell-for-span-<%= span.gsub ' ','-' %>">
       <small>
-       <%= @user_activity[user.uuid][span + " " + type].to_s %>
+        <%= @user_activity[user.uuid][span + " " + type].to_s %>
       </small>
     </td>
     <% end %>
@@ -52,7 +70,7 @@ table#users-activity-table th {
 
 <% content_for :footer_js do %>
 $('#users-activity-table td small').each(function(){
-    if ($(this).html().trim() == '0')
-       $(this).css('opacity', '0.3');
+  if ($(this).html().trim() == '0')
+    $(this).css('opacity', '0.3');
 });
 <% end %>