diff options
| author | Simon Rettberg | 2017-11-28 16:41:33 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-11-28 16:41:33 +0100 |
| commit | 23d8c6fc0c3b031aa081ee1a245f9b0792514fd3 (patch) | |
| tree | 59ce05e8add76d7b63213a0fa447a42565ea2e3d /modules-available/statistics/templates | |
| parent | [dnbd3] Disable SLX_SYSTEM_STANDBY_TIMEOUT (diff) | |
| download | slx-admin-23d8c6fc0c3b031aa081ee1a245f9b0792514fd3.tar.gz slx-admin-23d8c6fc0c3b031aa081ee1a245f9b0792514fd3.tar.xz slx-admin-23d8c6fc0c3b031aa081ee1a245f9b0792514fd3.zip | |
[statistics] Introduce state column to get rid of complicated state determination
This also adds support for the STANDBY state
Diffstat (limited to 'modules-available/statistics/templates')
| -rw-r--r-- | modules-available/statistics/templates/clientlist.html | 17 | ||||
| -rw-r--r-- | modules-available/statistics/templates/machine-main.html | 15 |
2 files changed, 19 insertions, 13 deletions
diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html index 73148eb8..4755c3c1 100644 --- a/modules-available/statistics/templates/clientlist.html +++ b/modules-available/statistics/templates/clientlist.html @@ -60,15 +60,18 @@ <tr> <td class="text-nowrap"> {{#hasnotes}}<span class="glyphicon glyphicon-exclamation-sign pull-right"></span>{{/hasnotes}} - {{#state_off}} + {{#state_OFFLINE}} <span class="glyphicon glyphicon-off" title="{{lang_machineOff}}"></span> - {{/state_off}} - {{#state_idle}} + {{/state_OFFLINE}} + {{#state_IDLE}} <span class="glyphicon glyphicon-ok green" title="{{lang_machineIdle}}"></span> - {{/state_idle}} - {{#state_occupied}} + {{/state_IDLE}} + {{#state_OCCUPIED}} <span class="glyphicon glyphicon-user red" title="{{lang_machineOccupied}}"></span> - {{/state_occupied}} + {{/state_OCCUPIED}} + {{#state_STANDBY}} + <span class="glyphicon glyphicon-off green" title="{{lang_machineStandby}}"></span> + {{/state_STANDBY}} <a href="?do=Statistics&uuid={{machineuuid}}"><b>{{hostname}}</b></a> <div class="small">{{machineuuid}}</div> </td> @@ -126,4 +129,4 @@ function toggleButton(v) { $queryForm.submit(); } -//--></script>
\ No newline at end of file +//--></script> diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index 74df80c4..1854a03b 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -50,13 +50,13 @@ <tr> <td class="text-nowrap">{{lang_usageState}}</td> <td> - {{#state_off}} + {{#state_OFFLINE}} <span class="glyphicon glyphicon-off"></span> {{lang_machineOff}} - {{/state_off}} - {{#state_idle}} + {{/state_OFFLINE}} + {{#state_IDLE}} <span class="glyphicon glyphicon-ok green"></span> {{lang_machineIdle}} - {{/state_idle}} - {{#state_occupied}} + {{/state_IDLE}} + {{#state_OCCUPIED}} {{#username}} <span class="glyphicon glyphicon-user red"></span> {{lang_machineOccupiedBy}} <b>{{username}}</b> {{/username}} @@ -64,7 +64,10 @@ <span class="glyphicon glyphicon-user red"></span> {{lang_machineOccupied}} {{/username}} <div>{{logintime_s}}</div> - {{/state_occupied}} + {{/state_OCCUPIED}} + {{#state_STANDBY}} + <span class="glyphicon glyphicon-off green"></span> {{lang_machineStandby}} + {{/state_STANDBY}} {{#session}} <div> {{#lectureid}} |