[ARVADOS] updated: 7fa91fcfe97ce541204e1a3f83686b5c90d52315

[git at public.curoverse.com]

Summary of changes:
 .../pipeline_instances/_running_component.html.erb     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

       via  7fa91fcfe97ce541204e1a3f83686b5c90d52315 (commit)
       via  6cd1ce324efb3bcb279f437426110a9174e8bfbb (commit)
      from  4805adc6c1f02d19bd9a31e0ef58013b22a05527 (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 7fa91fcfe97ce541204e1a3f83686b5c90d52315
Merge: 4805adc 6cd1ce3
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jan 4 12:58:17 2016 -0500

    Merge branch '8082-col-markup' refs #8082


commit 6cd1ce324efb3bcb279f437426110a9174e8bfbb
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jan 4 12:55:54 2016 -0500

    8082: Fix column markup (always use up "log" grid column, always use up all 12 grid columns).

diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index a7dc22f..d4e0944 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -18,27 +18,29 @@
         </div>
 
         <%# column offset 4 %>
-        <div class="col-md-1">
-        <% if current_job %>
-          <% if(pipeline_display rescue nil) %>
-            <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
-              <% if current_job[:log] %>
+        <% if not current_job %>
+          <div class="col-md-8"></div>
+        <% else %>
+          <div class="col-md-1">
+            <% if (pipeline_display rescue nil) %>
+              <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
+                <% if current_job[:log] %>
                   <% logCollection = Collection.find? current_job[:log] %>
                   <% if logCollection %>
                     <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
                   <% else %>
                     Log unavailable
                   <% end %>
-              <% end %>
-            <% elsif current_job[:state] == "Running" %>
+                <% end %>
+              <% elsif current_job[:state] == "Running" %>
                 <% job = Job.find? current_job[:uuid] %>
                 <% if job %>
                   <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
                 <% else %>
                   Log unavailable
                 <% end %>
+              <% end %>
             <% end %>
-          <% end %>
           </div>
 
           <%# column offset 5 %>

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


hooks/post-receive
--