Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 268ba565631c9d16f7415ba9b6722254a2bb636b..be54dd01ba1adacd5e02185c25f68fcfccc6d8ab 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -91,11 +91,6 @@ form.small-form-margin {
     padding: 2px 20px;
 }*/
 
-.left-nav ul ul li > div {
-    margin-left: 1.5em;
-    text-indent: -1.5em;
-}
-
 ul.arvados-nav {
     list-style: none;
     padding-left: 0em;
@@ -154,12 +149,10 @@ li.notification {
 }
 .arvados-nav-container {
     top: 70px; 
+    height: calc(100% - 70px); 
     overflow: auto; 
     z-index: 2;
 }
-.arvados-nav {
-    padding-top: 70px;
-}
 
 .arvados-nav-active {
     background: rgb(66, 139, 202);
@@ -168,9 +161,6 @@ li.notification {
 .arvados-nav-active a {
     color: white;
 }
-.arvados-nav-active a:hover {
-    color: white;
-}
 
 // See HeaderRowFixer in application.js
 table.table-fixed-header-row {

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index db8074b1ad409905658ae5d807021fc64479d1b2..68f0e109bd3a125a5087f808c93e701812785464 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -32,7 +32,7 @@
     padding-top: 70px; /* 70px to make the container go all the way to the bottom of the navbar */
     }
 
-    body > div.container-fluid > div.col-sm-10.col-sm-offset-2 {
+    body > div.container-fluid > div.col-sm-9.col-sm-offset-3 {
     overflow: auto;
     }
 
@@ -43,19 +43,14 @@
     }
 
     @media (min-width: 768px) {
-        .left-nav {
-            position: fixed;
-            top: 0;
-            left: 0;
-            height: 100%;
-            padding-left: 0;
-        }
+    .left-nav {
+    position: fixed;
+    }
     }
-
     @media (max-width: 767px) {
-        .breadcrumbs {
-            display: none;
-        }
+    .breadcrumbs {
+    display: none;
+    }
     }
   </style>
 </head>
@@ -174,12 +169,12 @@
   </div>
 
   <div class="container-fluid">
-      <div class="col-sm-10 col-sm-offset-2">
-        <div id="content">
+      <div class="col-sm-9 col-sm-offset-3">
+        <div id="content" class="body-content">
           <%= yield %>
         </div>
       </div>
-      <div class="col-sm-2 left-nav">
+      <div class="col-sm-3 left-nav">
         <div class="arvados-nav-container">
         <% if current_user.andand.is_active %>
         <div class="well">
@@ -188,13 +183,13 @@
             <a href="/">Dashboard</a>
           </li>
 
-          <% [['Data', [['collections', 'Collections (data&nbsp;files)'],
+          <% [['Data', [['collections', 'Collections (data files)'],
                         ['humans'],
                         ['traits'],
                         ['specimens'],
                         ['links']]],
-              ['Activity', [['pipeline_instances',],
-                            ['jobs']]],
+              ['Activity', [['pipeline_instances', 'Recent pipeline instances'],
+                            ['jobs', 'Recent jobs']]],
               ['Compute', [['pipeline_templates'],
                            ['repositories', 'Code repositories'],
                            ['virtual_machines']]],
@@ -207,11 +202,9 @@
               <% j[1].each do |k| %>
                 <% unless k[0] == 'users' and !current_user.andand.is_admin %>
                   <li class="<%= 'arvados-nav-active' if (params[:controller] == k[0] && params[:action] != 'home') %>">
-                    <div>
-                      <a href="/<%= k[0] %>">
-                        <%= if k[1] then raw(k[1]) else k[0].capitalize.gsub('_', ' ') end %>
-                      </a>
-                    </div>
+                    <a href="/<%= k[0] %>">
+                      <%= if k[1] then k[1] else k[0].capitalize.gsub('_', ' ') end %>
+                    </a>
                   </li>
                 <% end %>
               <% end %>

diff --git a/apps/workbench/app/views/pipeline_instances/show.html.erb b/apps/workbench/app/views/pipeline_instances/show.html.erb
new file mode 120000 (symlink)
index 0000000..4316b10
--- /dev/null
+++ b/apps/workbench/app/views/pipeline_instances/show.html.erb
@@ -0,0 +1 @@
+../application/show.html.erb
\ No newline at end of file

diff --git a/apps/workbench/app/views/pipeline_instances/_show_graph.js.erb b/apps/workbench/app/views/pipeline_instances/show.js.erb
similarity index 74%
rename from apps/workbench/app/views/pipeline_instances/_show_graph.js.erb
rename to apps/workbench/app/views/pipeline_instances/show.js.erb
index 9460f0bc9d8ec5e2fdb2c87eaf2d7d854156a9d8..fc11e644249468e391a9762154882cb36aafe4a2 100644 (file)
--- a/apps/workbench/app/views/pipeline_instances/_show_graph.js.erb
+++ b/apps/workbench/app/views/pipeline_instances/show.js.erb
@@ -1,3 +1,4 @@
-var new_content = "<%= escape_javascript(render template: 'pipeline_instances/show.html') %>";
+<% self.formats = [:html] %>
+var new_content = "<%= escape_javascript(render template: 'pipeline_instances/show') %>";
 if ($('div.body-content').html() != new_content)
    $('div.body-content').html(new_content);