Fix build.sh bugs.

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

diff --git a/apps/workbench/app/views/jobs/index.html.erb b/apps/workbench/app/views/jobs/index.html.erb
index 74274ae1a93a4fb74c3b3070ff46828325c4b994..99bb9dd2bbf357297f3de8977ef6184fd47b4302 100644 (file)
--- a/apps/workbench/app/views/jobs/index.html.erb
+++ b/apps/workbench/app/views/jobs/index.html.erb
@@ -1,23 +1,28 @@
-<% content_for :head do %>
-<style>
+<% content_for :css do %>
   table.topalign>tbody>tr>td {
   vertical-align: top;
   }
   table.topalign>thead>tr>td {
   vertical-align: bottom;
   }
-</style>
 <% end %>
 
 <table class="topalign table">
   <thead>
     <tr class="contain-align-left">
       <th>
-       uuid, result, schedule
       </th><th>
-       script, parameters, input, output
+       status
       </th><th>
-       resource_limits
+       progress
+      </th><th>
+       uuid
+      </th><th>
+       script
+      </th><th>
+       version
+      </th><th>
+       output
       </th>
     </tr>
   </thead>
@@ -25,32 +30,47 @@
 
     <% @jobs.sort_by { |j| j[:created_at] }.reverse.each do |j| %>
 
-    <tr class="<%= 'error' if j.success == false %>">
+    <tr class="cell-noborder">
       <td>
-        <table class="table table-condensed table-hover">
-          <tr>
-            <td colspan="2">
-              <% if j.success == false %>
-              <span class="badge badge-warning" title="fail">&#x2716;</span>
-              <% elsif j.success %>
-              <span class="badge badge-success" title="success">&#x2714;</span>
-              <% elsif j.running %>
-              <span class="badge badge-info" title="running">&#x2708;</span>
-              <% else %>
-              <span class="badge" title="queued">&#x2709;</span>
-              <% end %>
-             <%= link_to_if_arvados_object j.uuid %>
-            </td>
-            <td>
-              <% if j.started_at and not j.finished_at %>
-              <% percent_total_tasks = 100 / (j.tasks_summary[:running] + j.tasks_summary[:done] + j.tasks_summary[:todo]) rescue 0 %>
-              <div class="progress" style="margin-bottom: 0">
-                <div class="bar bar-success" style="width: <%= j.tasks_summary[:done] * percent_total_tasks rescue 0 %>%;"></div>
-                <div class="bar" style="width: <%= j.tasks_summary[:running] * percent_total_tasks rescue 0 %>%; opacity: 0.3"></div>
-              </div>
-              <% end %>
-            </td>
-          </tr>
+        <i class="icon-plus-sign expand-collapse-row" data-id="<%= j.uuid %>" style="cursor: pointer"></i>
+      </td>
+      <td>
+        <% if j.success == false %>
+        <span class="badge badge-warning" title="fail">&#x2716;</span>
+        <% elsif j.success %>
+        <span class="badge badge-success" title="success">&#x2714;</span>
+        <% elsif j.running %>
+        <span class="badge badge-info" title="running">&#x2708;</span>
+        <% else %>
+        <span class="badge" title="queued">&#x2709;</span>
+        <% end %>
+      </td>
+      <td>
+        <% if j.started_at and not j.finished_at %>
+        <% percent_total_tasks = 100 / (j.tasks_summary[:running] + j.tasks_summary[:done] + j.tasks_summary[:todo]) rescue 0 %>
+        <div class="progress" style="margin-bottom: 0">
+          <div class="bar bar-success" style="width: <%= j.tasks_summary[:done] * percent_total_tasks rescue 0 %>%;"></div>
+          <div class="bar" style="width: <%= j.tasks_summary[:running] * percent_total_tasks rescue 0 %>%; opacity: 0.3"></div>
+        </div>
+        <% end %>
+      </td>
+      <td>
+        <%= link_to_if_arvados_object j.uuid %>
+      </td>
+      <td>
+        <%= j.script %>
+      </td>
+      <td>
+        <%= j.script_version.andand[0..8] %>
+      </td>
+      <td>
+        <%= link_to_if_arvados_object j.output %>
+      </td>
+    </tr>
+    <tr class="cell-noborder" id="<%= j.uuid %>" style="display:none">
+      <td colspan="7"><table class="table table-justforlayout"><tr>
+      <td style="border-left: 1px solid black">
+        <table class="table table-condensed">
           <tr>
             <td>
               queued
@@ -86,8 +106,8 @@
           <% end %>
         </table>
       </td><td>
-        <table class="table table-condensed table-hover">
-          <tr class="info"><td colspan="2">
+        <table class="table table-condensed">
+          <tr><td colspan="2">
               <%= j.script %> <%= j.script_version %>
           </td></tr>
           <% j.script_parameters.sort.each do |k,v| %>
@@ -100,12 +120,13 @@
           </tr>
         </table>
       </td><td>
-        <table class="table table-condensed table-hover">
-        <% j.resource_limits.sort.each do |k,v| %>
+        <table class="table table-condensed">
+        <% j.runtime_constraints.sort.each do |k,v| %>
         <tr><td><%= v %></td><td><%= k %></td></tr>
         <% end %>
         </table>
       </td>
+      </tr></table></td>
     </tr>
 
     <% end %>