[locationinfo] Remove unused javascript

Most javascript was needed for editing the opening times of locations.
Some javascript was still used to fill the now disabled input forms for
display only. This is now done server-side, and the input fields have
been replaced by a simple table.

4 files changed, 31 insertions, 171 deletions

diff --git a/modules-available/locationinfo/templates/ajax-config-location.html b/modules-available/locationinfo/templates/ajax-config-location.html
index 530207f6..a5e7e45e 100644
--- a/modules-available/locationinfo/templates/ajax-config-location.html
+++ b/modules-available/locationinfo/templates/ajax-config-location.html
@@ -1,89 +1,13 @@
 <input type="hidden" name="locationid" value="{{id}}">
-<div id="settings-outer">
-	<h3>{{lang_openingTime}}</h3>
-
-	{{^expertMode}}
-	<div id="simple-mode">
-
-		<div class="clearfix"></div>
-		<table class="table table-condensed" style="margin-bottom:0">
-			<tr>
-				<th>{{lang_day}}</th>
-				<th>{{lang_openingTime}}</th>
-				<th>{{lang_closingTime}}</th>
-			</tr>
-
-			<tr class="tablerow">
-				<td>{{lang_monTilFr}}</td>
-				<td>
-					<div class="input-group">
-						<span class="input-group-addon">
-							<span class="glyphicon glyphicon-time"></span>
-						</span>
-						<input disabled type="text" class="form-control timepicker2" id="week-open">
-					</div>
-				</td>
-				<td>
-					<div class="input-group">
-						<span class="input-group-addon">
-							<span class="glyphicon glyphicon-time"></span>
-						</span>
-						<input disabled type="text" class="form-control timepicker2" id="week-close">
-					</div>
-				</td>
-			</tr>
-			<tr class="tablerow">
-				<td>{{lang_saturday}}</td>
-				<td>
-					<div class="input-group">
-						<span class="input-group-addon">
-							<span class="glyphicon glyphicon-time"></span>
-						</span>
-						<input disabled type="text" class="form-control timepicker2" id="saturday-open">
-					</div>
-				</td>
-				<td>
-					<div class="input-group">
-						<span class="input-group-addon">
-							<span class="glyphicon glyphicon-time"></span>
-						</span>
-						<input disabled type="text" class="form-control timepicker2" id="saturday-close">
-					</div>
-				</td>
-			</tr>
-			<tr class="tablerow">
-				<td>{{lang_sunday}}</td>
-				<td>
-					<div class="input-group">
-						<span class="input-group-addon">
-							<span class="glyphicon glyphicon-time"></span>
-						</span>
-						<input disabled type="text" class="form-control timepicker2" id="sunday-open">
-					</div>
-				</td>
-				<td>
-					<div class="input-group">
-						<span class="input-group-addon">
-							<span class="glyphicon glyphicon-time"></span>
-						</span>
-						<input disabled type="text" class="form-control timepicker2" id="sunday-close">
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-	{{/expertMode}}
-
-	<div id="expert-mode" style="{{^expertMode}}display:none{{/expertMode}}">
-		<div class="clearfix"></div>
-		<div id="expert-table">
-			<div class="row">
-				<div class="col-sm-6">{{lang_openingTime}}</div>
-				<div class="col-sm-4">{{lang_closingTime}}</div>
-			</div>
-		</div>
-	</div>
-</div>
+<h3>{{lang_openingTime}}</h3>
+<table class="table">
+	{{#openingtimes}}
+	<tr>
+		<td>{{days}}</td>
+		<td class="text-right">{{open}}&thinsp;-&thinsp;{{close}}</td>
+	</tr>
+	{{/openingtimes}}
+</table>
 
 <div class="row" style="margin-top: 20px; margin-right: 15px;">
 	<a class="pull-right" title="{{lang_goToLocationWarning}}" href='?do=locations#{{id}}'>
@@ -93,7 +17,6 @@
 </div>
 <hr>
 
-
 <h3>{{lang_remoteSchedule}}</h3>
 <div class="row">
 	<div class="col-sm-4">
@@ -134,76 +57,3 @@
 		{{lang_roomIdTooltip}}
 	</div>
 </div>
-
-<div class="hidden" id="expert-template">
-	<div class="row expert-row">
-		<hr>
-		<div class="col-xs-12 days-box">
-			<div class="checkbox checkbox-inline" style="margin-top: 0px;"><input disabled type="checkbox" class="i-Monday"><label>{{lang_shortMonday}}</label></div>
-			<div class="checkbox checkbox-inline"><input disabled type="checkbox" class="i-Tuesday"><label>{{lang_shortTuesday}}</label></div>
-			<div class="checkbox checkbox-inline"><input disabled type="checkbox" class="i-Wednesday"><label>{{lang_shortWednesday}}</label></div>
-			<div class="checkbox checkbox-inline"><input disabled type="checkbox" class="i-Thursday"><label>{{lang_shortThursday}}</label></div>
-			<div class="checkbox checkbox-inline"><input disabled type="checkbox" class="i-Friday"><label>{{lang_shortFriday}}</label></div>
-			<div class="checkbox checkbox-inline"><input disabled type="checkbox" class="i-Saturday"><label>{{lang_shortSaturday}}</label></div>
-			<div class="checkbox checkbox-inline"><input disabled type="checkbox" class="i-Sunday"><label>{{lang_shortSunday}}</label></div>
-		</div>
-		<div class="col-sm-6">
-			<div class="input-group">
-				<span class="input-group-addon"><span class="glyphicon glyphicon-time"></span></span>
-				<input disabled type="text" class="form-control i-openingtime">
-			</div>
-		</div>
-		<div class="col-sm-6">
-			<div class="input-group">
-				<span class="input-group-addon"><span class="glyphicon glyphicon-time"></span></span>
-				<input disabled type="text" class="form-control i-closingtime">
-			</div>
-		</div>
-	</div>
-</div>
-
-<script type="application/javascript"><!--
-	(function() {
-
-		var scheduleData = {{{schedule_data}}};
-
-		{{#expertMode}}
-			for (var i = 0; i < scheduleData.length; ++i) {
-				newOpeningTime(scheduleData[i]);
-			}
-		{{/expertMode}}
-		{{^expertMode}}
-		for (var i = 0; i < scheduleData.length; ++i) {
-			if (scheduleData[i].days.length === 5) {
-				$('#week-open').val(scheduleData[i]['openingtime']);
-				$('#week-close').val(scheduleData[i]['closingtime']);
-			} else if (scheduleData[i].days.length === 1 && scheduleData[i].days[0] === 'Saturday') {
-				$('#saturday-open').val(scheduleData[i]['openingtime']);
-				$('#saturday-close').val(scheduleData[i]['closingtime']);
-			} else if (scheduleData[i].days.length === 1 && scheduleData[i].days[0] === 'Sunday') {
-				$('#sunday-open').val(scheduleData[i]['openingtime']);
-				$('#sunday-close').val(scheduleData[i]['closingtime']);
-			}
-		}
-		{{/expertMode}}
-
-		setTimepicker($('#settings-outer').find('.timepicker2'));
-
-		$('#new-openingtime').click(function (e) {
-			e.preventDefault();
-			setTimepicker(newOpeningTime({}).find('.timepicker2'));
-		});
-
-		$('#btn-show-expert').click(function (e) {
-			e.preventDefault();
-			scheduleData = simpleToExpert();
-			for (var i = 0; i < scheduleData.length; ++i) {
-				setTimepicker(newOpeningTime(scheduleData[i]).find('.timepicker2'));
-			}
-			$('#simple-mode').remove();
-			$('#expert-mode').show();
-		});
-
-	})();
-
-//--></script>
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index 1ffef408..447a8834 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -60,7 +60,10 @@
 									<label for="input-eco">{{lang_ecoMode}}</label>
 								</div>
 								<div class="col-sm-8">
-									<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
+									<div class="checkbox">
+										<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
+										<label></label>
+									</div>
 								</div>
 								<div class="col-sm-12 small text-muted spacebottop">
 									{{lang_ecoTooltip}}
@@ -74,7 +77,10 @@
 									<label for="input-prettytime">{{lang_prettytime}}</label>
 								</div>
 								<div class="col-sm-8">
-									<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
+									<div class="checkbox">
+										<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
+										<label></label>
+									</div>
 								</div>
 								<div class="col-sm-12 small text-muted spacebottop">
 									{{lang_prettytimeTooltip}}
@@ -198,7 +204,10 @@
 									<label for="scaledaysauto">{{lang_autoScale}}</label>
 								</div>
 								<div class="col-sm-8">
-									<input id="scaledaysauto" class="btstrpCheckbox" type="checkbox" name="scaledaysauto" {{scaledaysauto_checked}}>
+									<div class="checkbox">
+										<input id="scaledaysauto" class="btstrpCheckbox" type="checkbox" name="scaledaysauto" {{scaledaysauto_checked}}>
+										<label></label>
+									</div>
 								</div>
 								<div class="col-sm-12 small text-muted spacebottop">
 									{{lang_autoscaleTooltip}}
@@ -253,7 +262,10 @@
 									<label for="show-hostname">{{lang_showHostname}}</label>
 								</div>
 								<div class="col-sm-8">
-									<input id="show-hostname" class="btstrpCheckbox" type="checkbox" name="hostname" {{hostname_checked}}>
+									<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}}
diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html
index b909f873..a7a34217 100644
--- a/modules-available/locationinfo/templates/page-config-panel-summary.html
+++ b/modules-available/locationinfo/templates/page-config-panel-summary.html
@@ -56,7 +56,10 @@
 								<label for="input-eco">{{lang_ecoMode}}</label>
 							</div>
 							<div class="col-sm-8">
-								<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
+								<div class="checkbox">
+									<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
+									<label></label>
+								</div>
 							</div>
 							<div class="col-sm-12 small text-muted spacebottop">
 								{{lang_ecoTooltip}}
@@ -191,9 +194,6 @@ document.addEventListener("DOMContentLoaded", function () {
 		$(this).siblings().find('.range-display').text($(this).val());
 	});
 	// Set state of input controls that aren't statically initialized server side
-	$('.modify-inputs input[type="checkbox"]')
-		.bootstrapSwitch({size: 'small'});
-
 	var lids = $locInput.val().split(',');
 	$selLocs.empty();
 	for (var i = 0; i < lids.length; ++i) {
diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html
index 553df648..fa2e3a2d 100644
--- a/modules-available/locationinfo/templates/page-locations.html
+++ b/modules-available/locationinfo/templates/page-locations.html
@@ -65,8 +65,7 @@
 	</div>
 </div>
 
-<script type="text/javascript"><!--
-
+<script>
 document.addEventListener("DOMContentLoaded", function () {
 	/**
 	 * Load a opening time modal of a location.
@@ -79,5 +78,4 @@ document.addEventListener("DOMContentLoaded", function () {
 		$('#location-modal').modal('show').find('.modal-body').text('...').load("?do=locationinfo&action=config-location&id=" + locationId);
 	});
 });
-
-//--></script>
+</script>