From 47b7ab95cc95e2e0391f11317c32113a1b980c2a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 4 Nov 2020 13:31:07 +0100
Subject: [locationinfo] "show hostname" cannot be overridden per location

---
 modules-available/locationinfo/page.inc.php        |  1 -
 .../templates/page-config-panel-default.html       | 34 +++++++++++-----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index e350d407..9e7a704e 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -322,7 +322,6 @@ class Page_LocationInfo extends Page
 					'rotation' => Request::post('override'.$locationids[$i].'rotation', 0, 'int'),
 					'scale' => Request::post('override'.$locationids[$i].'scale', 50, 'int'),
 					'switchtime' => Request::post('override'.$locationids[$i].'switchtime', 60, 'int'),
-					'hostname' => Request::post('override'.$locationids[$i].'hostname', false, 'bool'),
 				);
 				$overrides[$locationids[$i]] = $overrideArray;
 			}
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index 447a8834..a289d26a 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -88,6 +88,23 @@
 							</div>
 						</div>
 
+						<div class="list-group-item m1-s m2-h m3-s m4-s">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="show-hostname">{{lang_showHostname}}</label>
+								</div>
+								<div class="col-sm-8">
+									<div class="checkbox">
+										<input id="show-hostname" class="btstrpCheckbox" type="checkbox" name="hostname" {{hostname_checked}}>
+										<label></label>
+									</div>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_hostnameTooltip}}
+								</div>
+							</div>
+						</div>
+
 						<div class="list-group-item">
 							<div class="row">
 								<div class="col-sm-4">
@@ -256,23 +273,6 @@
 							</div>
 						</div>
 
-						<div class="list-group-item m1-s m2-h m3-s m4-s">
-							<div class="row">
-								<div class="col-sm-4">
-									<label for="show-hostname">{{lang_showHostname}}</label>
-								</div>
-								<div class="col-sm-8">
-									<div class="checkbox">
-										<input id="show-hostname" class="btstrpCheckbox" type="checkbox" name="hostname" {{hostname_checked}}>
-										<label></label>
-									</div>
-								</div>
-								<div class="col-sm-12 small text-muted spacebottop">
-									{{lang_hostnameTooltip}}
-								</div>
-							</div>
-						</div>
-
 						<div class="list-group-item m1-s m2-h m3-h m4-h">
 							<div class="row">
 								<div class="col-sm-4">
-- 
cgit v1.2.3-55-g7522