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(-)

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 ccd6ea5a851c5e3f46c10b06b32f852c36ec4dd1 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 8 Jan 2019 14:50:50 +0100
Subject: [locationinfo] set roomplanner default on false for existing panels -
 if panel is already existing without roomplanner value in database

---
 modules-available/locationinfo/inc/infopanel.inc.php | 3 +++
 modules-available/locationinfo/page.inc.php          | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/modules-available/locationinfo/inc/infopanel.inc.php b/modules-available/locationinfo/inc/infopanel.inc.php
index 918030f0..fdc253f0 100644
--- a/modules-available/locationinfo/inc/infopanel.inc.php
+++ b/modules-available/locationinfo/inc/infopanel.inc.php
@@ -37,6 +37,9 @@ class InfoPanel
 					$overrides = $json['overrides'];
 				}
 				unset($json['overrides']);
+				if (!isset($json['roomplanner'])) {
+					$config['roomplanner'] = false;
+				}
 				$config = $json + $config;
 			}
 		}
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index 13382438..8ea18940 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -902,6 +902,9 @@ class Page_LocationInfo extends Page
 			}
 
 			$config = json_decode($panel['panelconfig'], true);
+			if (!isset($config['roomplanner'])) {
+				$config['roomplanner'] = false;
+			}
 		}
 
 		// Permission
-- 
cgit v1.2.3-55-g7522