From 7e2509c6afbaf2a89d8df747c8e9ad0f48172221 Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Tue, 6 Feb 2018 16:16:20 +0100
Subject: [locationinfo] Fix styling of tooltip btns also made the style of two
 close btns consistent to the rest

---
 .../locationinfo/templates/page-config-panel-summary.html  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules-available/locationinfo/templates/page-config-panel-summary.html')

diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html
index 2a968fc2..3dc93680 100644
--- a/modules-available/locationinfo/templates/page-config-panel-summary.html
+++ b/modules-available/locationinfo/templates/page-config-panel-summary.html
@@ -28,9 +28,9 @@
 									<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_displayNameTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -48,9 +48,9 @@
 									</select>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_languageTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_languageTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -64,9 +64,9 @@
 									<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_ecoTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_ecoTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -151,7 +151,7 @@ document.addEventListener("DOMContentLoaded", function () {
 	var $locInput = $('#locationids');
 
 	// Initialize fancy tooltips
-	$('a.helptext').tooltip();
+	$('p.helptext').tooltip();
 	// Add listener to range sliders so their label can be updated
 	$('input[type="range"]').change(function () {
 		$(this).siblings().find('.range-display').text($(this).val());
-- 
cgit v1.2.3-55-g7522


From e77086ed9ae09ec569d55fd06814a4a536d2bbea Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Thu, 12 Apr 2018 15:11:13 +0200
Subject: [locationinfo] Move save btn to the right (design guidelines)

---
 .../locationinfo/templates/page-config-panel-default.html              | 2 +-
 .../locationinfo/templates/page-config-panel-summary.html              | 2 +-
 modules-available/locationinfo/templates/page-config-panel-url.html    | 2 +-
 modules-available/locationinfo/templates/page-locations.html           | 2 +-
 modules-available/locationinfo/templates/page-servers.html             | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'modules-available/locationinfo/templates/page-config-panel-summary.html')

diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index 41a8fd00..ba493579 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -309,8 +309,8 @@
 
 		</div>
 	</div>
-	<button type="submit" class="btn btn-primary">{{lang_save}}</button>
 	<a href="?do=locationinfo&amp;show=panels" class="btn btn-default">{{lang_cancel}}</a>
+	<button type="submit" class="btn btn-primary">{{lang_save}}</button>
 </form>
 
 <div class="modal fade" id="no-locations-message" tabindex="-1" role="dialog">
diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html
index 3dc93680..7f145916 100644
--- a/modules-available/locationinfo/templates/page-config-panel-summary.html
+++ b/modules-available/locationinfo/templates/page-config-panel-summary.html
@@ -122,8 +122,8 @@
 
 		</div>
 	</div>
-	<button type="submit" class="btn btn-primary">{{lang_save}}</button>
 	<a href="?do=locationinfo&amp;show=panels" class="btn btn-default">{{lang_cancel}}</a>
+	<button type="submit" class="btn btn-primary">{{lang_save}}</button>
 </form>
 
 <div class="modal fade" id="no-locations-message" tabindex="-1" role="dialog">
diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html
index 798ff55d..efcafb77 100644
--- a/modules-available/locationinfo/templates/page-config-panel-url.html
+++ b/modules-available/locationinfo/templates/page-config-panel-url.html
@@ -88,8 +88,8 @@
 		</div>
 	</div>
 
-	<button type="submit" class="btn btn-primary">{{lang_save}}</button>
 	<a href="?do=locationinfo&amp;show=panels" class="btn btn-default">{{lang_cancel}}</a>
+	<button type="submit" class="btn btn-primary">{{lang_save}}</button>
 </form>
 
 <script type="text/javascript"><!--
diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html
index 94c4cd40..67da2c2e 100644
--- a/modules-available/locationinfo/templates/page-locations.html
+++ b/modules-available/locationinfo/templates/page-locations.html
@@ -53,8 +53,8 @@
 				<div class="modal-header"><h2 id="location-modal-header"></h2></div>
 				<div class="modal-body"></div>
 				<div class="modal-footer">
-					<button type="submit" class="btn btn-primary">{{lang_save}}</button>
 					<a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a>
+					<button type="submit" class="btn btn-primary">{{lang_save}}</button>
 				</div>
 			</form>
 		</div>
diff --git a/modules-available/locationinfo/templates/page-servers.html b/modules-available/locationinfo/templates/page-servers.html
index 3edb0e66..6b02826e 100644
--- a/modules-available/locationinfo/templates/page-servers.html
+++ b/modules-available/locationinfo/templates/page-servers.html
@@ -59,9 +59,8 @@
 			<div class="modal-header" id="myModalHeader"></div>
 			<div class="modal-body" id="myModalBody"></div>
 			<div class="modal-footer">
-				<button type="submit" id="myModalSubmitButton" class="btn btn-primary" form="">{{lang_save}}</button>
-
 				<a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a>
+				<button type="submit" id="myModalSubmitButton" class="btn btn-primary" form="">{{lang_save}}</button>
 			</div>
 		</div>
 
-- 
cgit v1.2.3-55-g7522


From 410946b3c55f5b1b3a8e5f1056504caebca37ee1 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Thu, 11 Oct 2018 15:29:03 +0200
Subject: [locationinfo] apply design guidelines / table styling - move buttons
 to the right hand side - use modals for confirmation check - table
 styling/adjustment   -- add missing headers   -- remove text from buttons in
 table   -- center buttons / header-text - improve language-tags

---
 .../locationinfo/lang/de/template-tags.json        |   3 +-
 .../locationinfo/lang/en/template-tags.json        |   3 +-
 .../templates/page-config-panel-summary.html       |  13 ++-
 .../templates/page-config-panel-url.html           |   7 +-
 .../locationinfo/templates/page-locations.html     |   6 +-
 .../locationinfo/templates/page-panels.html        |  49 +++++++---
 .../locationinfo/templates/page-servers.html       | 101 ++++++++++++---------
 7 files changed, 114 insertions(+), 68 deletions(-)

(limited to 'modules-available/locationinfo/templates/page-config-panel-summary.html')

diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json
index b51c420b..7862297c 100644
--- a/modules-available/locationinfo/lang/de/template-tags.json
+++ b/modules-available/locationinfo/lang/de/template-tags.json
@@ -42,6 +42,7 @@
     "lang_locations": "Orte",
     "lang_locationsTable": "R\u00e4ume \/ Orte",
     "lang_locationsTableHints": "Hier k\u00f6nnen Sie f\u00fcr die R\u00e4ume und Orte Ihrer Einrichtung \u00d6ffnungszeiten hinterlegen, sowie die Verkn\u00fcpfung mit Raum-IDs aus konfigurierten Backends (z.B. HISinOne) vornehmen, damit Belegungspl\u00e4ne abgerufen werden k\u00f6nnen.",
+    "lang_locsHint": "Hier k\u00f6nnen Sie die Orte ausw\u00e4hlen, die in diesem Panel angezeigt werden.",
     "lang_longFri": "Freitag",
     "lang_longMon": "Montag",
     "lang_longSat": "Samstag",
@@ -57,7 +58,7 @@
     "lang_modeTooltip": "Die Anzeigemodi, welche das Frontend unterst\u00fctzt",
     "lang_monTilFr": "Montag - Freitag",
     "lang_nameTooltip": "Legt den Namen des Servers fest",
-    "lang_noLocationsWarning": "Sie haben keine Orte f\u00fcr dieses Panel ausgew\u00e4hlt",
+    "lang_noLocationsWarning": "Bitte w\u00e4hlen Sie mindestens einen Ort aus, der vom Panel angezeigt werden soll.",
     "lang_noServer": "<Kein Server>",
     "lang_openingTime": "\u00d6ffnungszeit",
     "lang_openingtimes": "\u00d6ffnungszeiten",
diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json
index f041dc0a..2a191379 100644
--- a/modules-available/locationinfo/lang/en/template-tags.json
+++ b/modules-available/locationinfo/lang/en/template-tags.json
@@ -42,6 +42,7 @@
     "lang_locations": "Locations",
     "lang_locationsTable": "Rooms \/ Locations",
     "lang_locationsTableHints": "Here you can define opening times for your locations and link the location ID to a configured backend (e.g. HISinOne) to show calendar events.",
+    "lang_locsHint": "You can pick up the locations that will be shown in this panel.",
     "lang_longFri": "Friday",
     "lang_longMon": "Monday",
     "lang_longSat": "Saturday",
@@ -57,7 +58,7 @@
     "lang_modeTooltip": "The display modes the frontend supports",
     "lang_monTilFr": "Monday - Friday",
     "lang_nameTooltip": "Defines the name of the server",
-    "lang_noLocationsWarning": "Please select at least one location this panel should display",
+    "lang_noLocationsWarning": "Please select at least one location this panel should display.",
     "lang_noServer": "<no server>",
     "lang_openingTime": "Opening time",
     "lang_openingtimes": "Opening times",
diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html
index 7f145916..11f0dc65 100644
--- a/modules-available/locationinfo/templates/page-config-panel-summary.html
+++ b/modules-available/locationinfo/templates/page-config-panel-summary.html
@@ -101,7 +101,7 @@
 					<div class="panel-heading">{{lang_locations}}</div>
 					<div class="panel-body">
 						<input type="hidden" name="locationids" value="{{locationids}}" id="locationids">
-						<p>{{lang_fourLocsHint}}</p>
+						<p>{{lang_locsHint}}</p>
 						<ul id="selected-locations" class="list-unstyled">
 
 						</ul>
@@ -122,8 +122,10 @@
 
 		</div>
 	</div>
-	<a href="?do=locationinfo&amp;show=panels" class="btn btn-default">{{lang_cancel}}</a>
-	<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+	<div class="text-right">
+		<a href="?do=locationinfo&amp;show=panels" class="btn btn-default">{{lang_cancel}}</a>
+		<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+	</div>
 </form>
 
 <div class="modal fade" id="no-locations-message" tabindex="-1" role="dialog">
@@ -171,6 +173,7 @@ document.addEventListener("DOMContentLoaded", function () {
 	// Adding/removing locations
 	$locList.find('a').click(function(ev) {
 		ev.preventDefault();
+		ev.stopPropagation();
 		var $this = $(this);
 		var name = $this.find('.name').text();
 		var id = $this.data('lid');
@@ -187,8 +190,8 @@ document.addEventListener("DOMContentLoaded", function () {
 
 	function addLocation(id, name) {
 		$selLocs.find('li[data-lid="' + id + '"]').remove();
-		var delButton = $('<button class="btn btn-danger btn-xs" type="button">').append($('<span class="glyphicon glyphicon-remove">')).click(delParent);
-		$selLocs.append($('<li>').attr('data-lid', id).text(name).prepend(delButton));
+		var delButton = $('<button style="margin-right: 5px;" class="btn btn-danger btn-xs" type="button">').append($('<span class="glyphicon glyphicon-remove">')).click(delParent);
+		$selLocs.append($('<li style="margin-top: 5px;">').attr('data-lid', id).text(name).prepend(delButton));
 	}
 
 	function delParent() {
diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html
index efcafb77..1187c19f 100644
--- a/modules-available/locationinfo/templates/page-config-panel-url.html
+++ b/modules-available/locationinfo/templates/page-config-panel-url.html
@@ -87,9 +87,10 @@
 			</div>
 		</div>
 	</div>
-
-	<a href="?do=locationinfo&amp;show=panels" class="btn btn-default">{{lang_cancel}}</a>
-	<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+	<div class="text-right">
+		<a href="?do=locationinfo&amp;show=panels" class="btn btn-default">{{lang_cancel}}</a>
+		<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+	</div>
 </form>
 
 <script type="text/javascript"><!--
diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html
index 67da2c2e..c79cdfe8 100644
--- a/modules-available/locationinfo/templates/page-locations.html
+++ b/modules-available/locationinfo/templates/page-locations.html
@@ -8,7 +8,7 @@
 		<th>{{lang_locationName}}</th>
 		<th>{{lang_backend}}</th>
 		<th>{{lang_lastCalendarUpdate}}</th>
-		<th>{{lang_openingtimes}}</th>
+		<th class="text-center slx-smallcol">{{lang_openingtimes}}</th>
 	</tr>
 	</thead>
 
@@ -29,12 +29,12 @@
 			<td {{#backendMissing}}class="text-danger"{{/backendMissing}}>
 				{{backend}}
 			</td>
-			<td>
+			<td class="text-center">
 				{{#backend}}
 					{{lastCalendarUpdate}}
 				{{/backend}}
 			</td>
-			<td>
+			<td class="text-center">
 				<span class="glyphicon glyphicon-{{openingGlyph}}"></span>
 			</td>
 		</tr>
diff --git a/modules-available/locationinfo/templates/page-panels.html b/modules-available/locationinfo/templates/page-panels.html
index 2bccc796..b30e7c87 100644
--- a/modules-available/locationinfo/templates/page-panels.html
+++ b/modules-available/locationinfo/templates/page-panels.html
@@ -9,16 +9,13 @@
 		<th>{{lang_panelType}}</th>
 		<th>{{lang_locations}}</th>
 		{{#hasRunmode}}
-			<th class="slx-smallcol">{{lang_runmodeTHead}}</th>
+			<th class="text-center slx-smallcol">{{lang_runmodeTHead}}</th>
 		{{/hasRunmode}}
-		<th class="slx-smallcol">{{lang_edit}}</th>
-		<th class="slx-smallcol">{{lang_delete}}</th>
+		<th class="text-center slx-smallcol">{{lang_edit}}</th>
+		<th class="text-center slx-smallcol">{{lang_delete}}</th>
 	</tr>
 	</thead>
 	<tbody>
-	<form method="post" action="?do=locationinfo" onsubmit="return confirm('{{lang_areYouSure}}')">
-		<input type="hidden" name="token" value="{{token}}">
-		<input type="hidden" name="action" value="deletePanel">
 		{{#panels}}
 			<tr>
 				<td>
@@ -33,7 +30,7 @@
 					{{#locationurl}}</a>{{/locationurl}}
 				</td>
 				{{#hasRunmode}}
-					<td>
+					<td class="text-center" style="vertical-align: middle">
 						<a class="btn btn-default btn-xs {{runmode_disabled}}"
 							href="?do=runmode&amp;module=locationinfo&amp;modeid={{paneluuid}}&amp;redirect=?do=locationinfo">
 							<span class="glyphicon glyphicon-edit"></span>
@@ -41,20 +38,19 @@
 						{{assignedMachineCount}}
 					</td>
 				{{/hasRunmode}}
-				<td>
+				<td class="text-center" style="vertical-align: middle">
 					<a class="btn btn-default btn-xs {{edit_disabled}}"
 						href="?do=locationinfo&amp;show=edit-panel&amp;uuid={{paneluuid}}">
 						<span class="glyphicon glyphicon-cog"></span>
 					</a>
 				</td>
-				<td>
-					<button type="submit" name="uuid" value="{{paneluuid}}" class="btn btn-danger btn-xs" {{edit_disabled}}>
+				<td class="text-center" style="vertical-align: middle">
+					<button type="button" class="btn btn-xs btn-danger" data-toggle="modal" data-target="#deleteModal" onclick="deletePanel('{{paneluuid}}')" {{edit_disabled}}>
 						<span class="glyphicon glyphicon-trash"></span>
 					</button>
 				</td>
 			</tr>
 		{{/panels}}
-	</form>
 	</tbody>
 </table>
 
@@ -71,4 +67,33 @@
 		<span class="glyphicon glyphicon-plus"></span>
 		{{lang_urlPanel}}
 	</a>
-</div>
\ No newline at end of file
+</div>
+
+<form method="post" action="?do=locationinfo">
+<input type="hidden" name="token" value="{{token}}">
+
+<div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				<h4 class="modal-title" id="myModalLabel">{{lang_delete}}</h4>
+			</div>
+			<div class="modal-body">
+				<p>{{lang_deleteConfirmation}}</p>
+			</div>
+			<div class="modal-footer">
+				<input type="hidden" id="delete-panel-id" name="uuid" value="">
+				<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+				<button type="submit" name="action" value="deletePanel" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button>
+			</div>
+		</div>
+	</div>
+</div>
+</form>
+
+<script>
+	function deletePanel(panelid) {
+		$("#delete-panel-id").val(panelid);
+	}
+</script>
\ No newline at end of file
diff --git a/modules-available/locationinfo/templates/page-servers.html b/modules-available/locationinfo/templates/page-servers.html
index 6b02826e..46a148ce 100644
--- a/modules-available/locationinfo/templates/page-servers.html
+++ b/modules-available/locationinfo/templates/page-servers.html
@@ -2,50 +2,67 @@
 
 <p>{{lang_serverTableHints}}</p>
 
-<table class="table table-hover">
-	<thead>
-	<tr>
-		<th width="1">{{lang_serverType}}</th>
-		<th>{{lang_locationName}}</th>
-		<th width="1"></th>
-		<th width="1"></th>
-	</tr>
-	</thead>
-	<tbody>
-	{{#serverlist}}
-	<form method="post" action="?do=locationinfo">
-		<input type="hidden" name="token" value="{{token}}">
-		<input type="hidden" name="serverid" value="{{serverid}}">
+<form method="post" action="?do=locationinfo">
+	<table class="table table-hover">
+		<thead>
 		<tr>
-			<td nowrap>{{typename}}</td>
-			<td nowrap>{{servername}}</td>
-
-			<td align="center" nowrap>
-				<button class="btn btn-xs {{^autherror}}btn-default{{/autherror}}{{#autherror}}btn-danger{{/autherror}}"
-						data-server-edit="{{serverid}}" {{disabled}} {{perms.backend.edit.disabled}} type="button">
-					<span class="glyphicon glyphicon-cog"></span>
-					{{lang_edit}}
-				</button>
-				<button class="btn btn-xs btn-primary server-check" {{disabled}} {{perms.backend.check.disabled}}
-						name="action" value="checkConnection" type="submit">
-					<span class="glyphicon glyphicon-refresh"></span>
-					{{lang_checkConnection}}
-				</button>
-			</td>
-			<td align="center" nowrap>
-				<button class="btn btn-xs btn-danger server-delete" type="submit" name="action" value="deleteServer"
-					{{perms.backend.edit.disabled}}>
-					<span class="glyphicon glyphicon-trash"></span>
-					{{lang_delete}}
-				</button>
-			</td>
+			<th class="text-center slx-smallcol">{{lang_serverType}}</th>
+			<th>{{lang_locationName}}</th>
+			<th class="text-center slx-smallcol">{{lang_edit}}</th>
+			<th class="text-center slx-smallcol">{{lang_checkConnection}}</th>
+			<th class="text-center slx-smallcol">{{lang_delete}}</th>
 		</tr>
-	</form>
-	{{/serverlist}}
-	</tbody>
-</table>
+		</thead>
+		<tbody>
+		{{#serverlist}}
+			<input type="hidden" name="token" value="{{token}}">
+			<input type="hidden" name="serverid" value="{{serverid}}">
+			<tr>
+				<td nowrap>{{typename}}</td>
+				<td nowrap>{{servername}}</td>
+
+				<td class="text-center">
+					<button class="btn btn-xs {{^autherror}}btn-default{{/autherror}}{{#autherror}}btn-danger{{/autherror}}"
+							data-server-edit="{{serverid}}" {{disabled}} {{perms.backend.edit.disabled}} type="button">
+						<span class="glyphicon glyphicon-cog"></span>
+					</button>
+				</td>
+				<td class="text-center">
+					<button class="btn btn-xs btn-primary server-check" {{disabled}} {{perms.backend.check.disabled}}
+							name="action" value="checkConnection" type="submit">
+						<span class="glyphicon glyphicon-refresh"></span>
+					</button>
+				</td>
+				<td class="text-center">
+					<button type="button" class="btn btn-xs btn-danger" data-toggle="modal" data-target="#deleteModal" {{perms.backend.edit.disabled}}>
+						<span class="glyphicon glyphicon-trash"></span>
+					</button>
+				</td>
+			</tr>
+		{{/serverlist}}
+		</tbody>
+	</table>
+
+	<div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+					<h4 class="modal-title" id="myModalLabel">{{lang_delete}}</h4>
+				</div>
+				<div class="modal-body">
+					<p>{{lang_deleteConfirmation}}</p>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+					<button type="submit" name="action" value="deleteServer" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
 
-<div>
+<div class="text-right">
 	<button class="btn btn-sm btn-success" id="addServerButton" onclick="addServer()">
 		<span class="glyphicon glyphicon-plus"></span>
 		{{lang_addServer}}
@@ -54,7 +71,6 @@
 
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog">
 	<div class="modal-dialog">
-
 		<div class="modal-content">
 			<div class="modal-header" id="myModalHeader"></div>
 			<div class="modal-body" id="myModalBody"></div>
@@ -63,7 +79,6 @@
 				<button type="submit" id="myModalSubmitButton" class="btn btn-primary" form="">{{lang_save}}</button>
 			</div>
 		</div>
-
 	</div>
 </div>
 
-- 
cgit v1.2.3-55-g7522


From f57731abf206bf3030a7a95a9019aa398c3dea2e Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Mon, 3 Dec 2018 19:03:24 +0100
Subject: [locationinfo] add new settings for panels (counter, updaterate) -
 setting: consider only clients in roomplaner, instead of ip range - add
 option to set update rate in summary panels - directly initialize when mode
 is "only calendar" - Set counter to "-" if room has ongoing event - fix some
 spelling / unused code

---
 modules-available/locationinfo/api.inc.php         | 23 +++++--
 .../locationinfo/inc/locationinfo.inc.php          |  7 +-
 .../locationinfo/lang/de/template-tags.json        |  2 +
 .../locationinfo/lang/en/template-tags.json        |  2 +
 modules-available/locationinfo/page.inc.php        | 18 +++++-
 .../locationinfo/templates/frontend-default.html   | 25 ++++++--
 .../locationinfo/templates/frontend-summary.html   | 74 ++++++----------------
 .../templates/page-config-panel-default.html       | 16 +++++
 .../templates/page-config-panel-summary.html       | 44 +++++++++++++
 9 files changed, 139 insertions(+), 72 deletions(-)

(limited to 'modules-available/locationinfo/templates/page-config-panel-summary.html')

diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php
index ad71de8b..c33c528e 100644
--- a/modules-available/locationinfo/api.inc.php
+++ b/modules-available/locationinfo/api.inc.php
@@ -7,7 +7,7 @@
 HandleParameters();
 
 /**
- * Handles the API paramenters.
+ * Handles the API parameters.
  */
 function HandleParameters()
 {
@@ -20,7 +20,7 @@ function HandleParameters()
 	} elseif ($get === "machines") {
 		$locationIds = LocationInfo::getLocationsOr404($uuid);
 		$output = array();
-		InfoPanel::appendMachineData($output, $locationIds, false);
+		InfoPanel::appendMachineData($output, $locationIds, true);
 		$output = array_values($output);
 	} elseif ($get === "config") {
 		$type = InfoPanel::getConfig($uuid, $output);
@@ -30,7 +30,7 @@ function HandleParameters()
 		}
 	} elseif ($get === "pcstates") {
 		$locationIds = LocationInfo::getLocationsOr404($uuid);
-		$output = getPcStates($locationIds);
+		$output = getPcStates($locationIds, $uuid);
 	} elseif ($get === "locationtree") {
 		$locationIds = LocationInfo::getLocationsOr404($uuid);
 		$output = getLocationTree($locationIds);
@@ -84,7 +84,7 @@ function getLastChangeTs($paneluuid)
  * @param int[] $idList list of the location ids.
  * @return array aggregated PC states
  */
-function getPcStates($idList)
+function getPcStates($idList, $paneluuid)
 {
 	$pcStates = array();
 	foreach ($idList as $id) {
@@ -99,13 +99,24 @@ function getPcStates($idList)
 	}
 
 	$locationInfoList = array();
-	InfoPanel::appendMachineData($locationInfoList, $idList);
+	InfoPanel::appendMachineData($locationInfoList, $idList, true);
+
+	$panel = Database::queryFirst('SELECT paneluuid, panelconfig FROM locationinfo_panel WHERE paneluuid = :paneluuid',
+		compact('paneluuid'));
+	$config = json_decode($panel['panelconfig'], true);
+
 	foreach ($locationInfoList as $locationInfo) {
 		$id = $locationInfo['id'];
 		foreach ($locationInfo['machines'] as $pc) {
 			$key = strtolower($pc['pcState']);
 			if (isset($pcStates[$id][$key])) {
-				$pcStates[$id][$key]++;
+				if ($config['roomplaner']) {
+					if (isset($pc['x']) && isset($pc['y'])) {
+						$pcStates[$id][$key]++;
+					}
+				} else {
+					$pcStates[$id][$key]++;
+				}
 			}
 		}
 	}
diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php
index c51be666..88f96d29 100644
--- a/modules-available/locationinfo/inc/locationinfo.inc.php
+++ b/modules-available/locationinfo/inc/locationinfo.inc.php
@@ -80,6 +80,7 @@ class LocationInfo
 				'vertical' => false,
 				'eco' => false,
 				'prettytime' => true,
+				'roomplaner' => true,
 				'scaledaysauto' => true,
 				'daystoshow' => 7,
 				'rotation' => 0,
@@ -93,9 +94,9 @@ class LocationInfo
 		if ($type === 'SUMMARY') {
 			return array(
 				'language' => defined('LANG') ? LANG : 'en',
-				'calupdate' => 30,
-				'roomupdate' => 15,
-				'configupdate' => 180,
+				'roomplaner' => true,
+				'eco' => false,
+				'panelupdate' => 60,
 			);
 		}
 		return array();
diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json
index 7862297c..e93d83a9 100644
--- a/modules-available/locationinfo/lang/de/template-tags.json
+++ b/modules-available/locationinfo/lang/de/template-tags.json
@@ -78,6 +78,7 @@
     "lang_room": "Raum",
     "lang_roomId": "Raum ID",
     "lang_roomIdTooltip": "Die Raum ID, die der Server ben\u00f6tigt, um Kalenderdaten abzurufen (bei Exchange die Postfachadresse)",
+    "lang_roomplanerTooltip": "Nur PCs berücksichtigen, die im Raumplaner gesetzt wurden",
     "lang_roomupdateTooltip": "Zeit nach der die PCs aktualisiert werden (in Sekunden)",
     "lang_rotation": "Rotation",
     "lang_rotation0": "0\u00b0",
@@ -119,6 +120,7 @@
     "lang_url": "URL",
     "lang_urlPanel": "URL-Panel",
     "lang_urlTooltip": "URL die aufgerufen wird",
+    "lang_useRoomplaner": "Raumplaner benutzen",
     "lang_vertical": "Vertikaler Modus",
     "lang_verticalTooltip": "Legt fest, ob Kalender und Raum \u00fcbereinander angezeigt werden sollen"
 }
\ No newline at end of file
diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json
index 2a191379..8a6e0724 100644
--- a/modules-available/locationinfo/lang/en/template-tags.json
+++ b/modules-available/locationinfo/lang/en/template-tags.json
@@ -78,6 +78,7 @@
     "lang_room": "Room",
     "lang_roomId": "Room ID",
     "lang_roomIdTooltip": "The ID of the room the server needs, for querying the calendar data (when using exchange the room mailbox)",
+    "lang_roomplanerTooltip": "Only consider PCs which were set in the roomplaner",
     "lang_roomupdateTooltip": "Time the PCs in the room gets updated (in seconds)",
     "lang_rotation": "Rotation",
     "lang_rotation0": "0\u00b0",
@@ -119,6 +120,7 @@
     "lang_url": "URL",
     "lang_urlPanel": "URL panel",
     "lang_urlTooltip": "URL which is shown by the panel",
+    "lang_useRoomplaner": "Use roomplans",
     "lang_vertical": "Vertical mode",
     "lang_verticalTooltip": "Defines whether the room and calendar are shown above each other"
 }
\ No newline at end of file
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index 3ff80927..26fa6c4e 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -359,6 +359,7 @@ class Page_LocationInfo extends Page
 			'vertical' => Request::post('vertical', false, 'bool'),
 			'eco' => Request::post('eco', false, 'bool'),
 			'prettytime' => Request::post('prettytime', false, 'bool'),
+			'roomplaner' => Request::post('roomplaner', false, 'bool'),
 			'scaledaysauto' => Request::post('scaledaysauto', false, 'bool'),
 			'daystoshow' => Request::post('daystoshow', 7, 'int'),
 			'rotation' => Request::post('rotation', 0, 'int'),
@@ -388,9 +389,19 @@ class Page_LocationInfo extends Page
 
 	private function preparePanelConfigSummary()
 	{
+		// Build json structure
+		$conf = array(
+			'language' => Request::post('language', 'en', 'string'),
+			'eco' => Request::post('eco', false, 'bool'),
+			'roomplaner' => Request::post('roomplaner', false, 'bool'),
+			'panelupdate' => Request::post('panelupdate', 30, 'int')
+		);
+		if ($conf['panelupdate'] < 15) {
+			$conf['panelupdate'] = 15;
+		}
 		// Check locations
 		$locationids = self::getLocationIdsFromRequest(true);
-		return array('locationids' => $locationids);
+		return array('config' => $conf, 'locationids' => $locationids);
 	}
 
 	/**
@@ -922,6 +933,7 @@ class Page_LocationInfo extends Page
 				'vertical_checked' => $config['vertical'] ? 'checked' : '',
 				'eco_checked' => $config['eco'] ? 'checked' : '',
 				'prettytime_checked' => $config['prettytime'] ? 'checked' : '',
+				'roomplaner_checked' => $config['roomplaner'] ? 'checked' : '',
 				'scaledaysauto_checked' => $config['scaledaysauto'] ? 'checked' : '',
 				'daystoshow' => $config['daystoshow'],
 				'rotation' => $config['rotation'],
@@ -947,9 +959,11 @@ class Page_LocationInfo extends Page
 				'uuid' => $id,
 				'panelname' => $panel['panelname'],
 				'languages' => $langs,
-				'roomupdate' => $config['roomupdate'],
+				'panelupdate' => $config['panelupdate'],
+				'roomplaner_checked' => $config['roomplaner'] ? 'checked' : '',
 				'locations' => Location::getLocations(),
 				'locationids' => $panel['locationids'],
+				'eco_checked' => $config['eco'] ? 'checked' : '',
 			));
 		}
 	}
diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html
index d1ecaae8..7317f8e2 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -619,6 +619,11 @@ optional:
 			generateProgressBar();
 		}
 
+		// Manually initialize mode 2, as initRoomLayout isn't called for this mode
+		if (room.config.mode === 2) {
+			queryCalendars();
+			queryRooms();
+		}
 		mainUpdateLoop();
 		setInterval(mainUpdateLoop, 10000);
 		setInterval(updateHeaders, globalConfig.eco ? 10000 : 1000);
@@ -1116,12 +1121,11 @@ optional:
 	 * @param room Room
 	 */
 	function SetFreeSeats(room) {
-		room.$.seatsCounter.text(room.freePcs >= 0 ? room.freePcs : '');
+		// if room has no allowed value, set text in the box to -
+		room.$.seatsCounter.text(room.freePcs >= 0 ? room.freePcs : '-');
 		room.$.seatsCounter.data('state', JSON.stringify(room.state));
 		if (room.freePcs > 0 && room.state && room.state.free) {
-				room.$.seatsBackground.css('background-color', '#250');
-		} else if (room.freePcs === -1) {
-			room.$.seatsBackground.css('background-color', 'red');
+			room.$.seatsBackground.css('background-color', '#250');
 		} else {
 			room.$.seatsBackground.css('background-color', 'red');
 		}
@@ -1148,7 +1152,8 @@ optional:
 			if (!same) newText = t("closed");
 		} else if (tmp.state === "CalendarEvent") {
 			if (!same) newText = tmp.title;
-			seats = -1;
+			// whilst event is running set freePcs to -, hopefully not breaking anything else with this
+			room.freePcs = "-";
 		} else if (tmp.state === "Free") {
 			if (!same) newText = t("free");
 		} else if (tmp.state === "FreeNoEnd") {
@@ -1496,8 +1501,14 @@ optional:
 		for (var i = 0; i < update.length; i++) {
 			var $div = $("#pc_" + room.id + "_" + update[i].id);
 			// Pc free
-			if (update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY") {
-				freePcs++;
+			if (room.config.roomplaner === true) {
+				if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY") && !isNaN(update[i].x) && !isNaN(update[i].y)) {
+					freePcs++;
+				}
+			} else {
+				if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY")) {
+					freePcs++;
+				}
 			}
 
 			$div.removeClass('BROKEN OFFLINE IDLE OCCUPIED STANDBY'.replace(update[i].pcState, '')).addClass(update[i].pcState);
diff --git a/modules-available/locationinfo/templates/frontend-summary.html b/modules-available/locationinfo/templates/frontend-summary.html
index 4105dd16..0053d1ff 100644
--- a/modules-available/locationinfo/templates/frontend-summary.html
+++ b/modules-available/locationinfo/templates/frontend-summary.html
@@ -116,6 +116,7 @@
 		var startdate;
 		var roomidsString = "";
 		var config = {{{config}}};
+		var lastPanelUpdate = 0;
 
 		$(document).ready(function () {
 			init();
@@ -139,6 +140,7 @@
 			SetUpDate(time);
 			generateLayout(config.tree);
 			update();
+			setInterval(update, 10000);
 		}
 
 		function SetUpDate(d) {
@@ -165,7 +167,7 @@
 		 */
 		function generateObject(json, myParent, outermost) {
 			var obj;
-			if (!json.children || json.children.length == 0) {
+			if (!json.children || json.children.length === 0) {
 				obj = generateChild(myParent, json.locationid, json.locationname, outermost);
 			} else {
 				obj = generateParent(myParent, json.locationid, json.locationname, outermost);
@@ -178,59 +180,24 @@
 		}
 
 		/**
-		 * Helper function to generate id string used in query functions
-		 * @param list A string, wicht contains ids or not(for now)
-		 * @param id An ID which should be added to the list
+		 * Main Update loop, this loop runs every 10 seconds
 		 */
-		function addIdToUpdateList(list, id) {
-			if (list == "") {
-				list += id;
-			} else {
-				list += ("," + id);
-			}
-			return list;
-		}
-
-
-		const ROOMUPDATE_MS = 2*60*1000;
-		const CALUPDATE_MS = 20*60*1000;
-      var timeout = null;
-
 		function update() {
-			var calendarUpdateIds = "";
-			var rommUpdateIds = "";
-			var count = 0;
-			var nextUpdate = 15000;
-			var property;
-			// TODO: Only query a few rooms is not possible with the new api stuff ...
-			for (property in rooms) {
-				if (rooms[property].lastCalendarUpdate === null || rooms[property].lastCalendarUpdate + CALUPDATE_MS < MyDate().getTime()) {
-					// TODO: NOT NECESSARY ANYMORE?!
-					calendarUpdateIds = addIdToUpdateList(calendarUpdateIds, rooms[property].id);
-					count++;
-					rooms[property].lastCalendarUpdate = MyDate().getTime();
-				}
-				if (rooms[property].lastRoomUpdate === null || rooms[property].lastRoomUpdate + ROOMUPDATE_MS < MyDate().getTime()) {
-					// TODO: NOT NECESSARY ANYMORE?!
-					rommUpdateIds = addIdToUpdateList(rommUpdateIds, rooms[property].id);
-					count++;
-					rooms[property].lastRoomUpdate = MyDate().getTime();
-				}
-				// TODO if (count > 7) break;
-			}
-			if (calendarUpdateIds !== "") {
-				queryCalendars();
-				nextUpdate = 1000;
-			}
-			if (rommUpdateIds !== "") {
+			var date = MyDate();
+			var now = date.getTime();
+			if (lastPanelUpdate + (config.panelupdate * 1000) < now) {
+				// Set Roomupdate Interval has passed, update.
 				queryRooms();
-				nextUpdate = 1000;
-			}
-			if (nextUpdate !== 1000) {
+				queryCalendars();
+				lastPanelUpdate = now;
+				for (var property in rooms) {
+					rooms[property].lastCalendarUpdate = now;
+					rooms[property].lastRoomUpdate = now;
+				}
+			} else {
+				// Set Roomupdate Interval has NOT passed, check if panel was changed since last call and reload if true.
 				queryPanelChange();
 			}
-			clearTimeout(timeout);
-			setTimeout(update, nextUpdate);
 		}
 
 		function cleanDate(d) {
@@ -283,7 +250,6 @@
 				cache: false,
 				timeout: 30000,
 				success: function (result) {
-					var l = result.length;
 					if (result[0] == null) {
 						console.log("Error: Backend reported null back for RoomUpdate, this might happend if the room isn't" +
 								"configurated.");
@@ -331,7 +297,7 @@
 		function updatePcStates(json) {
 			var l = json.length;
 			for (var i = 0; i < l; i++) {
-				updateRoomUsage(json[i].id, json[i].idle, json[i].occupied, json[i].offline, json[i].broken, json[i].standby)
+				updateRoomUsage(json[i].id, json[i].idle, json[i].occupied, json[i].offline, json[i].broken, json[i].standby);
 			}
 
 		}
@@ -428,8 +394,8 @@
 
 		/**
 		 * computes state of a room, states are:
-		 * closed, FreeNoEnd, Free, ClaendarEvent.
-		 * @param Room Object
+		 * closed, FreeNoEnd, Free, CalendarEvent.
+		 * @param room Object
 		 */
 		function ComputeCurrentState(room) {
 			if (room.lastRoomUpdate === null) {
@@ -479,7 +445,7 @@
 		/**
 		 * checks if a room is open
 		 * @param room Room object
-		 * @returns bool for open or not
+		 * @returns boolean for open or not
 		 */
 		function IsOpenNow(room) {
 			var now = new MyDate();
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index f7009764..c2915298 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -107,6 +107,22 @@
 								</div>
 							</div>
 						</div>
+
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-3">
+									<label for="input-roomplaner">{{lang_useRoomplaner}}</label>
+								</div>
+								<div class="col-sm-7">
+									<input id="input-roomplaner" type="checkbox" name="roomplaner" {{roomplaner_checked}}>
+								</div>
+								<div class="col-sm-2">
+									<p class="btn btn-static helptext" title="{{lang_roomplanerTooltip}}">
+										<span class="glyphicon glyphicon-question-sign"></span>
+									</p>
+								</div>
+							</div>
+						</div>
 					</div>
 				</div>
 			</div>
diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html
index 11f0dc65..737eef1f 100644
--- a/modules-available/locationinfo/templates/page-config-panel-summary.html
+++ b/modules-available/locationinfo/templates/page-config-panel-summary.html
@@ -70,6 +70,22 @@
 								</div>
 							</div>
 						</div>
+
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-3">
+									<label for="input-roomplaner">{{lang_useRoomplaner}}</label>
+								</div>
+								<div class="col-sm-7">
+									<input id="input-roomplaner" type="checkbox" name="roomplaner" {{roomplaner_checked}}>
+								</div>
+								<div class="col-sm-2">
+									<p class="btn btn-static helptext" title="{{lang_roomplanerTooltip}}">
+										<span class="glyphicon glyphicon-question-sign"></span>
+									</p>
+								</div>
+							</div>
+						</div>
 <!--
 						<div class="list-group-item">
 							<div class="row">
@@ -91,6 +107,34 @@
 				</div>
 			</div>
 		</div>
+
+		<div class="col-md-6">
+			<div class="panel panel-default">
+				<div class="panel-heading">{{lang_updateRates}}</div>
+				<div class="panel-body">
+					<div class="list-group">
+
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-3">
+									<label for="form-panelupdate">{{lang_panel}}</label>
+								</div>
+								<div class="col-sm-7">
+									<input class="form-control" name="panelupdate" type="number" min="15" id="form-panelupdate"
+											 max="86400" value="{{panelupdate}}" required>
+								</div>
+								<div class="col-sm-2">
+									<p class="btn btn-static helptext" title="{{lang_panelupdateTooltip}}">
+										<span class="glyphicon glyphicon-question-sign"></span>
+									</p>
+								</div>
+							</div>
+						</div>
+
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
 
 	<div class="modify-inputs">
-- 
cgit v1.2.3-55-g7522


From 8e54eaafbb0a160b9b9e2dbe5c2207126bc967bc Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 5 Dec 2018 16:10:29 +0100
Subject: [locationinfo] roomplaner -> roomplanner

---
 modules-available/locationinfo/api.inc.php                        | 2 +-
 modules-available/locationinfo/inc/locationinfo.inc.php           | 4 ++--
 modules-available/locationinfo/lang/de/template-tags.json         | 4 ++--
 modules-available/locationinfo/lang/en/template-tags.json         | 4 ++--
 modules-available/locationinfo/page.inc.php                       | 8 ++++----
 modules-available/locationinfo/templates/frontend-default.html    | 2 +-
 .../locationinfo/templates/page-config-panel-default.html         | 6 +++---
 .../locationinfo/templates/page-config-panel-summary.html         | 6 +++---
 8 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'modules-available/locationinfo/templates/page-config-panel-summary.html')

diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php
index c33c528e..9ebbcea6 100644
--- a/modules-available/locationinfo/api.inc.php
+++ b/modules-available/locationinfo/api.inc.php
@@ -110,7 +110,7 @@ function getPcStates($idList, $paneluuid)
 		foreach ($locationInfo['machines'] as $pc) {
 			$key = strtolower($pc['pcState']);
 			if (isset($pcStates[$id][$key])) {
-				if ($config['roomplaner']) {
+				if ($config['roomplanner']) {
 					if (isset($pc['x']) && isset($pc['y'])) {
 						$pcStates[$id][$key]++;
 					}
diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php
index b996601a..377e960b 100644
--- a/modules-available/locationinfo/inc/locationinfo.inc.php
+++ b/modules-available/locationinfo/inc/locationinfo.inc.php
@@ -80,7 +80,7 @@ class LocationInfo
 				'vertical' => false,
 				'eco' => false,
 				'prettytime' => true,
-				'roomplaner' => true,
+				'roomplanner' => true,
 				'scaledaysauto' => true,
 				'daystoshow' => 7,
 				'rotation' => 0,
@@ -94,7 +94,7 @@ class LocationInfo
 		if ($type === 'SUMMARY') {
 			return array(
 				'language' => defined('LANG') ? LANG : 'en',
-				'roomplaner' => true,
+				'roomplanner' => true,
 				'eco' => false,
 				'panelupdate' => 60,
 			);
diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json
index e93d83a9..03eb63a5 100644
--- a/modules-available/locationinfo/lang/de/template-tags.json
+++ b/modules-available/locationinfo/lang/de/template-tags.json
@@ -78,7 +78,7 @@
     "lang_room": "Raum",
     "lang_roomId": "Raum ID",
     "lang_roomIdTooltip": "Die Raum ID, die der Server ben\u00f6tigt, um Kalenderdaten abzurufen (bei Exchange die Postfachadresse)",
-    "lang_roomplanerTooltip": "Nur PCs berücksichtigen, die im Raumplaner gesetzt wurden",
+    "lang_roomplannerTooltip": "Nur PCs berücksichtigen, die im Raumplaner gesetzt wurden",
     "lang_roomupdateTooltip": "Zeit nach der die PCs aktualisiert werden (in Sekunden)",
     "lang_rotation": "Rotation",
     "lang_rotation0": "0\u00b0",
@@ -120,7 +120,7 @@
     "lang_url": "URL",
     "lang_urlPanel": "URL-Panel",
     "lang_urlTooltip": "URL die aufgerufen wird",
-    "lang_useRoomplaner": "Raumplaner benutzen",
+    "lang_useRoomplanner": "Raumplaner benutzen",
     "lang_vertical": "Vertikaler Modus",
     "lang_verticalTooltip": "Legt fest, ob Kalender und Raum \u00fcbereinander angezeigt werden sollen"
 }
\ No newline at end of file
diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json
index 8a6e0724..1b5ab0fd 100644
--- a/modules-available/locationinfo/lang/en/template-tags.json
+++ b/modules-available/locationinfo/lang/en/template-tags.json
@@ -78,7 +78,7 @@
     "lang_room": "Room",
     "lang_roomId": "Room ID",
     "lang_roomIdTooltip": "The ID of the room the server needs, for querying the calendar data (when using exchange the room mailbox)",
-    "lang_roomplanerTooltip": "Only consider PCs which were set in the roomplaner",
+    "lang_roomplannerTooltip": "Only consider PCs which were set in the roomplanner",
     "lang_roomupdateTooltip": "Time the PCs in the room gets updated (in seconds)",
     "lang_rotation": "Rotation",
     "lang_rotation0": "0\u00b0",
@@ -120,7 +120,7 @@
     "lang_url": "URL",
     "lang_urlPanel": "URL panel",
     "lang_urlTooltip": "URL which is shown by the panel",
-    "lang_useRoomplaner": "Use roomplans",
+    "lang_useRoomplanner": "Use roomplans",
     "lang_vertical": "Vertical mode",
     "lang_verticalTooltip": "Defines whether the room and calendar are shown above each other"
 }
\ No newline at end of file
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index 26fa6c4e..13382438 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -359,7 +359,7 @@ class Page_LocationInfo extends Page
 			'vertical' => Request::post('vertical', false, 'bool'),
 			'eco' => Request::post('eco', false, 'bool'),
 			'prettytime' => Request::post('prettytime', false, 'bool'),
-			'roomplaner' => Request::post('roomplaner', false, 'bool'),
+			'roomplanner' => Request::post('roomplanner', false, 'bool'),
 			'scaledaysauto' => Request::post('scaledaysauto', false, 'bool'),
 			'daystoshow' => Request::post('daystoshow', 7, 'int'),
 			'rotation' => Request::post('rotation', 0, 'int'),
@@ -393,7 +393,7 @@ class Page_LocationInfo extends Page
 		$conf = array(
 			'language' => Request::post('language', 'en', 'string'),
 			'eco' => Request::post('eco', false, 'bool'),
-			'roomplaner' => Request::post('roomplaner', false, 'bool'),
+			'roomplanner' => Request::post('roomplanner', false, 'bool'),
 			'panelupdate' => Request::post('panelupdate', 30, 'int')
 		);
 		if ($conf['panelupdate'] < 15) {
@@ -933,7 +933,7 @@ class Page_LocationInfo extends Page
 				'vertical_checked' => $config['vertical'] ? 'checked' : '',
 				'eco_checked' => $config['eco'] ? 'checked' : '',
 				'prettytime_checked' => $config['prettytime'] ? 'checked' : '',
-				'roomplaner_checked' => $config['roomplaner'] ? 'checked' : '',
+				'roomplanner_checked' => $config['roomplanner'] ? 'checked' : '',
 				'scaledaysauto_checked' => $config['scaledaysauto'] ? 'checked' : '',
 				'daystoshow' => $config['daystoshow'],
 				'rotation' => $config['rotation'],
@@ -960,7 +960,7 @@ class Page_LocationInfo extends Page
 				'panelname' => $panel['panelname'],
 				'languages' => $langs,
 				'panelupdate' => $config['panelupdate'],
-				'roomplaner_checked' => $config['roomplaner'] ? 'checked' : '',
+				'roomplanner_checked' => $config['roomplanner'] ? 'checked' : '',
 				'locations' => Location::getLocations(),
 				'locationids' => $panel['locationids'],
 				'eco_checked' => $config['eco'] ? 'checked' : '',
diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html
index 7317f8e2..766329d9 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -1501,7 +1501,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>
-- 
cgit v1.2.3-55-g7522