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

---
 .../templates/ajax-config-location.html            | 14 +++---
 .../locationinfo/templates/ajax-config-server.html | 10 ++--
 .../templates/page-config-panel-default.html       | 54 +++++++++++-----------
 .../templates/page-config-panel-summary.html       | 14 +++---
 .../templates/page-config-panel-url.html           | 18 ++++----
 .../locationinfo/templates/page-locations.html     |  4 +-
 .../locationinfo/templates/page-servers.html       |  2 +-
 .../locationinfo/templates/server-prop-bool.html   |  6 +--
 .../templates/server-prop-dropdown.html            |  6 +--
 .../templates/server-prop-generic.html             |  6 +--
 10 files changed, 68 insertions(+), 66 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/ajax-config-location.html b/modules-available/locationinfo/templates/ajax-config-location.html
index b42ff98d..102a6ea4 100644
--- a/modules-available/locationinfo/templates/ajax-config-location.html
+++ b/modules-available/locationinfo/templates/ajax-config-location.html
@@ -110,9 +110,9 @@
 		</select>
 	</div>
 	<div class="col-sm-2">
-		<a class="btn btn-default helptext" title="{{lang_serverTooltip}}">
+		<p class="btn btn-static helptext" title="{{lang_serverTooltip}}">
 			<span class="glyphicon glyphicon-question-sign"></span>
-		</a>
+		</p>
 	</div>
 </div>
 <div class="row">
@@ -124,9 +124,9 @@
 		</div>
 	</div>
 	<div class="col-sm-2">
-		<a class="btn btn-default helptext" title="{{lang_recursiveSetTooltip}}">
+		<p class="btn btn-static helptext" title="{{lang_recursiveSetTooltip}}">
 			<span class="glyphicon glyphicon-question-sign"></span>
-		</a>
+		</p>
 	</div>
 </div>
 <div class="row">
@@ -137,9 +137,9 @@
 		<input class="form-control" name="serverlocationid" id="serverlocationid" value="{{serverlocationid}}">
 	</div>
 	<div class="col-sm-2">
-		<a class="btn btn-default helptext" title="{{lang_roomIdTooltip}}">
+		<p class="btn btn-static helptext" title="{{lang_roomIdTooltip}}">
 			<span class="glyphicon glyphicon-question-sign"></span>
-		</a>
+		</p>
 	</div>
 </div>
 
@@ -170,7 +170,7 @@
 
 		setTimepicker($('#settings-outer').find('.timepicker2'));
 
-		$('a.helptext').tooltip();
+		$('p.helptext').tooltip();
 
 		$('#new-openingtime').click(function (e) {
 			e.preventDefault();
diff --git a/modules-available/locationinfo/templates/ajax-config-server.html b/modules-available/locationinfo/templates/ajax-config-server.html
index 940bc55a..8c2cb3ba 100644
--- a/modules-available/locationinfo/templates/ajax-config-server.html
+++ b/modules-available/locationinfo/templates/ajax-config-server.html
@@ -12,9 +12,9 @@
 								 form="form-{{currentbackend}}">
 					</div>
 					<div class="col-md-2">
-						<a class="btn btn-default" title="{{lang_nameTooltip}}">
+						<p class="btn btn-static" title="{{lang_nameTooltip}}">
 							<span class="glyphicon glyphicon-question-sign"></span>
-						</a>
+						</p>
 					</div>
 				</div>
 			</div>
@@ -34,9 +34,9 @@
 						</select>
 					</div>
 					<div class="col-md-2">
-						<a class="btn btn-default" id="help-type" title="{{lang_typeTooltip}}">
+						<p class="btn btn-static" id="help-type" title="{{lang_typeTooltip}}">
 							<span class="glyphicon glyphicon-question-sign"></span>
-						</a>
+						</p>
 					</div>
 				</div>
 			</div>
@@ -92,7 +92,7 @@
 		currentBackend = value;
 	}
 
-	$('a.btn[title]').tooltip();
+	$('p.btn[title]').tooltip();
 	$('#myModalSubmitButton').attr('form', 'form-' + currentBackend);
 	$('.settings-bs-switch').bootstrapSwitch({size:'small'});
 
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index b55e3d4d..41a8fd00 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.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>
@@ -69,9 +69,9 @@
 									</select>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_modeTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_modeTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -85,9 +85,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>
@@ -101,9 +101,9 @@
 									<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_prettytimeTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_prettytimeTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -128,9 +128,9 @@
 											 max="1440" value="{{calupdate}}" required>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_calupdateTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_calupdateTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -145,9 +145,9 @@
 											 max="86400" value="{{roomupdate}}" required>
 								</div>
 								<div class="col-sm-2">
-									<a class="btn btn-default helptext" title="{{lang_roomupdateTooltip}}">
+									<p class="btn btn-static helptext" title="{{lang_roomupdateTooltip}}">
 										<span class="glyphicon glyphicon-question-sign"></span>
-									</a>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -177,9 +177,9 @@
 										<input id="input-vertical" type="checkbox" name="vertical" {{vertical_checked}}>
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_verticalTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_verticalTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -193,9 +193,9 @@
 										<input id="scaledaysauto" type="checkbox" name="scaledaysauto" {{scaledaysauto_checked}}>
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_autoscaleTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_autoscaleTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -217,9 +217,9 @@
 										</select>
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_daysToShowTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_daysToShowTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -238,9 +238,9 @@
 										</select>
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_rotationTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_rotationTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -255,9 +255,9 @@
 										<input id="input-scale" name="scale" type="range" step="1" min="10" max="90" value="{{scale}}">
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_scaleTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_scaleTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -272,9 +272,9 @@
 										<input id="input-switchtime" name="switchtime" type="range" step="1" min="1" max="120" value="{{switchtime}}">
 									</div>
 									<div class="col-sm-2">
-										<a class="btn btn-default helptext" title="{{lang_switchTimeTooltip}}">
+										<p class="btn btn-static helptext" title="{{lang_switchTimeTooltip}}">
 											<span class="glyphicon glyphicon-question-sign"></span>
-										</a>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -338,7 +338,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());
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());
diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html
index cca81509..798ff55d 100644
--- a/modules-available/locationinfo/templates/page-config-panel-url.html
+++ b/modules-available/locationinfo/templates/page-config-panel-url.html
@@ -25,9 +25,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>
@@ -42,9 +42,9 @@
 									 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required>
 						</div>
 						<div class="col-sm-2">
-							<a class="btn btn-default helptext" title="{{lang_urlTooltip}}">
+							<p class="btn btn-static helptext" title="{{lang_urlTooltip}}">
 								<span class="glyphicon glyphicon-question-sign"></span>
-							</a>
+							</p>
 						</div>
 					</div>
 				</div>
@@ -61,9 +61,9 @@
 							</div>
 						</div>
 						<div class="col-sm-2">
-							<a class="btn btn-default helptext" title="{{lang_ignoreSslTooltip}}">
+							<p class="btn btn-static helptext" title="{{lang_ignoreSslTooltip}}">
 								<span class="glyphicon glyphicon-question-sign"></span>
-							</a>
+							</p>
 						</div>
 					</div>
 				</div>
@@ -77,9 +77,9 @@
 							<input class="form-control" id="input-reload" type="number" min="0" max="999" name="reloadminutes" pattern="\d*" value="{{reloadminutes}}">
 						</div>
 						<div class="col-sm-2">
