From c535ce5e2f78f5223662c97543f718334abf2a35 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 8 Sep 2020 20:56:19 +0200
Subject: [locations] Migrate openingtimes from infoscreen to locations module
 - move openingtimes from infoscreen db to locations db - read-only
 openingtimes in infoscreen

---
 .../templates/ajax-config-location.html            | 93 +++++++++++++---------
 .../locationinfo/templates/page-locations.html     | 27 -------
 2 files changed, 55 insertions(+), 65 deletions(-)

(limited to 'modules-available/locationinfo/templates')

diff --git a/modules-available/locationinfo/templates/ajax-config-location.html b/modules-available/locationinfo/templates/ajax-config-location.html
index 47d4ba8a..f7e96b9d 100644
--- a/modules-available/locationinfo/templates/ajax-config-location.html
+++ b/modules-available/locationinfo/templates/ajax-config-location.html
@@ -4,11 +4,7 @@
 	{{^expertMode}}
 	<div id="simple-mode">
 
-		<div align="right">
-			<a href="#" class="btn btn-default btn-sm" id="btn-show-expert">{{lang_expertMode}}</a>
-		</div>
 		<div class="clearfix"></div>
-
 		<table class="table table-condensed" style="margin-bottom:0">
 			<tr>
 				<th>{{lang_day}}</th>
@@ -19,57 +15,57 @@
 			<tr class="tablerow">
 				<td>{{lang_monTilFr}}</td>
 				<td>
-					<div class="input-group bootstrap-timepicker">
+					<div class="input-group">
 						<span class="input-group-addon">
 							<span class="glyphicon glyphicon-time"></span>
 						</span>
-						<input type="text" class="form-control timepicker2" id="week-open" pattern="[0-9]{1,2}:[0-9]{2}">
+						<input disabled type="text" class="form-control timepicker2" id="week-open">
 					</div>
 				</td>
 				<td>
-					<div class="input-group bootstrap-timepicker">
+					<div class="input-group">
 						<span class="input-group-addon">
 							<span class="glyphicon glyphicon-time"></span>
 						</span>
-						<input type="text" class="form-control timepicker2" id="week-close" pattern="[0-9]{1,2}:[0-9]{2}">
+						<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 bootstrap-timepicker">
+					<div class="input-group">
 						<span class="input-group-addon">
 							<span class="glyphicon glyphicon-time"></span>
 						</span>
-						<input type="text" class="form-control timepicker2" id="saturday-open" pattern="[0-9]{1,2}:[0-9]{2}">
+						<input disabled type="text" class="form-control timepicker2" id="saturday-open">
 					</div>
 				</td>
 				<td>
-					<div class="input-group bootstrap-timepicker">
+					<div class="input-group">
 						<span class="input-group-addon">
 							<span class="glyphicon glyphicon-time"></span>
 						</span>
-						<input type="text" class="form-control timepicker2" id="saturday-close" pattern="[0-9]{1,2}:[0-9]{2}">
+						<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 bootstrap-timepicker">
+					<div class="input-group">
 						<span class="input-group-addon">
 							<span class="glyphicon glyphicon-time"></span>
 						</span>
-						<input type="text" class="form-control timepicker2" id="sunday-open" pattern="[0-9]{1,2}:[0-9]{2}">
+						<input disabled type="text" class="form-control timepicker2" id="sunday-open">
 					</div>
 				</td>
 				<td>
-					<div class="input-group bootstrap-timepicker">
+					<div class="input-group">
 						<span class="input-group-addon">
 							<span class="glyphicon glyphicon-time"></span>
 						</span>
-						<input type="text" class="form-control timepicker2" id="sunday-close" pattern="[0-9]{1,2}:[0-9]{2}">
+						<input disabled type="text" class="form-control timepicker2" id="sunday-close">
 					</div>
 				</td>
 			</tr>
@@ -78,21 +74,15 @@
 	{{/expertMode}}
 
 	<div id="expert-mode" style="{{^expertMode}}display:none{{/expertMode}}">
