[locationinfo] Add support for Firefox

1 files changed, 117 insertions, 91 deletions

diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html
index 3aaf8620..e7f6fb1b 100644
--- a/modules-available/locationinfo/templates/page-config-panel-url.html
+++ b/modules-available/locationinfo/templates/page-config-panel-url.html
@@ -47,23 +47,6 @@
 			<div class="list-group-item">
 				<div class="row">
 					<div class="col-sm-4">
-						<label for="input-ssl">{{lang_insecureSsl}}</label>
-					</div>
-					<div class="col-sm-8">
-						<div class="checkbox">
-							<input id="input-ssl" type="checkbox" name="insecure-ssl" {{ssl_checked}} value="1">
-							<label></label>
-						</div>
-					</div>
-					<div class="col-sm-12 small text-muted spacebottop">
-						{{lang_ignoreSslTooltip}}
-					</div>
-				</div>
-			</div>
-
-			<div class="list-group-item">
-				<div class="row">
-					<div class="col-sm-4">
 						<label>{{lang_allowTtySwitch}}</label>
 					</div>
 					<div class="col-sm-8">
@@ -112,6 +95,9 @@
 					</div>
 					<div class="col-sm-12 slx-smallspace">
 						{{lang_urlListHelp}}
+						<a target="_blank" href="https://www.bwlehrpool.de/wiki/doku.php/satellite/satellitenserver_infoscreen#blackwhitelist">
+							{{lang_urlListHelpUrl}}
+						</a>
 					</div>
 				</div>
 			</div>
@@ -136,102 +122,141 @@
 			<div class="list-group-item">
 				<div class="row">
 					<div class="col-sm-4">
-						<label for="browser">{{lang_browser}}</label>
+						<label for="zoom-factor">{{lang_zoomFactor}}</label>
 					</div>
-					<div class="col-sm-8">
-						<select class="form-control" name="browser" id="browser" onchange="browserChange()">
-							<option value="slx-browser" id="slx">{{lang_slxbrowser}}</option>
-							<option value="chromium" id="chrome">{{lang_chromium}}</option>
-						</select>
+					<div class="col-sm-7 col-xs-10">
+						<input class="form-control" id="zoom-factor" type="range" min="50" max="300" step="5"
+								 name="zoom-factor" value="{{zoom-factor}}">
+					</div>
+					<div class="col-sm-1 col-xs-2">
+						<span id="zoom-value">{{zoom-factor}}</span>%
 					</div>
 					<div class="col-sm-12 small text-muted spacebottop">
-						{{lang_browserTooltip}}
+						{{lang_zoomFactorTooltip}}
 					</div>
 				</div>
 			</div>
 
-			<div class="list-group-item b0-h">
+			<div class="list-group-item">
 				<div class="row">
 					<div class="col-sm-4">
-						<label for="interactive">{{lang_interactive}}</label>
+						<label for="browser">{{lang_browser}}</label>
 					</div>
 					<div class="col-sm-8">
-						<div class="checkbox">
-							<input id="interactive" type="checkbox" name="interactive" {{interactive_checked}} value="1">
-							<label></label>
-						</div>
+						<select class="form-control" name="browser" id="browser" onchange="browserChange()">
+							<option value="slx-browser" id="slx">{{lang_slxbrowser}}</option>
+							<option value="chromium" id="chrome">{{lang_chromium}}</option>
+							<option value="firefox" id="firefox">{{lang_firefox}}</option>
+						</select>
 					</div>
 					<div class="col-sm-12 small text-muted spacebottop">
-						{{lang_interactiveTooltip}}
+						{{lang_browserTooltip}}
 					</div>
 				</div>
 			</div>
 
-			<div class="list-group-item b0-h" id="bookmarks">
-				<div class="row">
-					<div class="col-sm-4">
-						<label for="bookmarks">{{lang_bookmarks}}</label>
-					</div>
-					<div class="col-sm-8">
-						<button type="button" class="btn btn-success" onclick="addBookmark()">
-							<span class="glyphicon glyphicon-plus"></span>
-						</button>
-					</div>
-					<div class="col-sm-12 small text-muted spacebottop">
-						{{lang_bookmarksTooltip}}
-					</div>
-				</div>
-				<div class="row" style="margin-top: 1em;" id="bookmarkRow" hidden>
-					<div class="col-sm-3 col-sm-offset-3">
-						<input class="form-control" name="bookmarkNames[]" type="text" value=""
-								 placeholder="bwLehrpool">
-					</div>
-					<div class="col-sm-3">
-						<input class="form-control" name="bookmarkUrls[]" type="text" value=""
-								 placeholder="https://www.bwlehrpool.de/" pattern=".*://.*">
-					</div>
-					<div class="col-sm-1">
-						<button type="button" class="btn btn-danger" onclick="$(this).closest('.row').remove()">
-							<span class="glyphicon glyphicon-minus"></span>
-						</button>
+			<div id="browser-specific">
+
+				<div class="list-group-item show-chromium show-firefox">
+					<div class="row">
+						<div class="col-sm-4">
+							<label for="interactive">{{lang_interactive}}</label>
+						</div>
+						<div class="col-sm-8">
+							<div class="checkbox">
+								<input id="interactive" type="checkbox" name="interactive" {{interactive_checked}} value="1">
+								<label></label>
+							</div>
+						</div>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_interactiveTooltip}}
+						</div>
 					</div>
 				</div>
 
