diff options
Diffstat (limited to 'modules-available/locationinfo/templates')
3 files changed, 43 insertions, 10 deletions
diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html index 6e04550d..cc62075e 100755 --- a/modules-available/locationinfo/templates/frontend-default.html +++ b/modules-available/locationinfo/templates/frontend-default.html @@ -564,6 +564,8 @@ optional: putInRange(config, 'rotation', 0, 3, 0); } + var updateTimer = null; + /** * generates the Room divs and calls the needed functions depending on the rooms mode */ @@ -651,7 +653,7 @@ optional: } mainUpdateLoop(); - setInterval(mainUpdateLoop, 10000); + updateTimer = setInterval(mainUpdateLoop, 10000); setInterval(updateHeaders, globalConfig.eco ? 10000 : 1000); } @@ -679,7 +681,14 @@ optional: var today = date.getDate(); if (lastDate !== false) { if (lastDate !== today) { - location.reload(true); + if (updateTimer !== null) { + clearInterval(updateTimer); + updateTimer = null; + } + // Delay by a minute, sometimes the calendar shows the previous day if we load too quickly. + setTimeout(function() { + location.reload(true); + }, 60000); } } else { lastDate = today; @@ -1326,7 +1335,6 @@ optional: /========================================== Room Layout ============================================= */ - const picSizeX = 3.8; const picSizeY = 3; diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html index 365e15db..3aaf8620 100644 --- a/modules-available/locationinfo/templates/page-config-panel-url.html +++ b/modules-available/locationinfo/templates/page-config-panel-url.html @@ -188,10 +188,10 @@ </div> <div class="col-sm-3"> <input class="form-control" name="bookmarkUrls[]" type="text" value="" - placeholder="http://www.bwlehrpool.de/" pattern=".*://.*"> + placeholder="https://www.bwlehrpool.de/" pattern=".*://.*"> </div> <div class="col-sm-1"> - <button type="button" class="btn btn-danger" onclick="this.closest('.row').remove()"> + <button type="button" class="btn btn-danger" onclick="$(this).closest('.row').remove()"> <span class="glyphicon glyphicon-minus"></span> </button> </div> @@ -208,7 +208,7 @@ 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()"> + <button type="button" class="btn btn-danger" onclick="$(this).closest('.row').remove()"> <span class="glyphicon glyphicon-minus"></span> </button> </div> @@ -216,6 +216,24 @@ {{/bookmarks}} </div> + <div class="list-group-item"> + <div class="row"> + <div class="col-sm-4"> + <label for="zoom-factor">{{lang_zoomFactor}}</label> + </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> + <div class="col-sm-1 col-xs-2" id="zoom-value"> + + </div> + <div class="col-sm-12 small text-muted spacebottop"> + {{lang_zoomFactorTooltip}} + </div> + </div> + </div> + </div> </div> <div class="text-right"> @@ -227,12 +245,19 @@ </div> </form> -<script type="text/javascript"><!-- +<script> document.addEventListener("DOMContentLoaded", function () { // load value to dropdown menus - $('#browser option[value="{{browser}}"]').attr("selected", "selected"); + $('#browser option[value="{{browser}}"]').prop("selected", true); browserChange(); + var $zv = $('#zoom-value'); + var $zf = $('#zoom-factor'); + var sliderUpdate = function() { + $zv.text($zf.val() + '%'); + }; + $zf.on('input', sliderUpdate); + sliderUpdate(); }); // Hide interactive-input if slx-browser is selected @@ -257,4 +282,4 @@ function addBookmark() { $('#bookmarks').append(rowCopy); } -//--></script> +</script> diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html index fa2e3a2d..c09b5336 100644 --- a/modules-available/locationinfo/templates/page-locations.html +++ b/modules-available/locationinfo/templates/page-locations.html @@ -35,7 +35,7 @@ {{/backend}} </td> <td class="text-center"> - <span class="glyphicon glyphicon-{{openingGlyph}}"></span> + <span class="glyphicon glyphicon-{{openingGlyph}} {{^strong}}text-muted{{/strong}}"></span> </td> </tr> {{/list}} |