-							<a class="btn btn-default helptext" title="{{lang_reloadIntervalTooltip}}">
+							<p class="btn btn-static helptext" title="{{lang_reloadIntervalTooltip}}">
 								<span class="glyphicon glyphicon-question-sign"></span>
-							</a>
+							</p>
 						</div>
 					</div>
 				</div>
@@ -95,6 +95,8 @@
 <script type="text/javascript"><!--
 
 document.addEventListener("DOMContentLoaded", function () {
+	// Initialize fancy tooltips
+        $('p.helptext').tooltip();
 
 });
 
diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html
index b30ef2ed..37d8dd96 100644
--- a/modules-available/locationinfo/templates/page-locations.html
+++ b/modules-available/locationinfo/templates/page-locations.html
@@ -50,7 +50,7 @@
 				<div class="modal-body"></div>
 				<div class="modal-footer">
 					<button type="submit" class="btn btn-primary">{{lang_save}}</button>
-					<a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a>
+					<a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a>
 				</div>
 			</form>
 		</div>
@@ -103,4 +103,4 @@ document.addEventListener("DOMContentLoaded", function () {
 	$('#settings-form').submit(submitLocationSettings);
 });
 
-//--></script>
\ No newline at end of file
+//--></script>
diff --git a/modules-available/locationinfo/templates/page-servers.html b/modules-available/locationinfo/templates/page-servers.html
index eefb1ed5..dbf18b5f 100644
--- a/modules-available/locationinfo/templates/page-servers.html
+++ b/modules-available/locationinfo/templates/page-servers.html
@@ -60,7 +60,7 @@
 			<div class="modal-footer">
 				<button type="submit" id="myModalSubmitButton" class="btn btn-primary" form="">{{lang_save}}</button>
 
-				<a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a>
+				<a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a>
 			</div>
 		</div>
 
