[ARVADOS] created: 3a0d905f5fc190862a986fed3e387fe98c863073

[git at public.curoverse.com]

        at  3a0d905f5fc190862a986fed3e387fe98c863073 (commit)


commit 3a0d905f5fc190862a986fed3e387fe98c863073
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Dec 24 15:49:45 2015 -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 cb27f1c..a1446b9 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -17,31 +17,31 @@
           <%= pj[:progress_bar] %>
         </div>
 
-        <% 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] %>
+        <%# column offset 4 %>
+        <% if not current_job %>
+          <div class="col-md-8">
+        <% 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 %>
-              </div>
-            <% elsif current_job[:state] == "Running" %>
-              <div class="col-md-1">
+                <% 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 %>
-              </div>
+              <% end %>
             <% end %>
-          <% end %>
+          </div>
 
           <%# column offset 5 %>
           <% if current_job[:state] != "Queued" %>

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


hooks/post-receive
--