3605: Remove total nodes from compute summary table.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index d3abe4fcca92064812151a754393ee124bd543fd..eeb054551ae41a812c86bd7a36ff2c400f7d161c 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -260,4 +260,8 @@ span.editable-textile {
 
 #page-wrapper > div > h2 {
   margin-top: 0px;
-}
\ No newline at end of file
+}
+
+.compute-summary-numbers td {
+  font-size: 150%;
+}

diff --git a/apps/workbench/app/views/projects/_compute_node_status.html.erb b/apps/workbench/app/views/projects/_compute_node_status.html.erb
index 693a8ae649ed0c96bcd40bc3728594ccdcc33968..9a26b3fe9a730f2ec1c5afc195565de27dfe67e1 100644 (file)
--- a/apps/workbench/app/views/projects/_compute_node_status.html.erb
+++ b/apps/workbench/app/views/projects/_compute_node_status.html.erb
@@ -4,10 +4,10 @@
 
 <% queue.each do |j| %>
   <div class="row">
-    <div class="col-md-4">
+    <div class="col-md-3 text-overflow-ellipsis">
       <%= link_to_if_arvados_object j, friendly_name: true %>
     </div>
-    <div class="col-md-3">
+    <div class="col-md-4">
       <%= render_localized_date(j[:created_at]) %>
     </div>
     <div class="col-md-3">
@@ -19,10 +19,10 @@
   </div>
 <% end %>
   <div class="row">
-    <div class="col-md-4">
+    <div class="col-md-3">
       <b>Job</b>
     </div>
-    <div class="col-md-3">
+    <div class="col-md-4">
       <b>Submitted</b>
     </div>
     <div class="col-md-3">

diff --git a/apps/workbench/app/views/projects/_compute_node_summary.html.erb b/apps/workbench/app/views/projects/_compute_node_summary.html.erb
index 9a58d094b9b471c517e0722bfe736c4f57922620..7d6a4fbf2904354ddb522ce57ea09005b5eba300 100644 (file)
--- a/apps/workbench/app/views/projects/_compute_node_summary.html.erb
+++ b/apps/workbench/app/views/projects/_compute_node_summary.html.erb
@@ -4,20 +4,16 @@
         <col width="25%">
         <col width="25%">
         <col width="25%">
-        <col width="25%">
-
       </colgroup>
       <tr>
         <td><%= Job.queue_size %></td>
-        <td><%= nodes.select {|n| n.crunch_worker_state.in? ["busy", "idle"] }.size %></td>
         <td><%= nodes.select {|n| n.crunch_worker_state == "busy" }.size %></td>
         <td><%= nodes.select {|n| n.crunch_worker_state == "idle" }.size %></td>
       </tr>
       <tr>
-        <th>Queue</th>
-        <th>Nodes</th>
-        <th>Busy</th>
-        <th>Idle</th>
+        <th>Queued jobs</th>
+        <th>Busy nodes</th>
+        <th>Idle nodes</th>
       </tr>
     </table>
 </div>