Merge branch 'master' into 4091-test-infinite-scrolling

[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 8956ad95c715326106ca367cfeac2fa08ffe7206..cec63403ef1063cb652c642ab7238ddf931c27da 100644 (file)
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -1,8 +1,10 @@
+<div style="margin-top: 10px">
 <% pj = {} %>
 <% pj[:job] = @object %>
 <% pj[:name] = @object[:name] || "this job" %>
 <% tasks = JobTask.filter([['job_uuid', '=', @object.uuid]]).results %>
 <%= render partial: 'pipeline_instances/running_component', locals: {tasks: tasks, pj: pj, i: 0, expanded: true} %>
+</div>
 
   <div class="panel panel-default">
     <div class="panel-heading">
@@ -16,7 +18,7 @@
     <% 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 <span data-utc-date="<%= pipeline.created_at %>"><%= pipeline.created_at %></span>.
+      created at <%= render_localized_date(pipeline.created_at) %>.
       </div>
     <% end %>
   <% end %>