Merge branch 'master' into 5720-ajax-loading-error

[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 693a8ae649ed0c96bcd40bc3728594ccdcc33968..cd9243d68f76003a77f65c7197477aa213d60e38 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">
@@ -35,10 +35,10 @@
   <% if Job.queue_size > queue.size %>
     <i>Note: some items in the queue are not visible to you.</i>
   <% end %>
-  <div>    
+  <div>
   </div>
 <% else %>
-  There are currently no job is the queue.
+  There are currently no jobs in your queue.
 <% end %>
 
 <h4>Node status</h4>
@@ -52,7 +52,7 @@
           <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>
+              <%= i.to_s.gsub '_', ' ' %>: <%= n.properties[i] %><br>
             <% end %>
           </div>
         </div>