[locationinfo] rearrange default-panel settings in UI

3 files changed, 140 insertions, 145 deletions

diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json
index 39678de1..16f2ddb9 100644
--- a/modules-available/locationinfo/lang/de/template-tags.json
+++ b/modules-available/locationinfo/lang/de/template-tags.json
@@ -5,6 +5,7 @@
     "lang_backend": "Backend",
     "lang_backends": "Backends",
     "lang_calendar": "Kalender",
+    "lang_calendarUpdate": "Kalender Update",
     "lang_calupdateTooltip": "Zeit nachdem der Kalender aktualisiert wird (in Minuten)",
     "lang_checkConnection": "Verbindung pr\u00fcfen",
     "lang_closed": "Geschlossen",
@@ -35,6 +36,7 @@
     "lang_fourLocsHint": "Hier k\u00f6nnen Sie bis zu vier Orte ausw\u00e4hlen, die in diesem Panel angezeigt werden.",
     "lang_free": "Ge\u00f6ffnet",
     "lang_general": "Allgemein",
+    "lang_generalSettings": "Allgemeine Einstellungen",
     "lang_ignoreSslTooltip": "Akzeptiere ung\u00fcltige, abgelaufene oder selbstsignierte SSL-Zertifikate",
     "lang_insecureSsl": "Unsicheres SSL",
     "lang_language": "Sprache",
@@ -84,6 +86,7 @@
     "lang_roomIdTooltip": "Die Raum ID, die der Server ben\u00f6tigt, um Kalenderdaten abzurufen (bei Exchange die Postfachadresse)",
     "lang_roomplannerTooltip": "Legt fest, ob Rechner anhand der Zuordnung über IP oder über den Raumplan gezählt werden",
     "lang_roomupdateTooltip": "Zeit nach der die PCs aktualisiert werden (in Sekunden)",
+    "lang_roomUpdate": "Raum Update",
     "lang_rotation": "Rotation",
     "lang_rotation0": "0\u00b0",
     "lang_rotation1": "90\u00b0 \u27f2",
diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json
index a9adaacc..892aa01e 100644
--- a/modules-available/locationinfo/lang/en/template-tags.json
+++ b/modules-available/locationinfo/lang/en/template-tags.json
@@ -5,6 +5,7 @@
     "lang_backend": "Backend",
     "lang_backends": "Backends",
     "lang_calendar": "Calendar",
+    "lang_calendarUpdate": "Calendar Update",
     "lang_calupdateTooltip": "Time the calender querys for updates (in minutes)",
     "lang_checkConnection": "Check connection",
     "lang_closed": "Closed",
@@ -35,6 +36,7 @@
     "lang_fourLocsHint": "You can pick up to four locations that will be shown in this panel.",
     "lang_free": "Open",
     "lang_general": "General",
+    "lang_generalSettings": "General Settings",
     "lang_ignoreSslTooltip": "Accept invalid, expired or self-signed ssl certificates",
     "lang_insecureSsl": "Insecure SSL",
     "lang_language": "Language",
@@ -84,6 +86,7 @@
     "lang_roomIdTooltip": "The ID of the room the server needs, for querying the calendar data (when using exchange the room mailbox)",
     "lang_roomplannerTooltip": "Determine if PCs are counted on the basis of IP-range or by roomplanner",
     "lang_roomupdateTooltip": "Time the PCs in the room gets updated (in seconds)",
+    "lang_roomUpdate": "Room Update",
     "lang_rotation": "Rotation",
     "lang_rotation0": "0\u00b0",
     "lang_rotation1": "90\u00b0 \u27f2",
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index 2514ef93..f6e688fa 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -13,180 +13,168 @@
 
 	<div class="row">
 