-		<div class="pull-right">
-			<a class="btn btn-success btn-sm" id="new-openingtime">
-				<span class="glyphicon glyphicon-plus-sign"></span>
-				{{lang_openingTime}}
-			</a>
-		</div>
 		<div class="clearfix"></div>
 		<div id="expert-table">
 			<div class="row">
-				<div class="col-xs-9">{{lang_day}}</div>
-				<div class="col-xs-3 text-right">{{lang_delete}}</div>
 				<div class="col-sm-6">{{lang_openingTime}}</div>
-				<div class="col-sm-6">{{lang_closingTime}}</div>
+				<div class="col-sm-4">{{lang_closingTime}}</div>
+				<div class="col-sm-2 text-right">{{lang_delete}}</div>
 			</div>
 		</div>
+		<hr>
 	</div>
 </div>
 
@@ -105,7 +95,7 @@
 		<select id="backend-select" class="form-control" name="serverid">
 			<option value="0">{{lang_noServer}}</option>
 			{{#serverlist}}
-				<option value="{{serverid}}" {{selected}}>{{servername}}</option>
+			<option value="{{serverid}}" {{selected}}>{{servername}}</option>
 			{{/serverlist}}
 		</select>
 	</div>
@@ -143,6 +133,33 @@
 	</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() {
 
@@ -154,18 +171,18 @@
 			}
 		{{/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']);
-				}
+		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'));
@@ -175,7 +192,7 @@
 		$('#new-openingtime').click(function (e) {
 			e.preventDefault();
 			setTimepicker(newOpeningTime({}).find('.timepicker2'));
-		})
+		});
 
 		$('#btn-show-expert').click(function (e) {
 			e.preventDefault();
diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html
index f90a0f35..9635268c 100644
--- a/modules-available/locationinfo/templates/page-locations.html
+++ b/modules-available/locationinfo/templates/page-locations.html
@@ -65,33 +65,6 @@
 	</div>
 </div>
 
-<div class="hidden" id="expert-template">
-	<div class="row expert-row" style="margin-top:1em;border-top:1px solid #ddd">
-		<div class="col-xs-12 days-box">
-			<div class="pull-right checkbox checkbox-inline"><input type="checkbox" class="i-delete"><label><span class="glyphicon glyphicon-trash"></span></label></div>
-			<div class="checkbox checkbox-inline"><input type="checkbox" class="i-Monday"><label>{{lang_shortMonday}}</label></div>
-			<div class="checkbox checkbox-inline"><input type="checkbox" class="i-Tuesday"><label>{{lang_shortTuesday}}</label></div>
-			<div class="checkbox checkbox-inline"><input type="checkbox" class="i-Wednesday"><label>{{lang_shortWednesday}}</label></div>
-			<div class="checkbox checkbox-inline"><input type="checkbox" class="i-Thursday"><label>{{lang_shortThursday}}</label></div>
-			<div class="checkbox checkbox-inline"><input type="checkbox" class="i-Friday"><label>{{lang_shortFriday}}</label></div>
-			<div class="checkbox checkbox-inline"><input type="checkbox" class="i-Saturday"><label>{{lang_shortSaturday}}</label></div>
-			<div class="checkbox checkbox-inline"><input type="checkbox" class="i-Sunday"><label>{{lang_shortSunday}}</label></div>
-		</div>
-		<div class="col-sm-6">
-			<div class="input-group bootstrap-timepicker">
-				<span class="input-group-addon"><span class="glyphicon glyphicon-time"></span></span>
-				<input type="text" class="form-control timepicker2 i-openingtime" pattern="[0-9]{1,2}:[0-9]{2}">
-			</div>
-		</div>
-		<div class="col-sm-6">
-			<div class="input-group bootstrap-timepicker">
-				<span class="input-group-addon"><span class="glyphicon glyphicon-time"></span></span>
-				<input type="text" class="form-control timepicker2 i-closingtime" pattern="[0-9]{1,2}:[0-9]{2}">
-			</div>
-		</div>
-	</div>
-</div>
-
 <script type="text/javascript"><!--
 
 document.addEventListener("DOMContentLoaded", function () {
-- 
cgit v1.2.3-55-g7522