Merge branch 'master' into 3038-default-port-numbers

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

diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 3a70562e0587e6b510328e2a6e684379f717acfa..2841637ded00df136128d4e86d8d4409e380c6e4 100644 (file)
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -1,7 +1,7 @@
 
   <div class="row">
     <div class="col-md-6">
-      <div class="panel panel-default">
+      <div class="panel panel-default" style="min-height: 10em">
         <div class="panel-heading"><span class="panel-title">Active pipelines</span>
           <span class="pull-right">
     <%= link_to(
@@ -36,9 +36,9 @@
                       <% if v.is_a? Hash and v[:job] %>
                         <% if Job::state(v[:job]) == "Running" %>
                           <% running << k %>
-                        <% elsif Job::state(v[:job]) == "Failed" or Job::state(v[:job]) == "Canceled" %>
+                        <% elsif Job::state(v[:job]) == "Failed" or Job::state(v[:job]) == "Cancelled" %>
                           <% failed << k %>
-                        <% elsif Job::state(v[:job]) == "Completed" %>
+                        <% elsif Job::state(v[:job]) == "Complete" %>
                           <% completed << k %>
                         <% elsif Job::state(v[:job]) == "Queued" %>
                           <% queued << k %>
@@ -67,10 +67,9 @@
               </div>
 
               <div class="clearfix">
-                Started at <span class="utc-date" data-utc-date="<%= p[:started_at] || p[:created_at] %>"
-                                 data-utc-date-opts="noseconds"><%= p[:created_at] %></span>.
+                Started at <%= render_localized_date(p[:started_at] || p[:created_at], "noseconds") %>.
                 <% pipeline_time = Time.now - (p[:started_at] || p[:created_at]) %>
-                Active for <%= runtime(pipeline_time, false) %>.
+                Active for <%= render_runtime(pipeline_time, false) %>.
 
                 <div class="pull-right">
                   <% running.each do |k| %>
@@ -92,25 +91,24 @@
           <% finished_pipelines(8).each do |p| %>
             <div class="dashboard-panel-info-row">
               <div class="row">
-                <div class="col-md-6 x-ellip">
+                <div class="col-md-6 text-overflow-ellipsis">
                   <%= link_to_if_arvados_object p, friendly_name: true %>
                 </div>
                 <div class="col-md-2">
                   <%= render partial: "pipeline_status_label", locals: {p: p}%>
                 </div>
                 <div class="col-md-4">
-                  <span class="utc-date" data-utc-date="<%= p[:finished_at] || p[:modified_at] %>"
-                        data-utc-date-opts="noseconds"><%= p[:modified_at] %></span>
+                  <%= render_localized_date(p[:finished_at] || p[:modified_at], "noseconds") %>
                 </div>
               </div>
               <div class="row">
                 <div class="col-md-12">
                   <% if p[:started_at] and p[:finished_at] %>
                     <% pipeline_time = p[:finished_at] - p[:started_at] %>
-                    Active for <%= runtime(pipeline_time, false) %>
+                    Active for <%= render_runtime(pipeline_time, false) %>
                   <% end %>
 
-                  <span class="pull-right x-ellip" style="max-width: 100%">
+                  <span class="pull-right text-overflow-ellipsis" style="max-width: 100%">
                     <% outputs = [] %>
                     <% p.components.each do |k, c| %>
                       <% outputs << c[:output_uuid] if c[:output_uuid] %>
@@ -130,7 +128,7 @@
                 <div class="col-md-12">
                   <div class="pull-right" style="max-width: 100%">
                     <% outputs.each do |out| %>
-                      <div class="x-ellip">
+                      <div class="text-overflow-ellipsis">
                         <i class="fa fa-fw fa-archive"></i> <%= link_to_if_arvados_object out, friendly_name: true %>
                       </div>
                     <% end %>
@@ -145,11 +143,14 @@
 
     <div class="col-md-6">
       <% nodes = Node.all %>
-      <div class="panel panel-default">
-        <div class="panel-heading"><span class="panel-title"><a data-toggle="collapse" href="#compute_node_status">Compute node status <span class="caret"></span></a></span></div>
+      <div class="panel panel-default" style="min-height: 10em">
+        <div class="panel-heading"><span class="panel-title">Compute status</span></div>
         <div class="panel-body">
-          <div class="compute-node-summary" data-toggle="collapse" href="#compute_node_status">
+          <div>
             <%= render partial: 'compute_node_summary', locals: {nodes: nodes} %>
+            <div style="text-align: center">
+              <a data-toggle="collapse" href="#compute_node_status">Details <span class="caret"></span></a>
+            </div>
           </div>
           <div id="compute_node_status" class="collapse">
             <%= render partial: 'compute_node_status', locals: {nodes: nodes} %>
@@ -164,11 +165,9 @@
             <div class="dashboard-panel-info-row">
             <div>
               <i class="fa fa-fw fa-folder-o"></i><%= link_to_if_arvados_object r[:owners][p[:owner_uuid]], friendly_name: true %>/
-              <span class="pull-right"><span class="utc-date"
-                                             data-utc-date="<%= p[:modified_at] %>"
-                                             data-utc-date-opts="noseconds"><%= p[:modified_at]%></span></span>
+              <span class="pull-right"><%= render_localized_date(p[:modified_at], "noseconds") %></span>
             </div>
-            <div class="x-ellip" style="margin-left: 1em; width: 100%"><%= link_to_if_arvados_object p, friendly_name: true %>
+            <div class="text-overflow-ellipsis" style="margin-left: 1em; width: 100%"><%= link_to_if_arvados_object p, friendly_name: true %>
             </div>
             </div>
           <% end %>