summaryrefslogtreecommitdiffstats
path: root/templates/statistics
diff options
context:
space:
mode:
authorSimon Rettberg2015-12-11 18:03:19 +0100
committerSimon Rettberg2015-12-11 18:03:19 +0100
commit85e8125a235924b66c5c567f4cbe1086c6eb7575 (patch)
tree526a3cbbb58f0e82f20e3aec42e73720f9ae185f /templates/statistics
parent[statistics] Show PC status (on/off/inuse) (diff)
downloadslx-admin-85e8125a235924b66c5c567f4cbe1086c6eb7575.tar.gz
slx-admin-85e8125a235924b66c5c567f4cbe1086c6eb7575.tar.xz
slx-admin-85e8125a235924b66c5c567f4cbe1086c6eb7575.zip
[statistics] Show summary at top, show session details for occupied clients
Diffstat (limited to 'templates/statistics')
-rw-r--r--templates/statistics/clientlist.html10
-rw-r--r--templates/statistics/machine-main.html9
-rw-r--r--templates/statistics/summary.html20
3 files changed, 37 insertions, 2 deletions
diff --git a/templates/statistics/clientlist.html b/templates/statistics/clientlist.html
index eb3c6bd4..8e8565fe 100644
--- a/templates/statistics/clientlist.html
+++ b/templates/statistics/clientlist.html
@@ -32,8 +32,14 @@
<td class="text-right">{{lastseen}}</td>
<td class="{{kvmclass}}">{{kvmstate}}</td>
<td class="text-right {{ramclass}}">{{gbram}}&thinsp;GiB</td>
- <td class="text-right {{hddclass}}">{{gbtmp}}&thinsp;GiB</td>
+ <td class="text-right {{hddclass}}">
+ {{gbtmp}}&thinsp;GiB
+ {{#badsectors}}<div>
+ <span class="glyphicon glyphicon-exclamation-sign"></span>
+ {{badsectors}}
+ </div>{{/badsectors}}
+ </td>
<td>{{lang_realCores}}: {{realcores}}<div class="small">{{cpumodel}}</div></td>
</tr>
{{/rows}}
-</table> \ No newline at end of file
+</table>
diff --git a/templates/statistics/machine-main.html b/templates/statistics/machine-main.html
index 03e95381..f9ca1c5d 100644
--- a/templates/statistics/machine-main.html
+++ b/templates/statistics/machine-main.html
@@ -51,8 +51,17 @@
<span class="glyphicon glyphicon-ok green"></span> {{lang_machineIdle}}
{{/state_idle}}
{{#state_occupied}}
+ {{#username}}
+ <span class="glyphicon glyphicon-user red"></span> {{lang_machineOccupiedBy}} <b>{{username}}</b>
+ {{/username}}
+ {{^username}}
<span class="glyphicon glyphicon-user red"></span> {{lang_machineOccupied}}
+ {{/username}}
+ <div>{{logintime}}</div>
{{/state_occupied}}
+ {{#session}}
+ <div>{{session}}</div>
+ {{/session}}
</td>
</tr>
</table>
diff --git a/templates/statistics/summary.html b/templates/statistics/summary.html
new file mode 100644
index 00000000..fb6466fc
--- /dev/null
+++ b/templates/statistics/summary.html
@@ -0,0 +1,20 @@
+<div class="col-md-12">
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div>
+ {{lang_knownMachines}}: <b>{{known}}</b>&emsp;
+ {{lang_onlineMachines}}: <b>{{online}}</b>&emsp;
+ {{lang_inUseMachines}}: <b>{{used}}</b> (<b>{{usedpercent}}%</b>)
+ </div>
+ {{#badhdd}}
+ <div>
+ <span class="glyphicon glyphicon-exclamation-sign red"></span>
+ <a href="?do=Statistics&amp;filter=badsectors&amp;argument=10">
+ {{lang_withBadSectors}}: <b>{{badhdd}}</b>
+ </a>
+ </div>
+ {{/badhdd}}
+ </div>
+ </div>
+</div>
+