Merge branch '14714-keep-balance-config'

[arvados.git] / apps / workbench / app / views / projects / _compute_node_status.html.erb

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 db7326eb8848202fd669008a7737ce9ada42c0ff..3de2ab67ab5d6cf7a34c84d4effe4de066354907 100644 (file)
--- a/apps/workbench/app/views/projects/_compute_node_status.html.erb
+++ b/apps/workbench/app/views/projects/_compute_node_status.html.erb
@@ -1,48 +1,20 @@
-<div class="row">
+<%# Copyright (C) The Arvados Authors. All rights reserved.
 
-  <% nodes = Node.all %>
+SPDX-License-Identifier: AGPL-3.0 %>
 
-  <div class="col-sm-3 compute-summary-numbers">
-    <div class="panel panel-default">
-    <table>
-      <colgroup>
-        <col width="25%">
-        <col width="25%">
-        <col width="25%">
-        <col width="25%">
-      </colgroup>
-      <tr>
-        <td>0</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>
-      </tr>
-    </table>
-    </div>
-  </div>
-  <div class="col-sm-9">
-    <div class="clearfix" style="margin-top:0.5em; margin-bottom:0.5em">
-      <% nodes.sort_by { |n| n.hostname || "" }.each do |n| %>
-        <% if n.crunch_worker_state.in? ["busy", "idle"] %>
-          <div class="pull-left compute-summary">
-            <a data-toggle="collapse" href="#detail_<%= n.hostname %>" class="compute-summary-head label label-<%= if n.crunch_worker_state == 'busy' then 'primary' else 'default' end %>">
-              <%= n.hostname %>
-            </a>
-            <div id="detail_<%= n.hostname %>" class="collapse compute-detail">
-              state: <%= n.crunch_worker_state %><br>
-              <% [:total_cpu_cores, :total_ram_mb, :total_scratch_mb].each do |i| %>
-                <%= i.to_s.gsub '_', ' ' %>: <%= n.info[i] %><br>
-              <% end %>
-            </div>
+<h4>Node status</h4>
+<div class="compute-summary-nodelist">
+    <% nodes.each do |n| %>
+        <div class="compute-summary">
+          <a data-toggle="collapse" href="#detail_<%= n.hostname %>" class="compute-summary-head label label-<%= if n.crunch_worker_state == 'busy' then 'primary' else 'default' end %>">
+            <%= n.hostname %>
+          </a>
+          <div id="detail_<%= n.hostname %>" class="collapse compute-detail">
+            state: <%= n.crunch_worker_state %><br>
+            <% [:total_cpu_cores, :total_ram_mb, :total_scratch_mb].each do |i| %>
+              <%= i.to_s.gsub '_', ' ' %>: <%= n.properties[i] %><br>
+            <% end %>
           </div>
-        <% end %>
-      <% end %>
-    </div>
-  </div>
+        </div>
+    <% end %>
 </div>