projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2872: Rename folders to projects
[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 4517b7d57ca3de180e071db42ff7728a3fb1e518..9fd93ff8e242aec60c14574d7f61598a485680b5 100644
(file)
--- 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 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 %>
<% 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>
<colgroup>
<col width="28%" />
</colgroup>
@@
-18,7
+22,7
@@
table#users-activity-table th {
<tr>
<th rowspan="2">User</th>
<% @spans.each do |span, start_at, end_at| %>
<tr>
<th rowspan="2">User</th>
<% @spans.each do |span, start_at, end_at| %>
- <th colspan="3">
+ <th colspan="3"
class="cell-for-span-<%= span.gsub ' ','-' %>"
>
<%= span %>
<br />
<%= start_at.strftime('%b %-d') %>
<%= span %>
<br />
<%= start_at.strftime('%b %-d') %>
@@
-29,9
+33,9
@@
table#users-activity-table th {
</tr>
<tr>
<% @spans.each do |span, _| %>
</tr>
<tr>
<% @spans.each do |span, _| %>
- <th>Logins</th>
- <th>Jobs</th>
- <th>Pipelines</th>
+ <th
class="cell-for-span-<%= span.gsub ' ','-' %>"
>Logins</th>
+ <th
class="cell-for-span-<%= span.gsub ' ','-' %>"
>Jobs</th>
+ <th
class="cell-for-span-<%= span.gsub ' ','-' %>"
>Pipelines</th>
<% end %>
</tr>
<% end %>
</tr>
@@
-39,15
+43,19
@@
table#users-activity-table th {
<tr>
<td>
<small>
<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| %>
</small>
</td>
<% @spans.each do |span, _| %>
<% ['logins', 'jobs', 'pipeline_instances'].each do |type| %>
- <td>
+ <td
class="cell-for-span-<%= span.gsub ' ','-' %>"
>
<small>
<small>
- <%= @user_activity[user.uuid][span + " " + type].to_s %>
+
<%= @user_activity[user.uuid][span + " " + type].to_s %>
</small>
</td>
<% end %>
</small>
</td>
<% end %>
@@
-58,7
+66,7
@@
table#users-activity-table th {
<% content_for :footer_js do %>
$('#users-activity-table td small').each(function(){
<% 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 %>
});
<% end %>