Merge branch 'master' into 9766-register-workflow

[arvados.git] / apps / workbench / app / views / jobs / _show_status.html.erb

diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb
index 976bf194f7be5eb68b73950a90f82f1677fc5881..bb5444f238fb89df9eb477d8d8642c1dbbfaf240 100644 (file)
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -1,34 +1,24 @@
-<div style="margin-top: 10px">
+<%= render(partial: 'work_units/show_status', locals: {current_obj: @object, name: @object[:name] || 'this job'}) %>
 
-<div id="job-status"
-     class="pane-anchor arv-log-event-listener arv-refresh-on-log-event"
-     href="#job-status-pane"
-     data-pane-content-url="<%= url_for(params.merge(tab_pane: "job_component")) %>"
-     data-object-uuid="<%= @object.uuid %>"
-     data-load-throttle="5000"
-     >
-  <div id="job-status-pane" class="active">
-    <%= render 'show_job_component' %>
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <span class="panel-title">Used in pipelines</span>
   </div>
-</div>
-</div>
-
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <span class="panel-title">Used in pipelines</span>
-    </div>
-    <div class="panel-body">
-<% pi = PipelineInstance.order("created_at desc").filter([["components", "like", "%#{@object.uuid}%"]]) %>
+  <div class="panel-body">
+    <% pi = PipelineInstance.order("created_at desc").filter([["components", "like", "%#{@object.uuid}%"]]) %>
 
-<% pi.each do |pipeline| %>
-  <% pipeline.components.each do |k, v| %>
-    <% if v[:job] and v[:job][:uuid] == @object.uuid %>
-      <div>
-      <b><%= k %></b> component of <%= link_to_if_arvados_object pipeline, friendly_name: true %>
-      created at <%= render_localized_date(pipeline.created_at) %>.
-      </div>
+    <% pi.each do |pipeline| %>
+      <% pipeline.components.each do |k, v| %>
+        <% if v[:job] and v[:job][:uuid] == @object.uuid %>
+          <div>
+            <b><%= k %></b>
+            component of
+            <%= link_to_if_arvados_object pipeline, friendly_name: true %>
+            created at
+            <%= render_localized_date(pipeline.created_at) %>.
+          </div>
+        <% end %>
+      <% end %>
     <% end %>
-  <% end %>
-<% end %>
-</div>
+  </div>
 </div>