-				{{#bookmarks}}
-				<div class="row" style="margin-top: 1em;">
-					<div class="col-sm-3 col-sm-offset-3">
-						<input class="form-control" name="bookmarkNames[]" type="text" value="{{name}}"
-								 placeholder="bwLehrpool" required>
-					</div>
-					<div class="col-sm-3">
-						<input class="form-control" name="bookmarkUrls[]" type="text" value="{{url}}"
-								 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required>
-					</div>
-					<div class="col-sm-1">
-						<button type="button" class="btn btn-danger" onclick="$(this).closest('.row').remove()">
-							<span class="glyphicon glyphicon-minus"></span>
-						</button>
+				<div class="list-group-item show-slx-browser show-chromium">
+					<div class="row">
+						<div class="col-sm-4">
+							<label for="input-ssl">{{lang_insecureSsl}}</label>
+						</div>
+						<div class="col-sm-8">
+							<div class="checkbox">
+								<input id="input-ssl" type="checkbox" name="insecure-ssl" {{ssl_checked}} value="1">
+								<label></label>
+							</div>
+						</div>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_ignoreSslTooltip}}
+						</div>
 					</div>
 				</div>
-				{{/bookmarks}}
-			</div>
 
-			<div class="list-group-item">
-				<div class="row">
-					<div class="col-sm-4">
-						<label for="zoom-factor">{{lang_zoomFactor}}</label>
+				<div class="list-group-item show-chromium show-firefox" id="bookmarks">
+					<div class="row">
+						<div class="col-sm-4">
+							<label for="bookmarks">{{lang_bookmarks}}</label>
+						</div>
+						<div class="col-sm-8">
+							<button type="button" class="btn btn-success" onclick="addBookmark()">
+								<span class="glyphicon glyphicon-plus"></span>
+							</button>
+						</div>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_bookmarksTooltip}}
+						</div>
 					</div>
-					<div class="col-sm-7 col-xs-10">
-						<input class="form-control" id="zoom-factor" type="range" min="50" max="300" step="5"
-								 name="zoom-factor" value="{{zoom-factor}}">
+					<div class="row" style="margin-top: 1em;" id="bookmarkRow" hidden>
+						<div class="col-sm-3 col-sm-offset-3">
+							<input class="form-control" name="bookmarkNames[]" type="text" value=""
+									 placeholder="bwLehrpool">
+						</div>
+						<div class="col-sm-3">
+							<input class="form-control" name="bookmarkUrls[]" type="text" value=""
+									 placeholder="https://www.bwlehrpool.de/" pattern=".*://.*">
+						</div>
+						<div class="col-sm-1">
+							<button type="button" class="btn btn-danger" onclick="$(this).closest('.row').remove()">
+								<span class="glyphicon glyphicon-minus"></span>
+							</button>
+						</div>
 					</div>
-					<div class="col-sm-1 col-xs-2" id="zoom-value">
 
-					</div>
-					<div class="col-sm-12 small text-muted spacebottop">
-						{{lang_zoomFactorTooltip}}
+					{{#bookmarks}}
+						<div class="row" style="margin-top: 1em;">
+							<div class="col-sm-3 col-sm-offset-3">
+								<input class="form-control" name="bookmarkNames[]" type="text" value="{{name}}"
+										 placeholder="bwLehrpool" required>
+							</div>
+							<div class="col-sm-5">
+								<input class="form-control" name="bookmarkUrls[]" type="text" value="{{url}}"
+										 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required>
+							</div>
+							<div class="col-sm-1">
+								<button type="button" class="btn btn-danger" onclick="$(this).closest('.row').remove()">
+									<span class="glyphicon glyphicon-minus"></span>
+								</button>
+							</div>
+						</div>
+					{{/bookmarks}}
+				</div>
+
+				<div class="list-group-item show-chromium show-firefox">
+					<div class="row">
+						<div class="col-sm-4">
+							<label for="hw-video">{{lang_hwAccelVideo}}</label>
+						</div>
+						<div class="col-sm-8">
+							<div class="checkbox">
+								<input id="hw-video" type="checkbox" name="hw-video" {{hwvideo_checked}} value="1">
+								<label></label>
+							</div>
+						</div>
+						<div class="col-sm-12 small text-muted spacebottop">
+							{{lang_hwAccelVideoTooltip}}
+						</div>
 					</div>
 				</div>
+
 			</div>
 
 		</div>
@@ -245,6 +270,9 @@
 	</div>
 </form>
 
+<!-- so page doesn't jump around so much when you switch browser -->
+<div style="height: 300px"></div>
+
 <script>
 
 document.addEventListener("DOMContentLoaded", function () {
@@ -254,7 +282,7 @@ document.addEventListener("DOMContentLoaded", function () {
 	var $zv = $('#zoom-value');
 	var $zf = $('#zoom-factor');
 	var sliderUpdate = function() {
-		$zv.text($zf.val() + '%');
+		$zv.text($zf.val());
 	};
 	$zf.on('input', sliderUpdate);
 	sliderUpdate();
@@ -263,11 +291,9 @@ document.addEventListener("DOMContentLoaded", function () {
 // Hide interactive-input if slx-browser is selected
 function browserChange() {
 	var value = $('#browser').val();
-	if (value !== 'slx-browser') {
-		$('.b0-h').show();
-	} else {
-		$('.b0-h').hide();
-	}
+	var $lgis = $('#browser-specific > .list-group-item');
+	$lgis.filter(':not(.show-' + value + ')').hide();
+	$lgis.filter('.show-' + value).show();
 }
 
 // Add another bookmark input field to the form