summaryrefslogtreecommitdiffstats
path: root/modules-available/locationinfo/templates
diff options
context:
space:
mode:
authorChristian Hofmaier2018-12-08 15:56:06 +0100
committerChristian Hofmaier2018-12-08 15:56:06 +0100
commite063644af63758c4f01b5679cc48a4d4d6463a09 (patch)
treebb06df77e91671797b765447a15d887b4b2876ac /modules-available/locationinfo/templates
parent[locationinfo] fix header not detecting events in only room mode (diff)
parent[locationinfo] roomplaner -> roomplanner (diff)
downloadslx-admin-e063644af63758c4f01b5679cc48a4d4d6463a09.tar.gz
slx-admin-e063644af63758c4f01b5679cc48a4d4d6463a09.tar.xz
slx-admin-e063644af63758c4f01b5679cc48a4d4d6463a09.zip
Merge branch 'master' of git.openslx.org:openslx-ng/slx-admin
Diffstat (limited to 'modules-available/locationinfo/templates')
-rwxr-xr-xmodules-available/locationinfo/templates/frontend-default.html2
-rw-r--r--modules-available/locationinfo/templates/page-config-panel-default.html6
-rw-r--r--modules-available/locationinfo/templates/page-config-panel-summary.html6
3 files changed, 7 insertions, 7 deletions
diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html
index cb61d141..4dee8ef7 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -1529,7 +1529,7 @@ optional:
for (var i = 0; i < update.length; i++) {
var $div = $("#pc_" + room.id + "_" + update[i].id);
// Pc free
- if (room.config.roomplaner === true) {
+ if (room.config.roomplanner === true) {
if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY") && !isNaN(update[i].x) && !isNaN(update[i].y)) {
freePcs++;
}
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index c2915298..116c2e11 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -111,13 +111,13 @@
<div class="list-group-item">
<div class="row">
<div class="col-sm-3">
- <label for="input-roomplaner">{{lang_useRoomplaner}}</label>
+ <label for="input-roomplanner">{{lang_useRoomplanner}}</label>
</div>
<div class="col-sm-7">
- <input id="input-roomplaner" type="checkbox" name="roomplaner" {{roomplaner_checked}}>
+ <input id="input-roomplanner" type="checkbox" name="roomplanner" {{roomplanner_checked}}>
</div>
<div class="col-sm-2">
- <p class="btn btn-static helptext" title="{{lang_roomplanerTooltip}}">
+ <p class="btn btn-static helptext" title="{{lang_roomplannerTooltip}}">
<span class="glyphicon glyphicon-question-sign"></span>
</p>
</div>
diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html
index 737eef1f..a77719b8 100644
--- a/modules-available/locationinfo/templates/page-config-panel-summary.html
+++ b/modules-available/locationinfo/templates/page-config-panel-summary.html
@@ -74,13 +74,13 @@
<div class="list-group-item">
<div class="row">
<div class="col-sm-3">
- <label for="input-roomplaner">{{lang_useRoomplaner}}</label>
+ <label for="input-roomplanner">{{lang_useRoomplanner}}</label>
</div>
<div class="col-sm-7">
- <input id="input-roomplaner" type="checkbox" name="roomplaner" {{roomplaner_checked}}>
+ <input id="input-roomplanner" type="checkbox" name="roomplanner" {{roomplanner_checked}}>
</div>
<div class="col-sm-2">
- <p class="btn btn-static helptext" title="{{lang_roomplanerTooltip}}">
+ <p class="btn btn-static helptext" title="{{lang_roomplannerTooltip}}">
<span class="glyphicon glyphicon-question-sign"></span>
</p>
</div>