diff --git a/modules-available/locationinfo/templates/server-prop-bool.html b/modules-available/locationinfo/templates/server-prop-bool.html
index f430d02c..bd9dcc64 100644
--- a/modules-available/locationinfo/templates/server-prop-bool.html
+++ b/modules-available/locationinfo/templates/server-prop-bool.html
@@ -7,10 +7,10 @@
 		</div>
 		<div class="col-md-2">
 			{{#helptext}}
-				<a class="btn btn-default" title="{{helptext}}">
+				<p class="btn btn-static" title="{{helptext}}">
 					<span class="glyphicon glyphicon-question-sign"></span>
-				</a>
+				</p>
 			{{/helptext}}
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules-available/locationinfo/templates/server-prop-dropdown.html b/modules-available/locationinfo/templates/server-prop-dropdown.html
index 80667766..d1351551 100644
--- a/modules-available/locationinfo/templates/server-prop-dropdown.html
+++ b/modules-available/locationinfo/templates/server-prop-dropdown.html
@@ -10,10 +10,10 @@
 		</div>
 		<div class="col-md-2">
 			{{#helptext}}
-				<a class="btn btn-default" title="{{helptext}}">
+				<p class="btn btn-static" title="{{helptext}}">
 					<span class="glyphicon glyphicon-question-sign"></span>
-				</a>
+				</p>
 			{{/helptext}}
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules-available/locationinfo/templates/server-prop-generic.html b/modules-available/locationinfo/templates/server-prop-generic.html
index 9e94c23d..23ff1e4e 100644
--- a/modules-available/locationinfo/templates/server-prop-generic.html
+++ b/modules-available/locationinfo/templates/server-prop-generic.html
@@ -7,10 +7,10 @@
 		</div>
 		<div class="col-md-2">
 			{{#helptext}}
-				<a class="btn btn-default" title="{{helptext}}">
+				<p class="btn btn-static" title="{{helptext}}">
 					<span class="glyphicon glyphicon-question-sign"></span>
-				</a>
+				</p>
 			{{/helptext}}
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3-55-g7522


From da8870e85f59dc8e83d2c4f50432f688080cb1d1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 5 Mar 2018 14:17:36 +0100
Subject: [locationinfo] Add permissions

---
 .../locationinfo/inc/splittime.php.txt             |  80 +++++++++++++
 modules-available/locationinfo/page.inc.php        | 128 +++++++++++++++++----
 .../locationinfo/permissions/permissions.json      |  20 ++++
 .../locationinfo/templates/page-locations.html     |   4 +
 .../locationinfo/templates/page-panels.html        |   8 +-
 .../locationinfo/templates/page-servers.html       |   9 +-
 .../locationinfo/templates/page-tabs.html          |   6 +-
 7 files changed, 221 insertions(+), 34 deletions(-)
 create mode 100644 modules-available/locationinfo/inc/splittime.php.txt
 create mode 100644 modules-available/locationinfo/permissions/permissions.json

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/inc/splittime.php.txt b/modules-available/locationinfo/inc/splittime.php.txt
new file mode 100644
index 00000000..53510fee
--- /dev/null
+++ b/modules-available/locationinfo/inc/splittime.php.txt
@@ -0,0 +1,80 @@
+(Unfinished)
+
+			/*
+			error_log('Pre calendar: ' . print_r($calendar, true));
+			$bad = array();
+			for ($i = 0; $i < count($calendar); ++$i) { // Use for..count as we append while iterating
+				$entry =& $calendar[$i];
+				// YYYY-MM-DD<T>HH:MM:SS
+				$s = explode('T', $entry['start']);
+				$e = explode('T', $entry['end']);
+				if (count($s) !== 2 || count($e) !== 2) {
+					error_log('Ignoring invalid calendar entry from backend ' . $this->serverId . ': ' . json_encode($entry));
+					$bad[] = $i;
+					continue;
+				}
+				if ($e[0] === $s[0]) // Same day
+					continue;
+				$stime = explode(':', $s[1]);
+				$etime = explode(':', $e[1]);
+				if (count($stime) < 2 || count($etime) < 2) {
+					error_log('Ignoring invalid calendar entry from backend ' . $this->serverId . ': ' . json_encode($entry));
+					$bad[] = $i;
+					continue;
+				}
+				// Fix start
+				if ($stime[0] == 23 && $stime[1] >= 30) {
+					// clamp to next day
+					$day = strtotime($s[0] . ' 12:00 +1 day');
+					if ($day === false || $day <= 0) {
+						error_log('Ignoring invalid calendar entry from backend ' . $this->serverId . ': ' . json_encode($entry));
+						$bad[] = $i;
+						continue;
+					}
+					$day = date('Y-m-d', $day);
+					$bad[] = $i;
+					$calendar[] = array(
+						'title' => $entry['title'],
+						'start' => $day . 'T00:00:01',
+						'end' => $entry['end']
+					);
+					continue;
+				}
+
+				// Fix end
+				if ($etime[0] == 0 && $etime[1] <= 30) {
+					// clamp to next day
+					$day = strtotime($e[0] . ' 12:00 -1 day');
+					if ($day === false || $day <= 0) {
+						error_log('Ignoring invalid calendar entry from backend ' . $this->serverId . ': ' . json_encode($entry));
+						$bad[] = $i;
+						continue;
+					}
+					$day = date('Y-m-d', $day);
+					$bad[] = $i;
+					$calendar[] = array(
+						'title' => $entry['title'],
+						'start' => $day . 'T23:59:59',
+						'end' => $entry['end']
+					);
+					continue;
+				}
+				// Split
+				$nextday = strtotime($s[0] . ' 12:00 +1 day');
+				$nextday = date('Y-m-d', $nextday);
+				$calendar[] = array(
+					'title' => $entry['title'],
+					'start' => $nextday . 'T00:00:01',
+					'end' => $entry['end']
+				);
+				$entry['end'] = $s[0] . 'T23:59:59';
+			}
+			unset($entry);
+			if (!empty($bad)) {
+				foreach ($bad as $i) {
+					unset($calendar[$i]);
+				}
+				$calendar = array_values($calendar);
+			}
+			*/
+			error_log('Post calendar: ' . print_r($calendar, true));
\ No newline at end of file
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index 777b84db..690012ea 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -2,16 +2,15 @@
 
 class Page_LocationInfo extends Page
 {
-
-	private $action;
+	private $show;
 
 	/**
 	 * Called before any page rendering happens - early hook to check parameters etc.
 	 */
 	protected function doPreprocess()
 	{
-		$show = Request::any('show', '', 'string');
-		if ($show === 'panel') {
+		$this->show = Request::any('show', false, 'string');
+		if ($this->show === 'panel') {
 			$this->showPanel();
 			exit(0);
 		}
@@ -20,30 +19,39 @@ class Page_LocationInfo extends Page
 			Message::addError('main.no-permission');
 			Util::redirect('?do=Main'); // does not return
 		}
-		$this->action = Request::post('action');
-		if ($this->action === 'writePanelConfig') {
+		$action = Request::post('action');
+		if ($action === 'writePanelConfig') {
 			$this->writePanelConfig();
-		} elseif ($this->action === 'writeLocationConfig') {
+		} elseif ($action === 'writeLocationConfig') {
 			$this->writeLocationConfig();
 			$show = 'locations';
-		} elseif ($this->action === 'deleteServer') {
+		} elseif ($action === 'deleteServer') {
 			$this->deleteServer();
-		} elseif ($this->action === 'deletePanel') {
+		} elseif ($action === 'deletePanel') {
 			$this->deletePanel();
-		} elseif ($this->action === 'checkConnection') {
+		} elseif ($action === 'checkConnection') {
 			$this->checkConnection(Request::post('serverid', 0, 'int'));
 			$show = 'backends';
-		} elseif ($this->action === 'updateServerSettings') {
+		} elseif ($action === 'updateServerSettings') {
 			$this->updateServerSettings();
 			$show = 'backends';
 		} elseif (Request::isPost()) {
-			Message::addWarning('main.invalid-action', $this->action);
+			Message::addWarning('main.invalid-action', $action);
 		}
-		if (Request::isPost()) {
+		if (Request::isPost() || $this->show === false) {
 			if (!empty($show)) {
-				$show = '&show=' . $show;
+				//
+			} elseif (User::hasPermission('panel.list')) {
+				$show = 'panels';
+			} elseif (User::hasPermission('location.*')) {
+				$show = 'locations';
+			} elseif (User::hasPermission('backend.*')) {
+				$show = 'backends';
+			} else {
+				Message::addError('main.no-permission');
+				Util::redirect('?do=main');
 			}
-			Util::redirect('?do=locationinfo' . $show);
+			Util::redirect('?do=locationinfo&show=' . $show);
 		}
 	}
 
@@ -53,10 +61,13 @@ class Page_LocationInfo extends Page
 	protected function doRender()
 	{
 		// Do this here so we always see backend errors
-		$backends = $this->loadBackends();
-		$show = Request::get('show', '', 'string');
-		Render::addTemplate('page-tabs', array('class-' . $show => 'active'));
-		switch ($show) {
+		if (User::hasPermission('backend.*')) {
+			$backends = $this->loadBackends();
+		}
+		$data = array('class-' . $this->show => 'active');
+		Permission::addGlobalTags($data['perms'], null, ['backend.*', 'location.*', 'panel.list']);
+		Render::addTemplate('page-tabs', $data);
+		switch ($this->show) {
 		case 'locations':
 			$this->showLocationsTable();
 			break;
@@ -66,7 +77,7 @@ class Page_LocationInfo extends Page
 		case 'edit-panel':
 			$this->showPanelConfig();
 			break;
-		case '':
+		case 'panels':
 			$this->showPanelsTable();
 			break;
 		default:
@@ -79,6 +90,7 @@ class Page_LocationInfo extends Page
 	 */
 	private function deleteServer()
 	{
+		User::assertPermission('backend.edit');
 		$id = Request::post('serverid', false, 'int');
 		if ($id === false) {
 			Message::addError('server-id-missing');
@@ -97,6 +109,7 @@ class Page_LocationInfo extends Page
 			Message::addError('main.parameter-missing', 'uuid');
 			return;
 		}
+		$this->assertPanelPermission($id, 'panel.edit');
 		$res = Database::exec("DELETE FROM `locationinfo_panel` WHERE paneluuid = :id", array('id' => $id));
 		if ($res !== 1) {
 			Message::addWarning('invalid-panel-id', $id);
@@ -123,6 +136,8 @@ class Page_LocationInfo extends Page
 			Message::addError('location.invalid-location-id', $locationid);
 			return false;
 		}
+		User::assertPermission('location.edit', $locationid);
+
 		$serverid = Request::post('serverid', 0, 'int');
 		if ($serverid === 0) {
 			$serverid = null;
@@ -304,6 +319,8 @@ class Page_LocationInfo extends Page
 			Util::redirect('?do=locationinfo');
 		}
 
+		// Permission
+		$this->assertPanelPermission($paneluuid, 'panel.edit', $params['locationids']);
 
 		if ($paneluuid === 'new') {
 			$paneluuid = Util::randomUuid();
@@ -379,6 +396,7 @@ class Page_LocationInfo extends Page
 	 */
 	private function updateServerSettings()
 	{
+		User::assertPermission('backend.edit');
 		$serverid = Request::post('id', -1, 'int');
 		$servername = Request::post('name', 'unnamed', 'string');
 		$servertype = Request::post('type', '', 'string');
@@ -423,6 +441,7 @@ class Page_LocationInfo extends Page
 		if ($serverid === 0) {
 			Util::traceError('checkConnection called with no server id');
 		}
+		User::assertPermission('backend.check');
 
 		$dbresult = Database::queryFirst("SELECT servertype, credentials
 				FROM `locationinfo_coursebackend`
@@ -482,14 +501,22 @@ class Page_LocationInfo extends Page
 	 */
 	private function showBackendsTable($serverlist)
 	{
-		// Pass the data to the html and render it.
-		Render::addTemplate('page-servers', array(
+		User::assertPermission('backend.*');
+		$data = array(
 			'serverlist' => $serverlist,
-		));
+		);
+		Permission::addGlobalTags($data['perms'], null, ['backend.edit', 'backend.check']);
+		// Pass the data to the html and render it.
+		Render::addTemplate('page-servers', $data);
 	}
 
 	private function showLocationsTable()
 	{
+		$allowedLocations = User::getAllowedLocations('location.edit');
+		if (empty($allowedLocations)) {
+			Message::addError('main.no-permission');
+			return;
+		}
 		$locations = Location::getLocations(0, 0, false, true);
 
 		// Get hidden state of all locations
@@ -499,7 +526,7 @@ class Page_LocationInfo extends Page
 
 		while ($row = $dbquery->fetch(PDO::FETCH_ASSOC)) {
 			$locid = (int)$row['locationid'];
-			if (!isset($locations[$locid]))
+			if (!isset($locations[$locid]) || !in_array($locid, $allowedLocations))
 				continue;
 			$glyph = !empty($row['openingtime']) ? 'ok' : '';
 			$backend = '';
@@ -517,6 +544,7 @@ class Page_LocationInfo extends Page
 		$stack = array();
 		$depth = -1;
 		foreach ($locations as &$location) {
+			$location['allowed'] = in_array($location['locationid'], $allowedLocations);
 			while ($location['depth'] <= $depth) {
 				array_pop($stack);
 				$depth--;
@@ -537,6 +565,13 @@ class Page_LocationInfo extends Page
 
 	private function showPanelsTable()
 	{
+		$visibleLocations = User::getAllowedLocations('panel.list');
+		$editLocations = User::getAllowedLocations('panel.edit');
+		$assignLocations = USer::getAllowedLocations('panel.assign-client');
+		if (empty($visibleLocations)) {
+			Message::addError('main.no-permission');
+			return;
+		}
 		$res = Database::simpleQuery('SELECT p.paneluuid, p.panelname, p.locationids, p.panelconfig,
 			p.paneltype FROM locationinfo_panel p
 			ORDER BY panelname ASC');
@@ -550,8 +585,17 @@ class Page_LocationInfo extends Page
 			if ($row['paneltype'] === 'URL') {
 				$url = json_decode($row['panelconfig'], true)['url'];
 				$row['locations'] = $row['locationurl'] = $url;
+				$row['edit_disabled'] = empty($editLocations) ? 'disabled' : '';
+				$row['runmode_disabled'] = empty($assignLocations) ? 'disabled' : '';
 			} else {
 				$lids = explode(',', $row['locationids']);
+				// Permissions
+				if (!empty(array_diff($lids, $visibleLocations))) {
+					continue;
+				}
+				$row['edit_disabled'] = !empty(array_diff($lids, $editLocations)) ? 'disabled' : '';
+				$row['runmode_disabled'] = !empty(array_diff($lids, $assignLocations)) ? 'disabled' : '';
+				// Locations
 				$locs = array_map(function ($id) use ($locations) {
 					return isset($locations[$id]) ? $locations[$id]['locationname'] : $id;
 				}, $lids);
@@ -594,6 +638,7 @@ class Page_LocationInfo extends Page
 	 */
 	private function ajaxServerSettings($id)
 	{
+		User::assertPermission('backend.edit');
 		$oldConfig = Database::queryFirst('SELECT servername, servertype, credentials
 				FROM `locationinfo_coursebackend` WHERE serverid = :id', array('id' => $id));
 
@@ -641,6 +686,7 @@ class Page_LocationInfo extends Page
 	 */
 	private function ajaxConfigLocation($id)
 	{
+		User::assertPermission('location.edit', $id);
 		$locConfig = Database::queryFirst("SELECT serverid, serverlocationid, openingtime FROM `locationinfo_locationconfig` WHERE locationid = :id", array('id' => $id));
 		if ($locConfig !== false) {
 			$openingtimes = json_decode($locConfig['openingtime'], true);
@@ -845,6 +891,9 @@ class Page_LocationInfo extends Page
 			$config = json_decode($panel['panelconfig'], true);
 		}
 
+		// Permission
+		$this->assertPanelPermission($panel, 'panel.edit');
+
 		$def = LocationInfo::defaultPanelConfig($panel['paneltype']);
 		if (!is_array($config)) {
 			$config = $def;
@@ -953,4 +1002,35 @@ class Page_LocationInfo extends Page
 		die('Unknown panel type ' . $type);
 	}
 
+	/**
+	 * @param string|array $panelOrUuid UUID of panel, or array with keys paneltype and locationds
+	 * @param string $permission
+	 * @param null|int[] $additionalLocations
+	 */
+	private function assertPanelPermission($panelOrUuid, $permission, $additionalLocations = null)
+	{
+		if (is_array($panelOrUuid)) {
+			$panel = $panelOrUuid;
+		} else {
+			$panel = Database::queryFirst('SELECT paneltype, locationids FROM locationinfo_panel
+					WHERE paneluuid = :uuid', ['uuid' => $panelOrUuid]);
+		}
+		if ($panel === false || $panel['paneltype'] === 'URL' || empty($panel['locationids'])) {
+			if (empty($additionalLocations)) {
+				User::assertPermission($permission, null, '?do=locationinfo');
+			}
+		}
+		$allowed = User::getAllowedLocations($permission);
+		if (!empty($allowed)) {
+			$locations = explode(',', $panel['locationids']);
+			if (!empty($additionalLocations)) {
+				$locations = array_merge($locations, $additionalLocations);
+			}
+			if (empty(array_diff($locations, $allowed)))
+				return;
+		}
+		Message::addError('main.no-permission');
+		Util::redirect('?do=locationinfo');
+	}
+
 }
diff --git a/modules-available/locationinfo/permissions/permissions.json b/modules-available/locationinfo/permissions/permissions.json
new file mode 100644
index 00000000..be95a7bd
--- /dev/null
+++ b/modules-available/locationinfo/permissions/permissions.json
@@ -0,0 +1,20 @@
+{
+	"backend.edit": {
+		"location-aware": false
+	},
+	"backend.check": {
+		"location-aware": false
+	},
+	"location.edit": {
+		"location-aware": true
+	},
+	"panel.list": {
+		"location-aware": true
+	},
+	"panel.edit": {
+		"location-aware": true
+	},
+	"panel.assign-client": {
+		"location-aware": true
+	}
+}
\ No newline at end of file
diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html
index 37d8dd96..94c4cd40 100644
--- a/modules-available/locationinfo/templates/page-locations.html
+++ b/modules-available/locationinfo/templates/page-locations.html
@@ -17,10 +17,14 @@
 		<tr>
 			<td>
 				<div style="display:inline-block;width:{{depth}}em"></div>
+				{{#allowed}}
 				<a href="#" class="loc-name {{^depth}}slx-bold{{/depth}}" data-locationid="{{locationid}}">
+				{{/allowed}}
 					{{locationname}}
+				{{#allowed}}
 					<span class="glyphicon glyphicon-edit"></span>
 				</a>
+				{{/allowed}}
 			</td>
 			<td {{#backendMissing}}class="text-danger"{{/backendMissing}}>
 				{{backend}}
diff --git a/modules-available/locationinfo/templates/page-panels.html b/modules-available/locationinfo/templates/page-panels.html
index e17b6584..2bccc796 100644
--- a/modules-available/locationinfo/templates/page-panels.html
+++ b/modules-available/locationinfo/templates/page-panels.html
@@ -34,19 +34,21 @@
 				</td>
 				{{#hasRunmode}}
 					<td>
-						<a class="btn btn-default btn-xs" href="?do=runmode&amp;module=locationinfo&amp;modeid={{paneluuid}}&amp;redirect=?do=locationinfo">
+						<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>
 						</a>
 						{{assignedMachineCount}}
 					</td>
 				{{/hasRunmode}}
 				<td>
-					<a class="btn btn-default btn-xs" href="?do=locationinfo&amp;show=edit-panel&amp;uuid={{paneluuid}}">
+					<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">
+					<button type="submit" name="uuid" value="{{paneluuid}}" class="btn btn-danger btn-xs" {{edit_disabled}}>
 						<span class="glyphicon glyphicon-trash"></span>
 					</button>
 				</td>
diff --git a/modules-available/locationinfo/templates/page-servers.html b/modules-available/locationinfo/templates/page-servers.html
index dbf18b5f..3edb0e66 100644
--- a/modules-available/locationinfo/templates/page-servers.html
+++ b/modules-available/locationinfo/templates/page-servers.html
@@ -22,18 +22,19 @@
 
 			<td align="center" nowrap>
 				<button class="btn btn-xs {{^autherror}}btn-default{{/autherror}}{{#autherror}}btn-danger{{/autherror}}"
-						data-server-edit="{{serverid}}" {{disabled}} type="button">
+						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}} name="action" value="checkConnection"
-						type="submit">
+				<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">
+				<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>
diff --git a/modules-available/locationinfo/templates/page-tabs.html b/modules-available/locationinfo/templates/page-tabs.html
index ed3f01fd..743297e7 100644
--- a/modules-available/locationinfo/templates/page-tabs.html
+++ b/modules-available/locationinfo/templates/page-tabs.html
@@ -1,6 +1,6 @@
 <ul class="nav nav-tabs">
-	<li class="{{class-}}"><a href="?do=locationinfo">{{lang_panels}}</a></li>
-	<li class="{{class-locations}}"><a href="?do=locationinfo&amp;show=locations">{{lang_locationSettings}}</a></li>
-	<li class="{{class-backends}}"><a href="?do=locationinfo&amp;show=backends">{{lang_backends}}</a></li>
+	<li class="{{class-panels}} {{perms.panel.list.disabled}}"><a href="?do=locationinfo&show=panels">{{lang_panels}}</a></li>
+	<li class="{{class-locations}} {{perms.location.disabled}}"><a href="?do=locationinfo&amp;show=locations">{{lang_locationSettings}}</a></li>
+	<li class="{{class-backends}} {{perms.backend.disabled}}"><a href="?do=locationinfo&amp;show=backends">{{lang_backends}}</a></li>
 </ul>
 <br>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 0b12472b6ecb09b5053c50bca9e8f13e4f367af3 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 5 Apr 2018 10:12:48 +0200
Subject: [locationinfo] Fix color of seat counter not updating properly

---
 modules-available/locationinfo/frontend/frontendscript.js      | 2 +-
 modules-available/locationinfo/templates/frontend-default.html | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/frontend/frontendscript.js b/modules-available/locationinfo/frontend/frontendscript.js
index bad6a8ed..b5f59792 100644
--- a/modules-available/locationinfo/frontend/frontendscript.js
+++ b/modules-available/locationinfo/frontend/frontendscript.js
@@ -42,7 +42,7 @@ function toInt(str) {
  * computes the time difference between 2 Date objects
  * @param {Date} a
  * @param {Date} b
- * @param {Array} globalConfig
+ * @param {Object} globalConfig
  * @returns {string} printable time
  */
 function GetTimeDiferenceAsString(a, b, globalConfig) {
diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html
index e457f68d..006d2661 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -369,7 +369,6 @@ optional:
 </div>
 </body>
 
-<!--suppress RedundantIfStatementJS -->
 <script type="text/javascript">
 	var rooms = {};
 	var lastRoomUpdate = 0;
@@ -983,7 +982,7 @@ optional:
 
 		if (room.config.scaledaysauto) {
 			var result = ($cal.weekCalendar("option", "daysToShow") * columnWidth) / 130;
-			result = parseInt(Math.min(Math.max(Math.abs(result), 1), 7));
+			result = Math.min(Math.max(Math.abs(result), 1), 7);
 			if (result !== $cal.weekCalendar("option", "daysToShow")) {
 				$cal.weekCalendar("option", "daysToShow", result);
 				columnWidth = $cal.find(".wc-day-1").width();
@@ -1107,10 +1106,10 @@ optional:
 	/**
 	 * Sets the free PCs number in the right corner and updates the square color accordingly
 	 * @param room Room
-	 * @param seats Number of free PC's in the room
 	 */
 	function SetFreeSeats(room) {
 		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) {
@@ -1153,7 +1152,7 @@ optional:
 		if (newTime !== false) {
 			room.$.currentRemain.text(newTime);
 		}
-		if (room.lastFreeSeats !== seats) {
+		if (room.lastFreeSeats !== seats || !same) {
 			SetFreeSeats(room);
 			room.lastFreeSeats = seats;
 		}
@@ -1224,7 +1223,7 @@ optional:
 			console.log('getNextEvent called with something not array: ' + typeof(calEvents));
 			return null;
 		}
-		var event;
+		var event = null;
 		var now = MyDate();
 		for (var i = 0; i < calEvents.length; i++) {
 			//event is now active
-- 
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')

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 13ce0399b010241ecc136eb35196cffdd503b73f Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Thu, 11 Oct 2018 15:25:20 +0200
Subject: [locationinfo] disable add location when 4 rooms in list in
 default-panel-config - don't close dropdown selection when room selected - if
 4 rooms selected disable the add button - if 4 rooms selected, close the
 dropdown selection - re enable the button when a room gets removed

---
 .../templates/page-config-panel-default.html       | 25 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index ba493579..f7009764 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -293,7 +293,7 @@
 
 						</ul>
 						<div class="dropdown pull-right">
-							<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
+							<button id="addLocDdBtn" type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
 								<span class="glyphicon glyphicon-plus"></span>
 							</button>
 							<ul class="dropdown-menu" id="location-list">
@@ -309,8 +309,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">
@@ -336,6 +338,7 @@ document.addEventListener("DOMContentLoaded", function () {
 	var $selLocs = $('#selected-locations');
 	var $locList = $('#location-list');
 	var $locInput = $('#locationids');
+	var $addLocDbBtn = $('#addLocDdBtn');
 
 	// Initialize fancy tooltips
 	$('p.helptext').tooltip();
@@ -372,6 +375,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');
@@ -388,13 +392,24 @@ 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));
+
+		if ($selLocs.find('li').length >= 4) {
+			$addLocDbBtn.prop("disabled",true);
+			var $addLocBtnParent = $addLocDbBtn.parent();
+			if ($addLocBtnParent.hasClass('open')) {
+				$addLocBtnParent.removeClass('open');
+			}
+		}
 	}
 
 	function delParent() {
 		$(this).parent().remove();
 		serializeLocs();
+		if ($selLocs.find('li').length < 4) {
+			$addLocDbBtn.prop("disabled",false);
+		}
 	}
 
 	function serializeLocs() {
-- 
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')

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 272df2047233440dbe2ec320714f48bee8febe42 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 16 Oct 2018 15:12:09 +0200
Subject: [locationinfo] scale calender if no events in timetable - scale the
 calender even without events in the timetable for a better   view when
 multiple rooms selected - hide scrollbar for calenders (!important is
 neccessary!)

---
 modules-available/locationinfo/templates/frontend-default.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html
index 006d2661..1e1a3ce6 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -327,6 +327,7 @@ optional:
 		.wc-scrollable-grid {
 			transition: height 500ms;
 			background: rgba(0, 0, 0, 0);
+			overflow-y: hidden !important;
 		}
 
 		.wc-grid-timeslot-header,
@@ -735,7 +736,7 @@ optional:
 			timeslotHeight: 30,
 			daysToShow: daysToShow,
 			height: function () {
-				if (room.config.mode === 1 && room.config.vertical && (!room.timetable || !room.timetable.length)) return 20;
+				// if (room.config.mode === 1 && room.config.vertical && (!room.timetable || !room.timetable.length)) return 20;
 				var height = $(window).height();
 				if (roomIds.length === 4) {
 					height /= 2;
-- 
cgit v1.2.3-55-g7522


From 1546ff45f55607e161aacd93de753abed1c3780c Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 30 Oct 2018 13:47:22 +0100
Subject: [locationinfo] show overlapping events - when events overlap by time,
 show them separately - when two events dont differ in title, start and end,
 merge them

---
 .../locationinfo/templates/frontend-default.html            | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html
index 1e1a3ce6..d1ecaae8 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -771,7 +771,9 @@ optional:
 			timeSeparator: " - ",
 			startOnFirstDayOfWeek: false,
 			displayFreeBusys: true,
-			defaultFreeBusy: {free: false}
+			defaultFreeBusy: {free: false},
+			allowCalEventOverlap: true,
+			overlapEventsSeparate: true
 		});
 	}
 
@@ -919,7 +921,7 @@ optional:
 	const SEVEN_DAYS = 7 * 86400 * 1000;
 
 	/**
-	 * applays new calendar data to the calendar plugin and also saves it to the room object
+	 * applies new calendar data to the calendar plugin and also saves it to the room object
 	 * @param {Array} json Calendar data
 	 * @param room Room Object
 	 */
@@ -946,9 +948,14 @@ optional:
 			console.log('Notice: Calendar has no current events for ' + room.name);
 		}
 		try {
+			for (var i = json.length - 1; i > 0; i--) {
+				// if title, start and end are the same, "merge" two events by removing one of them
+				if (json[i].title === json[i-1].title && json[i].start === json[i-1].start && json[i].end === json[i-1].end) {
+					json.splice(i, 1);
+				}
+			}
 			room.timetable = json;
 			if (room.config.mode !== 3) {
-				// TODO: Check if they're the same
 				var cal = room.$.calendar;
 				cal.weekCalendar('option', 'data', {events: json});
 				cal.weekCalendar("refresh");
-- 
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')

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 7d9cf0a24308b2204fd063cc2fd0ef0af7f59d50 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 4 Dec 2018 17:15:39 +0100
Subject: [locationinfo] fix panel being closed all day long in summary

---
 modules-available/locationinfo/templates/frontend-summary.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/frontend-summary.html b/modules-available/locationinfo/templates/frontend-summary.html
index 0053d1ff..adb3ce39 100644
--- a/modules-available/locationinfo/templates/frontend-summary.html
+++ b/modules-available/locationinfo/templates/frontend-summary.html
@@ -466,7 +466,7 @@
 				var closeDate = new MyDate();
 				closeDate.setHours(tmp[i].HourClose);
 				closeDate.setMinutes(tmp[i].MinutesClose);
-				if (openDate < now && closeDate > now) {
+				if (openDate <= now && closeDate > now) {
 					return true;
 				}
 			}
-- 
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')

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


From 902b299392b894fa6183c9bd2039bba114813e7e Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Sat, 8 Dec 2018 15:55:49 +0100
Subject: [locationinfo] fix header not detecting events in only room mode -
 fix redundant initialize when only calendar mode

---
 .../locationinfo/templates/frontend-default.html   | 34 ++++++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html
index 7317f8e2..cb61d141 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -621,8 +621,12 @@ optional:
 
 		// Manually initialize mode 2, as initRoomLayout isn't called for this mode
 		if (room.config.mode === 2) {
+			var date = MyDate();
+			var now = date.getTime();
 			queryCalendars();
 			queryRooms();
+			lastCalendarUpdate = now;
+			lastRoomUpdate = now;
 		}
 		mainUpdateLoop();
 		setInterval(mainUpdateLoop, 10000);
@@ -960,6 +964,10 @@ optional:
 				}
 			}
 			room.timetable = json;
+			for (var property in room.timetable) {
+				room.timetable[property].start = cleanDate(room.timetable[property].start);
+				room.timetable[property].end = cleanDate(room.timetable[property].end);
+			}
 			if (room.config.mode !== 3) {
 				var cal = room.$.calendar;
 				cal.weekCalendar('option', 'data', {events: json});
@@ -980,6 +988,27 @@ optional:
 		}
 	}
 
+	function cleanDate(d) {
+		if (typeof d === 'string') {
+			// if is numeric
+			if (!isNaN(Number(d))) {
+				return cleanDate(parseInt(d, 10));
+			}
+
+			// this is a human readable date
+			if (d[d.length - 1] !== 'Z') d += 'Z';
+			var o = new Date(d);
+			o.setTime(o.getTime() + (o.getTimezoneOffset() * 60 * 1000));
+			return o;
+		}
+
+		if (typeof d === 'number') {
+			return new Date(d);
+		}
+
+		return d;
+	}
+
 	/**
 	 * scales calendar, called once on create and on window resize
 	 * @param room Room Object
@@ -1179,11 +1208,10 @@ optional:
 	function ComputeCurrentState(room) {
 		if (!IsOpen(MyDate(), room)) {
 			room.state = {state: "closed", end: GetNextOpening(room), title: "", next: ""};
-
 			return;
 		}
-		var closing = GetNextClosing(room);
 
+		var closing = GetNextClosing(room);
 		var event = getNextEvent(room.timetable);
 
 		// no event and no closing
@@ -1604,7 +1632,7 @@ optional:
 
 	/**
 	 * Function for translation
-	 * @param toTranslate key which we wan't to translate
+	 * @param toTranslate key which we want to translate
 	 * @returns r translated string
 	 */
 	function t(toTranslate) {
-- 
cgit v1.2.3-55-g7522


From dad607e72ee87f40e91dc3c5f342e8df10e3b088 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Sat, 8 Dec 2018 15:59:50 +0100
Subject: [locationinfo] fix summary pannel always in german

---
 .../locationinfo/templates/frontend-summary.html   | 46 ++++++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/frontend-summary.html b/modules-available/locationinfo/templates/frontend-summary.html
index adb3ce39..a3fa77b0 100644
--- a/modules-available/locationinfo/templates/frontend-summary.html
+++ b/modules-available/locationinfo/templates/frontend-summary.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="de">
+<html lang="{{language}}">
 <meta name="viewport" content="width=device-width, initial-scale=1.0" charset="utf-8">
 <head>
 	<script type='text/javascript' src='{{dirprefix}}script/jquery.js'></script>
@@ -108,6 +108,10 @@
 			border-radius: 1px;
 		}
 
+		#i18n {
+			display: none;
+		}
+
 
 	</style>
 	<script type='text/javascript'>
@@ -278,14 +282,14 @@
 				updateCourseText(room.id, state.titel);
 				updateCoursTimer(room.id, GetTimeDiferenceAsString(state.end, MyDate()));
 			} else if (state.state == "Free") {
-				updateCourseText(room.id, "Frei");
+				updateCourseText(room.id, t("free"));
 				updateCoursTimer(room.id, GetTimeDiferenceAsString(state.end, MyDate()));
 			} else if (state.state == "FreeNoEnd") {
-				updateCourseText(room.id, "Frei");
+				updateCourseText(room.id, t("free"));
 				updateCoursTimer(room.id, "");
 			}
 			else if (state.state == "closed") {
-				updateCourseText(room.id, "Geschlossen");
+				updateCourseText(room.id, t("closed"));
 				updateCoursTimer(room.id, "");
 			}
 		}
@@ -757,9 +761,43 @@
 			})
 		}
 
+		/**
+		 * Function for translation
+		 * @param toTranslate key which we want to translate
+		 * @returns r translated string
+		 */
+		function t(toTranslate) {
+			if (tCache[toTranslate])
+				return tCache[toTranslate];
+			var r = $('#i18n').find('[data-tag="' + toTranslate + '"]');
+			return tCache[toTranslate] = (r.length === 0 ? toTranslate : r.text());
+		}
+		var tCache = {};
+
 	</script>
 </head>
 <body>
 <div id="main"></div>
+
+<div id="i18n">
+	<span data-tag="room">{{lang_room}}</span>
+	<span data-tag="closed">{{lang_closed}}</span>
+	<span data-tag="free">{{lang_free}}</span>
+	<span data-tag="shortSun">{{lang_shortSun}}</span>
+	<span data-tag="shortMon">{{lang_shortMon}}</span>
+	<span data-tag="shortTue">{{lang_shortTue}}</span>
+	<span data-tag="shortWed">{{lang_shortWed}}</span>
+	<span data-tag="shortThu">{{lang_shortThu}}</span>
+	<span data-tag="shortFri">{{lang_shortFri}}</span>
+	<span data-tag="shortSat">{{lang_shortSat}}</span>
+	<span data-tag="longSun">{{lang_longSun}}</span>
+	<span data-tag="longMon">{{lang_longMon}}</span>
+	<span data-tag="longTue">{{lang_longTue}}</span>
+	<span data-tag="longWed">{{lang_longWed}}</span>
+	<span data-tag="longThu">{{lang_longThu}}</span>
+	<span data-tag="longFri">{{lang_longFri}}</span>
+	<span data-tag="longSat">{{lang_longSat}}</span>
+	<span data-tag="to">{{lang_to}}</span>
+</div>
 </body>
 </html>
-- 
cgit v1.2.3-55-g7522


From ebea4443c841d41f2ceac41d11626840842e3228 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 11 Dec 2018 16:06:01 +0100
Subject: [locationinfo] fix summary panel showing "closed" when room without
 opening times

---
 .../locationinfo/templates/frontend-summary.html   | 112 ++++++++-------------
 1 file changed, 44 insertions(+), 68 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/frontend-summary.html b/modules-available/locationinfo/templates/frontend-summary.html
index a3fa77b0..ecb41467 100644
--- a/modules-available/locationinfo/templates/frontend-summary.html
+++ b/modules-available/locationinfo/templates/frontend-summary.html
@@ -279,7 +279,7 @@
 			var state = room.getState();
 
 			if (state.state == "CalendarEvent") {
-				updateCourseText(room.id, state.titel);
+				updateCourseText(room.id, state.title);
 				updateCoursTimer(room.id, GetTimeDiferenceAsString(state.end, MyDate()));
 			} else if (state.state == "Free") {
 				updateCourseText(room.id, t("free"));
@@ -287,8 +287,7 @@
 			} else if (state.state == "FreeNoEnd") {
 				updateCourseText(room.id, t("free"));
 				updateCoursTimer(room.id, "");
-			}
-			else if (state.state == "closed") {
+			} else if (state.state == "closed") {
 				updateCourseText(room.id, t("closed"));
 				updateCoursTimer(room.id, "");
 			}
@@ -402,105 +401,82 @@
 		 * @param room Object
 		 */
 		function ComputeCurrentState(room) {
-			if (room.lastRoomUpdate === null) {
-				room.state = {state: 'unknown'};
+			if (!IsOpen(MyDate(), room)) {
+				room.state = {state: "closed", end: GetNextOpening(room), title: "", next: ""};
 				return;
 			}
-			if (!IsOpenNow(room)) {
-				room.state = {state: "closed", end: GetNextOpening(room), titel: "", next: ""};
 
-				return;
-			}
-			var closing = GetNextClosing(room);
+			console.log("Timetable", room.id, room.timetable);
 
+			var closing = GetNextClosing(room);
 			var event = getNextEvent(room.timetable);
+
+			console.log("Event", room.id, event);
+
 			// no event and no closing
-			if (closing == null && event == null) {
-				room.state = {state: "FreeNoEnd", end: "", titel: "", next: ""};
+			if (!closing && !event) {
+				room.state = {state: "FreeNoEnd", end: "", title: "", next: "", free: true};
 				return;
 			}
 
 			// no event so closing is next
-			if (event == null) {
-				room.state = {state: "Free", end: closing, titel: "", next: "closing"};
+			if (!event) {
+				room.state = {state: "Free", end: closing, title: "", next: "closing", free: true};
 				return;
 			}
 
 			// event is at the moment
-			if ((closing == null || event.start.getTime() < closing.getTime()) && event.start.getTime() < new MyDate()) {
-				room.state = {state: "CalendarEvent", end: event.end, titel: event.title, next: ""};
+			if ((!closing || event.start.getTime() < closing.getTime()) && event.start.getTime() < MyDate()) {
+				room.state = {
+					state: "CalendarEvent",
+					end: event.end,
+					title: event.title,
+					next: ""
+				};
+				console.log("CalendarEvent", room.id, room.state);
 				return;
 			}
 
 			// no closing so event is next
-			if (closing == null) {
-				room.state = {state: "Free", end: event.start, titel: "", next: "event"};
+			if (!closing) {
+				room.state = {state: "Free", end: event.start, title: "", next: "event", free: true};
 				return;
 			}
 
 			// event sooner then closing
 			if (event.start.getTime() < closing) {
-				room.state = {state: "Free", end: event.start, titel: "", next: "event"};
-			} else if (event.start.getTime() > closing) {
-				room.state = {state: "Free", end: closing, titel: "", next: "closing"};
-			}
-		}
-
-		/**
-		 * checks if a room is open
-		 * @param room Room object
-		 * @returns boolean for open or not
-		 */
-		function IsOpenNow(room) {
-			var now = new MyDate();
-			if (room.openingTimes == null) {
-
-				// changes from falls needs testing
-				return true;
+				room.state = {state: "Free", end: event.start, title: "", next: "event", free: true};
+			} else {
+				room.state = {state: "Free", end: closing, title: "", next: "closing", free: true};
 			}
 
-			var tmp = room.openingTimes[now.getDay()];
-			if (tmp == null) {
-				return false;
-			}
-			for (var i = 0; i < tmp.length; i++) {
-				var openDate = new MyDate();
-				openDate.setHours(tmp[i].HourOpen);
-				openDate.setMinutes(tmp[i].MinutesOpen);
-				var closeDate = new MyDate();
-				closeDate.setHours(tmp[i].HourClose);
-				closeDate.setMinutes(tmp[i].MinutesClose);
-				if (openDate <= now && closeDate > now) {
-					return true;
-				}
-			}
-			return false;
 		}
 
 		/**
 		 * returns next event from a given json of events
-		 * @param json Json which contains the calendar data.
-		 * @returns event next Carlendar Event
+		 * @param calEvents Json which contains the calendar data.
+		 * @returns event next Calendar Event
 		 */
-		function getNextEvent(json) {
-			if (json == null) {
-				return;
-			}
-			var event;
-			var now = new MyDate();
-			for (var i = 0; i < json.length; i++) {
+		function getNextEvent(calEvents) {
+			if (!calEvents) return null;
+			if (calEvents.constructor !== Array) {
+				console.log('getNextEvent called with something not array: ' + typeof(calEvents));
+				return null;
+			}
+			var event = null;
+			var now = MyDate();
+			for (var i = 0; i < calEvents.length; i++) {
 				//event is now active
-				if (json[i].start.getTime() < now.getTime() && json[i].end.getTime() > now.getTime()) {
-					return json[i];
+				if (calEvents[i].start.getTime() < now.getTime() && calEvents[i].end.getTime() > now.getTime()) {
+					return calEvents[i];
 				}
 				//first element to consider
-				if (event == null) {
-					if (json[i].start.getTime() > now.getTime()) {
-						event = json[i];
+				if (!event) {
+					if (calEvents[i].start.getTime() > now.getTime()) {
+						event = calEvents[i];
 					}
-				}
-				if (json[i].start.getTime() > now.getTime() && event.start.getTime() > json[i].start.getTime()) {
-					event = json[i];
+				} else if (calEvents[i].start.getTime() > now.getTime() && event.start.getTime() > calEvents[i].start.getTime()) {
+					event = calEvents[i];
 				}
 			}
 			return event;
-- 
cgit v1.2.3-55-g7522


From 9f2c37c52c64711b86ca53f910a465513df84ea6 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 8 Jan 2019 11:20:36 +0100
Subject: [locationinfo] make colors consistent for summary and default panel -
 black is now status 'offline' - grey is now status 'broken'

---
 modules-available/locationinfo/templates/frontend-summary.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/frontend-summary.html b/modules-available/locationinfo/templates/frontend-summary.html
index ecb41467..95299e63 100644
--- a/modules-available/locationinfo/templates/frontend-summary.html
+++ b/modules-available/locationinfo/templates/frontend-summary.html
@@ -82,7 +82,8 @@
 		}
 
 		.pc-offline {
-			background-color: darkgrey;
+			background-color: black;
+			color: white;
 		}
 
 		.pc-standby {
@@ -91,8 +92,7 @@
 
 
 		.pc-broken {
-			background-color: black;
-			color: white;
+			background-color: darkgrey;
 			border-radius: 0px 3px 3px 0px;
 		}
 
-- 
cgit v1.2.3-55-g7522


From ed383e2562c6ecf219620f17f87eba3ddaf8d335 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 22 Jan 2019 12:27:45 +0100
Subject: [locationinfo] some design rework - Change "free" to "open" - h/min
 display in summary - do not display colors of unused states in summary -
 change seatcounter to emDash when room has current event

---
 modules-available/locationinfo/lang/de/template-tags.json     |  3 ++-
 modules-available/locationinfo/lang/en/template-tags.json     |  3 ++-
 .../locationinfo/templates/frontend-default.html              | 11 ++++-------
 .../locationinfo/templates/frontend-summary.html              |  9 +++++++--
 4 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json
index 03eb63a5..f9c7fad5 100644
--- a/modules-available/locationinfo/lang/de/template-tags.json
+++ b/modules-available/locationinfo/lang/de/template-tags.json
@@ -30,7 +30,8 @@
     "lang_error": "Fehler",
     "lang_expertMode": "Expertenmodus",
     "lang_fourLocsHint": "Hier k\u00f6nnen Sie bis zu vier Orte ausw\u00e4hlen, die in diesem Panel angezeigt werden.",
-    "lang_free": "Frei",
+    "lang_free": "Geöffnet",
+    "lang_for": "für",
     "lang_general": "Allgemein",
     "lang_ignoreSslTooltip": "Akzeptiere ung\u00fcltige, abgelaufene oder selbstsignierte SSL-Zertifikate",
     "lang_insecureSsl": "Unsicheres SSL",
diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json
index 1b5ab0fd..5bbe3775 100644
--- a/modules-available/locationinfo/lang/en/template-tags.json
+++ b/modules-available/locationinfo/lang/en/template-tags.json
@@ -30,7 +30,8 @@
     "lang_error": "Error",
     "lang_expertMode": "Expert mode",
     "lang_fourLocsHint": "You can pick up to four locations that will be shown in this panel.",
-    "lang_free": "Free",
+    "lang_free": "Open",
+    "lang_for": "for",
     "lang_general": "General",
     "lang_ignoreSslTooltip": "Accept invalid, expired or self-signed ssl certificates",
     "lang_insecureSsl": "Insecure SSL",
diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html
index 4dee8ef7..cbb765d0 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -352,6 +352,7 @@ optional:
 	<span data-tag="room">{{lang_room}}</span>
 	<span data-tag="closed">{{lang_closed}}</span>
 	<span data-tag="free">{{lang_free}}</span>
+	<span data-tag="for">{{lang_for}}</span>
 	<span data-tag="shortSun">{{lang_shortSun}}</span>
 	<span data-tag="shortMon">{{lang_shortMon}}</span>
 	<span data-tag="shortTue">{{lang_shortTue}}</span>
@@ -1151,7 +1152,7 @@ optional:
 	 */
 	function SetFreeSeats(room) {
 		// if room has no allowed value, set text in the box to -
-		room.$.seatsCounter.text(room.freePcs >= 0 ? room.freePcs : '-');
+		room.$.seatsCounter.text(room.freePcs >= 0 ? room.freePcs : '\u2014');
 		room.$.seatsCounter.data('state', JSON.stringify(room.state));
 		if (room.freePcs > 0 && room.state && room.state.free) {
 			room.$.seatsBackground.css('background-color', '#250');
@@ -1174,8 +1175,6 @@ optional:
 		var seats = room.freePcs;
 		if (tmp.state === 'closed' || tmp.state === 'CalendarEvent' || tmp.state === 'Free') {
 			newTime = GetTimeDiferenceAsString(tmp.end, MyDate(), globalConfig);
-		} else if (!same) {
-			newTime = '';
 		}
 		if (tmp.state === "closed") {
 			if (!same) newText = t("closed");
@@ -1183,16 +1182,14 @@ optional:
 			if (!same) newText = tmp.title;
 			// 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") {
+		} else if (tmp.state === "Free" || tmp.state === "FreeNoEnd") {
 			if (!same) newText = t("free");
 		}
 		if (newText !== false) {
 			room.$.currentEvent.text(newText);
 		}
 		if (newTime !== false) {
-			room.$.currentRemain.text(newTime);
+			room.$.currentRemain.text(t("for") + " " +newTime);
 		}
 		if (room.lastFreeSeats !== seats || !same) {
 			SetFreeSeats(room);
diff --git a/modules-available/locationinfo/templates/frontend-summary.html b/modules-available/locationinfo/templates/frontend-summary.html
index 95299e63..ae089da5 100644
--- a/modules-available/locationinfo/templates/frontend-summary.html
+++ b/modules-available/locationinfo/templates/frontend-summary.html
@@ -63,7 +63,7 @@
 		}
 
 		.pc-idle, .pc-occupied, .pc-offline, .pc-broken, .pc-standby {
-			padding: 2px 1px;
+			padding: 2px 0px;
 			text-align: center;
 			font-size: 90%;
 			font-weight: 800;
@@ -604,7 +604,11 @@
 			// TODO: Add seconds again with a better update rate.
 			var time_split = time.split(":");
 			if (time != "") {
-				$("#div_Time_" + id).text(time_split[0] + ":" + time_split[1]);
+				if (time_split[0] > 0) {
+					$("#div_Time_" + id).text(t("for") + " " + time_split[0] + "h " + time_split[1]+"min");
+				} else {
+					$("#div_Time_" + id).text(t("for") + " " + time_split[1]+"min");
+				}
 			} else {
 				$("#div_Time_" + id).text(time);
 			}
@@ -759,6 +763,7 @@
 	<span data-tag="room">{{lang_room}}</span>
 	<span data-tag="closed">{{lang_closed}}</span>
 	<span data-tag="free">{{lang_free}}</span>
+	<span data-tag="for">{{lang_for}}</span>
 	<span data-tag="shortSun">{{lang_shortSun}}</span>
 	<span data-tag="shortMon">{{lang_shortMon}}</span>
 	<span data-tag="shortTue">{{lang_shortTue}}</span>
-- 
cgit v1.2.3-55-g7522