[ARVADOS] updated: 6acfb92f4e97007dd1b224ff8e74c104f250ddb8

[git at public.curoverse.com]

Summary of changes:
 apps/admin/list-inactive-users.rb                  |   24 --------------------
 apps/workbench/app/helpers/provenance_helper.rb    |   12 +--------
 .../app/views/layouts/application.html.erb         |    4 +-
 ...ext_compare.html.erb => _show_compare.html.erb} |    0
 .../views/pipeline_instances/_show_graph.html.erb  |   19 ++++++++++-----
 apps/workbench/app/views/users/_tables.html.erb    |    3 +-
 6 files changed, 19 insertions(+), 43 deletions(-)
 delete mode 100755 apps/admin/list-inactive-users.rb
 rename apps/workbench/app/views/pipeline_instances/{_show_text_compare.html.erb => _show_compare.html.erb} (100%)

       via  6acfb92f4e97007dd1b224ff8e74c104f250ddb8 (commit)
       via  b9e00c9e7ca0f7ab0184bd552a7783806cc0fd93 (commit)
       via  c2f564cd1359018e881857fe88c5bd7898318cc3 (commit)
       via  f5db24cc5434844e370cb2d959c6aa7800179159 (commit)
       via  e28dffcdee490a7da674f69d4b9d5cec086f8c41 (commit)
       via  ae0720ea3b92ff165f95b0eafc6d85f736f5ae5f (commit)
      from  9065715dd01b90f961a2b5118686075dfc13e458 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 6acfb92f4e97007dd1b224ff8e74c104f250ddb8
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Feb 12 11:40:21 2014 -0800

    Fix up legend colors and labels on pipeline_instances > compare > graph.

diff --git a/apps/workbench/app/helpers/provenance_helper.rb b/apps/workbench/app/helpers/provenance_helper.rb
index cb2d924..ae4d251 100644
--- a/apps/workbench/app/helpers/provenance_helper.rb
+++ b/apps/workbench/app/helpers/provenance_helper.rb
@@ -25,16 +25,8 @@ module ProvenanceHelper
     end
 
     def determine_fillcolor(n)
-      bgcolor = ""
-      case n
-      when 1
-        bgcolor = "style=filled,fillcolor=\"#88ff88\""
-      when 2
-        bgcolor = "style=filled,fillcolor=\"#8888ff\""
-      when 3
-        bgcolor = "style=filled,fillcolor=\"#88ffff\""
-      end
-      bgcolor
+      fillcolor = %w(aaaaaa aaffaa aaaaff aaaaaa ffaaaa)[n || 0] || 'aaaaaa'
+      "style=filled,fillcolor=\"##{fillcolor}\""
     end
 
     def describe_node(uuid)
diff --git a/apps/workbench/app/views/pipeline_instances/_show_graph.html.erb b/apps/workbench/app/views/pipeline_instances/_show_graph.html.erb
index ad3a8bb..e96ff16 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_graph.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_graph.html.erb
@@ -1,15 +1,22 @@
 <% content_for :css do %>
   .pipeline_color_legend {
-    padding-left: 1em;
-    padding-right: 1em;
+    margin-top: 0.2em;
+    padding: 0.2em 1em;
+    border: 1px solid #000;
+  }
+  .pipeline_color_legend a {
+    color: #000;
   }
 <% end %>
 
 <% if @pipelines.count > 1 %>
-  <div style="text-align: center">
-    <span class="pipeline_color_legend" style="background: #88ff88">This pipeline</span> 
-    <span class="pipeline_color_legend" style="background: #8888ff">Comparison pipeline</span>
-    <span class="pipeline_color_legend" style="background: #88ffff">Shared by both pipelines</span>
+  <div style="text-align: center; padding-top: 0.5em">
+    <span class="pipeline_color_legend" style="background: #aaffaa"><%= link_to_if_arvados_object @pipelines[0], friendly_name: true %></span>
+    <span class="pipeline_color_legend" style="background: #aaaaff"><%= link_to_if_arvados_object @pipelines[1], friendly_name: true %></span>
+    <% if @pipelines.count > 2 %>
+    <span class="pipeline_color_legend" style="background: #ffaaaa"><%= link_to_if_arvados_object @pipelines[2], friendly_name: true %></span>
+    <% end %>
+    <span class="pipeline_color_legend" style="background: #aaaaaa">Common to <%= @pipelines.count > 2 ? 'multiple' : 'both' %> pipelines</span>
   </div>
 <% end %>
 

commit b9e00c9e7ca0f7ab0184bd552a7783806cc0fd93
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Feb 12 11:37:57 2014 -0800

    Fix terminology agreement between left nav and elsewhere in docs/pages.

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 24991cd..50f0852 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -202,10 +202,10 @@
                         ['specimens'],
                         ['collections', 'Files'],
                         ['links', 'Metadata']]],
-              ['Compute', [['pipeline_templates', 'Pipelines'],
+              ['Compute', [['pipeline_templates'],
                            ['repositories', 'Code repositories'],
                            ['virtual_machines']]],
-              ['Activity', [['pipeline_instances', 'Recent pipelines'],
+              ['Activity', [['pipeline_instances', 'Recent pipeline instances'],
                             ['jobs', 'Recent jobs']]],
               ['System', [['users'],
                          ['groups'],

commit c2f564cd1359018e881857fe88c5bd7898318cc3
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Feb 12 11:36:47 2014 -0800

    Fix pipeline_instances#show by renaming partial.

diff --git a/apps/workbench/app/views/pipeline_instances/_show_text_compare.html.erb b/apps/workbench/app/views/pipeline_instances/_show_compare.html.erb
similarity index 100%
rename from apps/workbench/app/views/pipeline_instances/_show_text_compare.html.erb
rename to apps/workbench/app/views/pipeline_instances/_show_compare.html.erb

-----------------------------------------------------------------------


hooks/post-receive
--