[ARVADOS] updated: fd307c578c8665feb50b71b7a3b7c5bf79d70607

[git at public.curoverse.com]

Summary of changes:
 .../app/views/pipeline_instances/_running_component.html.erb      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

       via  fd307c578c8665feb50b71b7a3b7c5bf79d70607 (commit)
      from  c6ab2d3b8932e60125818f6bfa123d81fd080411 (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 fd307c578c8665feb50b71b7a3b7c5bf79d70607
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Dec 30 18:53:12 2015 -0500

    8082: Ensure consistent column widths in Workbench job banner.
    
    4dcf4e849f242a929ce03b5d529e0e1a63fbaeb0 is the commit that introduced
    the column inconsistencies.  This is the smallest patch I could find
    to address the issue.  It may be less than ideal because it always
    allocates a column to something that may not be displayed, but the
    logic to keep track of column widths is already hairy and there are so
    many conditions here that it stood to get a lot worse.  Closes #8082.

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 cb27f1c..a7dc22f 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -17,11 +17,11 @@
           <%= pj[:progress_bar] %>
         </div>
 
+        <%# column offset 4 %>
+        <div class="col-md-1">
         <% if current_job %>
-          <%# column offset 4 %>
           <% if(pipeline_display rescue nil) %>
             <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
-              <div class="col-md-1">
               <% if current_job[:log] %>
                   <% logCollection = Collection.find? current_job[:log] %>
                   <% if logCollection %>
@@ -30,18 +30,16 @@
                     Log unavailable
                   <% end %>
               <% end %>
-              </div>
             <% elsif current_job[:state] == "Running" %>
-              <div class="col-md-1">
                 <% job = Job.find? current_job[:uuid] %>
                 <% if job %>
                   <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
                 <% else %>
                   Log unavailable
                 <% end %>
-              </div>
             <% end %>
           <% end %>
+          </div>
 
           <%# column offset 5 %>
           <% if current_job[:state] != "Queued" %>

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


hooks/post-receive
--