-		<div class="col-md-6">
-			<div class="modify-inputs panel panel-default">
-				<div class="panel-heading">{{lang_display}}</div>
-				<div class="panel-body">
-					<div class="list-group">
-
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-3">
-									<label for="panel-title">{{lang_displayName}}</label>
-								</div>
-								<div class="col-sm-7">
-									<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
-								</div>
-								<div class="col-sm-2">
-									<p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</p>
-								</div>
-							</div>
-						</div>
+	</div>
 
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-3">
-									<label for="language">{{lang_language}}</label>
-								</div>
-								<div class="col-sm-7">
-									<select class="form-control" name="language" id="language">
-										{{#languages}}
-											<option value="{{cc}}" id="lang-{{cc}}" {{selected}}>{{name}}</option>
-										{{/languages}}
-									</select>
-								</div>
-								<div class="col-sm-2">
-									<p class="btn btn-static helptext" title="{{lang_languageTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</p>
-								</div>
-							</div>
-						</div>
+	<div class="modify-inputs">
+		<div class="row">
+			<div class="col-md-6">
+				<div class="panel panel-default">
+					<div class="panel-heading">{{lang_generalSettings}}</div>
+					<div class="panel-body">
+						<div class="list-group">
 
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-3">
-									<label for="mode">{{lang_mode}}</label>
-								</div>
-								<div class="col-sm-7">
-									<select class="form-control" name="mode" id="mode" onchange="modeChange()">
-										<option value="1" id="mode1">{{lang_mode1}}</option>
-										<option value="2" id="mode2">{{lang_mode2}}</option>
-										<option value="3" id="mode3">{{lang_mode3}}</option>
-										<option value="4" id="mode4">{{lang_mode4}}</option>
-									</select>
-								</div>
-								<div class="col-sm-2">
-									<p class="btn btn-static helptext" title="{{lang_modeTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</p>
+							<div class="list-group-item">
+								<div class="row">
+									<div class="col-sm-3">
+										<label for="panel-title">{{lang_displayName}}</label>
+									</div>
+									<div class="col-sm-7">
+										<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
+									</div>
+									<div class="col-sm-2">
+										<p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}">
+											<span class="glyphicon glyphicon-question-sign"></span>
+										</p>
+									</div>
 								</div>
 							</div>
-						</div>
 
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-3">
-									<label for="input-eco">{{lang_ecoMode}}</label>
-								</div>
-								<div class="col-sm-7">
-									<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
-								</div>
-								<div class="col-sm-2">
-									<p class="btn btn-static helptext" title="{{lang_ecoTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</p>
+							<div class="list-group-item">
+								<div class="row">
+									<div class="col-sm-3">
+										<label for="language">{{lang_language}}</label>
+									</div>
+									<div class="col-sm-7">
+										<select class="form-control" name="language" id="language">
+											{{#languages}}
+											<option value="{{cc}}" id="lang-{{cc}}" {{selected}}>{{name}}</option>
+											{{/languages}}
+										</select>
+									</div>
+									<div class="col-sm-2">
+										<p class="btn btn-static helptext" title="{{lang_languageTooltip}}">
+											<span class="glyphicon glyphicon-question-sign"></span>
+										</p>
+									</div>
 								</div>
 							</div>
-						</div>
 
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-3">
-									<label for="input-prettytime">{{lang_prettytime}}</label>
-								</div>
-								<div class="col-sm-7">
-									<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
-								</div>
-								<div class="col-sm-2">
-									<p class="btn btn-static helptext" title="{{lang_prettytimeTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</p>
+							<div class="list-group-item">
+								<div class="row">
+									<div class="col-sm-3">
+										<label for="input-eco">{{lang_ecoMode}}</label>
+									</div>
+									<div class="col-sm-7">
+										<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
+									</div>
+									<div class="col-sm-2">
+										<p class="btn btn-static helptext" title="{{lang_ecoTooltip}}">
+											<span class="glyphicon glyphicon-question-sign"></span>
+										</p>
+									</div>
 								</div>
 							</div>
-						</div>
 
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-3">
-									<label for="input-roomplanner">{{lang_useRoomplanner}}</label>
-								</div>
-								<div class="col-sm-7">
-									<select class="form-control" name="roomplanner" id="input-roomplanner">
-										<option value="0" id="roomplanner0">{{lang_countIp}}</option>
-										<option value="1" id="roomplanner1">{{lang_countRoomplan}}</option>
-									</select>
-								</div>
-								<div class="col-sm-2">
-									<p class="btn btn-static helptext" title="{{lang_roomplannerTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</p>
+							<div class="list-group-item">
+								<div class="row">
+									<div class="col-sm-3">
+										<label for="input-prettytime">{{lang_prettytime}}</label>
+									</div>
+									<div class="col-sm-7">
+										<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
+									</div>
+									<div class="col-sm-2">
+										<p class="btn btn-static helptext" title="{{lang_prettytimeTooltip}}">
+											<span class="glyphicon glyphicon-question-sign"></span>
+										</p>
+									</div>
 								</div>
 							</div>
-						</div>
-					</div>
-				</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="input-calupdate">{{lang_calendar}}</label>
-								</div>
-								<div class="col-sm-7">
-									<input class="form-control" name="calupdate" type="number" min="30" id="input-calupdate"
-											 max="1440" value="{{calupdate}}" required>
-								</div>
-								<div class="col-sm-2">
-									<p class="btn btn-static helptext" title="{{lang_calupdateTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</p>
+							<div class="list-group-item">
+								<div class="row">
+									<div class="col-sm-3">
+										<label for="input-calupdate">{{lang_calendarUpdate}}</label>
+									</div>
+									<div class="col-sm-7">
+										<input class="form-control" name="calupdate" type="number" min="30" id="input-calupdate"
+												 max="1440" value="{{calupdate}}" required>
+									</div>
+									<div class="col-sm-2">
+										<p class="btn btn-static helptext" title="{{lang_calupdateTooltip}}">
+											<span class="glyphicon glyphicon-question-sign"></span>
+										</p>
+									</div>
 								</div>
 							</div>
-						</div>
 
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-3">
-									<label for="form-roomupdate">{{lang_room}}</label>
-								</div>
-								<div class="col-sm-7">
-									<input class="form-control" name="roomupdate" type="number" min="15" id="form-roomupdate"
-											 max="86400" value="{{roomupdate}}" required>
-								</div>
-								<div class="col-sm-2">
-									<p class="btn btn-static helptext" title="{{lang_roomupdateTooltip}}">
-										<span class="glyphicon glyphicon-question-sign"></span>
-									</p>
+							<div class="list-group-item">
+								<div class="row">
+									<div class="col-sm-3">
+										<label for="form-roomupdate">{{lang_roomUpdate}}</label>
+									</div>
+									<div class="col-sm-7">
+										<input class="form-control" name="roomupdate" type="number" min="15" id="form-roomupdate"
+												 max="86400" value="{{roomupdate}}" required>
+									</div>
+									<div class="col-sm-2">
+										<p class="btn btn-static helptext" title="{{lang_roomupdateTooltip}}">
+											<span class="glyphicon glyphicon-question-sign"></span>
+										</p>
+									</div>
 								</div>
 							</div>
 						</div>
-
 					</div>
 				</div>
 			</div>
-		</div>
-
-	</div>
 
-	<div class="modify-inputs">
-		<div class="row">
 			<div class="col-md-6">
-
 				<div class="panel panel-default" id="extra-div">
 					<div class="panel-heading">{{lang_mode}}</div>
 					<div class="panel-body">
 						<div class="list-group">
 
+							<div class="list-group-item">
+								<div class="row">
+									<div class="col-sm-3">
+										<label for="mode">{{lang_mode}}</label>
+									</div>
+									<div class="col-sm-7">
+										<select class="form-control" name="mode" id="mode" onchange="modeChange()">
+											<option value="1" id="mode1">{{lang_mode1}}</option>
+											<option value="2" id="mode2">{{lang_mode2}}</option>
+											<option value="3" id="mode3">{{lang_mode3}}</option>
+											<option value="4" id="mode4">{{lang_mode4}}</option>
+										</select>
+									</div>
+									<div class="col-sm-2">
+										<p class="btn btn-static helptext" title="{{lang_modeTooltip}}">
+											<span class="glyphicon glyphicon-question-sign"></span>
+										</p>
+									</div>
+								</div>
+							</div>
+
+							<div class="list-group-item">
+								<div class="row">
+									<div class="col-sm-3">
+										<label for="input-roomplanner">{{lang_useRoomplanner}}</label>
+									</div>
+									<div class="col-sm-7">
+										<select class="form-control" name="roomplanner" id="input-roomplanner">
+											<option value="0" id="roomplanner0">{{lang_countIp}}</option>
+											<option value="1" id="roomplanner1">{{lang_countRoomplan}}</option>
+										</select>
+									</div>
+									<div class="col-sm-2">
+										<p class="btn btn-static helptext" title="{{lang_roomplannerTooltip}}">
+											<span class="glyphicon glyphicon-question-sign"></span>
+										</p>
+									</div>
+								</div>
+							</div>
+
 							<div class="list-group-item m1-s m2-h m3-h m4-h">
 								<div class="row">
 									<div class="col-sm-3">
@@ -301,7 +289,8 @@
 					</div>
 				</div>
 			</div>
-
+		</div>
+		<div class="row">
 			<div class="col-md-6">
 				<div class="panel panel-default">
 					<div class="panel-heading">{{lang_locations}}</div>