Worker: improve main page and make updates atomic

Change-Id: Ia56c702513035ae494f9e1952a3c945ddfb15a2b

1 files changed, 38 insertions, 54 deletions

diff --git a/lava_scheduler_app/templates/lava_scheduler_app/worker.html b/lava_scheduler_app/templates/lava_scheduler_app/worker.html
index dce6347c3..653b48c2d 100644
--- a/lava_scheduler_app/templates/lava_scheduler_app/worker.html
+++ b/lava_scheduler_app/templates/lava_scheduler_app/worker.html
@@ -15,37 +15,11 @@
 {% endblock %}
 
 {% block content %}
-{% if messages %}
-{% for message in messages %}
-<div class="alert alert-danger">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>{{ message.tags|capfirst }}:</strong> {{ message }}
-</div>
-{% endfor %}
-{% endif %}
-<h2>Worker: {{ worker }}
-</h2>
-
 <div class="row">
-  <div class="col-md-6">
-    <h4 class="modal-header">Details</h4>
+  <div class="col-md-4">
     <dl class="dl-horizontal">
-      <dt>State</dt>
-        {% if worker.state == worker.STATE_ONLINE %}
-      <dd class="text-success">
-        {% else %}
-      <dd class="text-danger">{% if worker.health == worker.HEALTH_ACTIVE %}<div class="glyphicon glyphicon-fire"></div>{% endif %}
-        {% endif %}
-        {{ worker.get_state_display }}</dd>
-      <dt>Health</dt>
-        {% if worker.health == worker.HEALTH_ACTIVE %}
-      <dd class="text-success">
-        {% elif worker.health == worker.HEALTH_MAINTENANCE %}
-      <dd class="text-warning"><div class="glyphicon glyphicon-wrench"></div>
-        {% else %}
-      <dd class="text-danger"><div class="glyphicon glyphicon-fire"></div>
-        {% endif %}
-        {{ worker.get_health_display }}</dd>
+      <dt>Hostname</dt>
+      <dd>{{ worker.hostname }}</dd>
       <dt>Description</dt>
       {% if can_admin %}
       <form method="POST" action="{% url 'lava.scheduler.edit_worker_desc' %}">
@@ -59,36 +33,46 @@
       {% endif %}
     </dl>
   </div>
-  {% if can_admin %}
-  <div class="col-md-6">
-    <div class="row">
-      <div class="col-md-6">
-        <h4 class="modal-header">Actions</h4>
-        {% if worker.health != worker.HEALTH_ACTIVE %}
-        <div class="btn-group btn-group-justified">
-          <div class="btn-group">
-            <a class="btn btn-success" href="{% url "lava.scheduler.worker.activate" worker.pk %}">Activate</a>
-          </div>
-        </div>
+  <div class="col-md-4">
+    <dl class="dl-horizontal">
+      <dt>State</dt>
+        {% if worker.state == worker.STATE_ONLINE %}
+      <dd><span class="label label-success">{{ worker.get_state_display }}</span></dd>
+        {% else %}
+      <dd><span class="label label-warning">{% if worker.health == worker.HEALTH_ACTIVE %}<div class="glyphicon glyphicon-fire"></div>{% endif %}{{ worker.get_state_display }}</span></dd>
         {% endif %}
-        {% if worker.health != worker.HEALTH_MAINTENANCE %}
-        <div class="btn-group btn-group-justified">
-          <div class="btn-group">
-            <a class="btn btn-warning" href="{% url "lava.scheduler.worker.maintenance" worker.pk %}">Maintenance</a>
-          </div>
-        </div>
+      <dt>Health</dt>
+        {% if worker.health == worker.HEALTH_ACTIVE %}
+      <dd class="text-success">
+        {% elif worker.health == worker.HEALTH_MAINTENANCE %}
+      <dd class="text-warning">
+        {% else %}
+      <dd class="text-danger">
         {% endif %}
-        {% if worker.health != worker.HEALTH_RETIRED %}
-        <div class="btn-group btn-group-justified">
-          <div class="btn-group">
-            <a class="btn btn-danger" href="{% url "lava.scheduler.worker.retire" worker.pk %}">Retire</a>
-          </div>
+        {% if can_admin %}
+        <div class="dropdown">
+        {{ worker.get_health_display }}
+          <span class="glyphicon glyphicon-pencil" id="worker_health_menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"></span>
+          <ul class="dropdown-menu" aria-labelledby="worker_health_menu">
+            {% if worker.health != worker.HEALTH_ACTIVE %}<li><a href="{% url "lava.scheduler.worker.active" worker.pk %}">Active</a></li>{% endif %}
+            {% if worker.health != worker.HEALTH_MAINTENANCE %}<li><a href="{% url "lava.scheduler.worker.maintenance" worker.pk %}">Maintenance</a></li>{% endif %}
+            {% if worker.health != worker.HEALTH_RETIRED %}<li><a href="{% url "lava.scheduler.worker.retired" worker.pk %}">Retired</a></li>{% endif %}
+          </ul>
         </div>
+        {% else %}
+        {{ worker.get_health_display }}
         {% endif %}
-      </div>
-    </div>
+      </dd>
+    </dl>
+  </div>
+  <div class="col-md-4">
+    <dl class="dl-horizontal">
+      <dt>Devices</dt>
+      <dd>{{ worker.device_set.all.count }}</dd>
+      <dt>Retired devices</dt>
+      <dd>{{ worker.retired_devices_count }}</dd>
+    </dl>
   </div>
-  {% endif %}
 </div>
 
 <h3 class="modal-header">Devices Attached</h3>