diff options
| author | Simon Rettberg | 2017-06-07 14:09:39 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-06-07 14:09:39 +0200 |
| commit | 642e1301aef038c28893aae1c434ff1ded8b6f46 (patch) | |
| tree | 261508ac9fa1bb7819a33ac97e3d67c34a07a4a7 /modules-available | |
| parent | [inc/event] Retry mounting vmstore on bootup (diff) | |
| download | slx-admin-642e1301aef038c28893aae1c434ff1ded8b6f46.tar.gz slx-admin-642e1301aef038c28893aae1c434ff1ded8b6f46.tar.xz slx-admin-642e1301aef038c28893aae1c434ff1ded8b6f46.zip | |
[locationinfo] Change order of status bars in overview frontend
Diffstat (limited to 'modules-available')
| -rw-r--r-- | modules-available/locationinfo/api.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/locationinfo/frontend/panel.html | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index 945c4c92..644f990b 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -337,7 +337,7 @@ function findLocations($locations, $idList) * Gets the calendar of the given ids. * * @param int[] $idList list with the location ids. - * @return string Calendar JSON. + * @return array Calendar. */ function getCalendar($idList) { diff --git a/modules-available/locationinfo/frontend/panel.html b/modules-available/locationinfo/frontend/panel.html index 7b15f640..dd5fc25d 100644 --- a/modules-available/locationinfo/frontend/panel.html +++ b/modules-available/locationinfo/frontend/panel.html @@ -71,11 +71,11 @@ .pc-idle { background-color: green; - border-radius: 3px 0px 0px 3px; } .pc-occupied { background-color: red; + border-radius: 3px 0px 0px 3px; } .pc-off { @@ -532,10 +532,10 @@ } $('#parent_' + id).parent().show(); var total = parseInt(idle) + parseInt(occupied) + parseInt(off) + parseInt(broken); - $("#div_pc_Idle_" + id).text(idle).width((idle / total) * 100 + '%'); - $("#div_pc_Occupied_" + id).text(occupied).width((occupied / total) * 100 + '%'); - $("#div_pc_Off_" + id).text(off).width((off / total) * 100 + '%'); - $("#div_pc_Broken_" + id).text(broken).width((broken / total) * 100 + '%'); + $("#pc_Idle_" + id).text(idle).width((idle / total) * 100 + '%'); + $("#pc_Occupied_" + id).text(occupied).width((occupied / total) * 100 + '%'); + $("#pc_Off_" + id).text(off).width((off / total) * 100 + '%'); + $("#pc_Broken_" + id).text(broken).width((broken / total) * 100 + '%'); } /** @@ -575,10 +575,10 @@ "<div class='child paperEffect' id='parent_" + id + "'>" + "<div class='headerFont'>" + name + "</div>" + "<div class='pc-state-wrapper'>" + - "<div id = 'div_pc_Idle_" + id + "' class='pc-idle'>?</div>" + - "<div id = 'div_pc_Occupied_" + id + "' class='pc-occupied'>?</div>" + - "<div id = 'div_pc_Off_" + id + "' class='pc-off'>?</div>" + - "<div id = 'div_pc_Broken_" + id + "' class='pc-broken'>?</div>" + + "<div id = 'pc_Occupied_" + id + "' class='pc-occupied'>?</div>" + + "<div id = 'pc_Idle_" + id + "' class='pc-idle'>?</div>" + + "<div id = 'pc_Off_" + id + "' class='pc-off'>?</div>" + + "<div id = 'pc_Broken_" + id + "' class='pc-broken'>?</div>" + "</div>" + "<div class='aroundCourse'>" + "<div id = 'div_course" + id + "'class='courseFont'>?</div>" + |