diff options
Diffstat (limited to 'tools/pharos-dashboard/templates')
| -rw-r--r-- | tools/pharos-dashboard/templates/dashboard/ci_pods.html | 2 | ||||
| -rw-r--r-- | tools/pharos-dashboard/templates/dashboard/dev_pods.html | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/tools/pharos-dashboard/templates/dashboard/ci_pods.html b/tools/pharos-dashboard/templates/dashboard/ci_pods.html index 2982a6ff..a754252c 100644 --- a/tools/pharos-dashboard/templates/dashboard/ci_pods.html +++ b/tools/pharos-dashboard/templates/dashboard/ci_pods.html @@ -41,7 +41,7 @@ href={{ pod.slave.last_job_url }}>{{ pod.slave.last_job_name }}</a> </th> </tr> - {% endfor %}` + {% endfor %} </tbody> {% endblock table %} diff --git a/tools/pharos-dashboard/templates/dashboard/dev_pods.html b/tools/pharos-dashboard/templates/dashboard/dev_pods.html index 9c84bb91..c4cb1ba7 100644 --- a/tools/pharos-dashboard/templates/dashboard/dev_pods.html +++ b/tools/pharos-dashboard/templates/dashboard/dev_pods.html @@ -10,12 +10,14 @@ <th>Booked by</th> <th>Booked until</th> <th>Purpose</th> + <th>Utilization</th> <th>Status</th> <th></th> + <th></th> </tr> </thead> <tbody> - {% for pod, booking in dev_pods %} + {% for pod, booking, utilization in dev_pods %} <tr> <th> <a href={% url 'dashboard:resource' resource_id=pod.id %}>{{ pod.name }}</a> @@ -32,6 +34,9 @@ <th> {{ booking.purpose }} </th> + <th> + {{ utilization }} + </th> <th style="background-color:{{ pod.slave.status | jenkins_status_color }}"> {{ pod.slave.status }} </th> @@ -40,6 +45,11 @@ Book </a> </th> + <th> + <a href="{% url 'dashboard:resource' resource_id=pod.id %}" class="btn btn-primary"> + Info + </a> + </th> </tr> {% endfor %} </tbody> @@ -50,9 +60,9 @@ $(document).ready(function () { $('#table').DataTable({ columnDefs: [ - {type: 'status', targets: 5} + {type: 'status', targets: 6} ], - "order": [[5, "asc"]] + "order": [[6, "asc"]] }); }); </script> |