diff options
Diffstat (limited to 'modules-available/locationinfo')
15 files changed, 106 insertions, 65 deletions
diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php index e3d7db3d..38e271fe 100644 --- a/modules-available/locationinfo/inc/locationinfo.inc.php +++ b/modules-available/locationinfo/inc/locationinfo.inc.php @@ -130,6 +130,9 @@ class LocationInfo if ($data && $data['insecure-ssl']) { ConfigHolder::add('SLX_BROWSER_INSECURE', '1'); } + if ($data && $data['reload-minutes']) { + ConfigHolder::add('SLX_BROWSER_RELOAD_SECS', $data['reload-minutes'] * 60); + } } ConfigHolder::add('SLX_BROWSER_URL', 'http://' . $_SERVER['SERVER_ADDR'] . '/panel/' . $panelUuid); ConfigHolder::add('SLX_ADDONS', '', 1000); diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json index b305f800..bcdf7148 100644 --- a/modules-available/locationinfo/lang/de/template-tags.json +++ b/modules-available/locationinfo/lang/de/template-tags.json @@ -71,6 +71,8 @@ "lang_prettytimeTooltip": "Verwende ein anderes Anzeigeformat f\u00fcr die Uhrzeit", "lang_recursiveServerSet": "Auch f\u00fcr alle untergeordneten R\u00e4ume setzen", "lang_recursiveSetTooltip": "Wenn aktiviert, wird der Backend-Server auch f\u00fcr alle untergeordneten R\u00e4ume auf den hier gew\u00e4hlten Wert gesetzt", + "lang_reloadIntervalMins": "Neuladen alle X Minuten", + "lang_reloadIntervalTooltip": "Setzen Sie dieses Feld auf einen Wert > 0 (in Minuten), um die Seite auf den Clients regelm\u00e4\u00dfig neu zu laden. Feld auf 0 setzen oder leer lassen deaktiviert diese Funktion.", "lang_remoteSchedule": "Abruf Belegungsplan", "lang_room": "Raum", "lang_roomId": "Raum ID", diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json index 5679e8b8..558ddff0 100644 --- a/modules-available/locationinfo/lang/en/template-tags.json +++ b/modules-available/locationinfo/lang/en/template-tags.json @@ -71,6 +71,8 @@ "lang_prettytimeTooltip": "Use a different display format for the time", "lang_recursiveServerSet": "Also set for all child locations", "lang_recursiveSetTooltip": "If checked, all direct and indirect child locations will be configured to use the backend server selected above", + "lang_reloadIntervalMins": "Reload every X minutes", + "lang_reloadIntervalTooltip": "Set this field to a value > 0 (in minutes) to reload the page periodically. Set to 0 or leave blank to disable.", "lang_remoteSchedule": "Time table retrieval", "lang_room": "Room", "lang_roomId": "Room ID", diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index 22a21951..777b84db 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -362,6 +362,7 @@ class Page_LocationInfo extends Page $conf = array( 'url' => Request::post('url', 'https://www.bwlehrpool.de/', 'string'), 'insecure-ssl' => Request::post('insecure-ssl', 0, 'int'), + 'reload-minutes' => max(0, Request::post('reloadminutes', 0, 'int')), ); return array('config' => $conf, 'locationids' => []); } @@ -887,6 +888,7 @@ class Page_LocationInfo extends Page 'panelname' => $panel['panelname'], 'url' => $config['url'], 'ssl_checked' => $config['insecure-ssl'] ? 'checked' : '', + 'reloadminutes' => (int)$config['reload-minutes'], )); } else { Render::addTemplate('page-config-panel-summary', array( diff --git a/modules-available/locationinfo/style.css b/modules-available/locationinfo/style.css new file mode 100644 index 00000000..b5fffe75 --- /dev/null +++ b/modules-available/locationinfo/style.css @@ -0,0 +1,10 @@ +.btn-static { + background-color: white; + border: 1px solid lightgrey; + cursor: default; +} +.btn-static:active{ + -moz-box-shadow: inset 0 0 0px white; + -webkit-box-shadow: inset 0 0 0px white; + box-shadow: inset 0 0 0px white; +} diff --git a/modules-available/locationinfo/templates/ajax-config-location.html b/modules-available/locationinfo/templates/ajax-config-location.html index b42ff98d..102a6ea4 100644 --- a/modules-available/locationinfo/templates/ajax-config-location.html +++ b/modules-available/locationinfo/templates/ajax-config-location.html @@ -110,9 +110,9 @@ </select> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_serverTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_serverTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> <div class="row"> @@ -124,9 +124,9 @@ </div> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_recursiveSetTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_recursiveSetTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> <div class="row"> @@ -137,9 +137,9 @@ <input class="form-control" name="serverlocationid" id="serverlocationid" value="{{serverlocationid}}"> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_roomIdTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_roomIdTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> @@ -170,7 +170,7 @@ setTimepicker($('#settings-outer').find('.timepicker2')); - $('a.helptext').tooltip(); + $('p.helptext').tooltip(); $('#new-openingtime').click(function (e) { e.preventDefault(); diff --git a/modules-available/locationinfo/templates/ajax-config-server.html b/modules-available/locationinfo/templates/ajax-config-server.html index 940bc55a..8c2cb3ba 100644 --- a/modules-available/locationinfo/templates/ajax-config-server.html +++ b/modules-available/locationinfo/templates/ajax-config-server.html @@ -12,9 +12,9 @@ form="form-{{currentbackend}}"> </div> <div class="col-md-2"> - <a class="btn btn-default" title="{{lang_nameTooltip}}"> + <p class="btn btn-static" title="{{lang_nameTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -34,9 +34,9 @@ </select> </div> <div class="col-md-2"> - <a class="btn btn-default" id="help-type" title="{{lang_typeTooltip}}"> + <p class="btn btn-static" id="help-type" title="{{lang_typeTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -92,7 +92,7 @@ currentBackend = value; } - $('a.btn[title]').tooltip(); + $('p.btn[title]').tooltip(); $('#myModalSubmitButton').attr('form', 'form-' + currentBackend); $('.settings-bs-switch').bootstrapSwitch({size:'small'}); diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html index b55e3d4d..41a8fd00 100644 --- a/modules-available/locationinfo/templates/page-config-panel-default.html +++ b/modules-available/locationinfo/templates/page-config-panel-default.html @@ -28,9 +28,9 @@ <input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}"> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_displayNameTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -48,9 +48,9 @@ </select> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_languageTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_languageTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -69,9 +69,9 @@ </select> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_modeTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_modeTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -85,9 +85,9 @@ <input id="input-eco" type="checkbox" name="eco" {{eco_checked}}> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_ecoTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_ecoTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -101,9 +101,9 @@ <input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_prettytimeTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_prettytimeTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -128,9 +128,9 @@ max="1440" value="{{calupdate}}" required> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_calupdateTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_calupdateTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -145,9 +145,9 @@ max="86400" value="{{roomupdate}}" required> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_roomupdateTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_roomupdateTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -177,9 +177,9 @@ <input id="input-vertical" type="checkbox" name="vertical" {{vertical_checked}}> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_verticalTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_verticalTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -193,9 +193,9 @@ <input id="scaledaysauto" type="checkbox" name="scaledaysauto" {{scaledaysauto_checked}}> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_autoscaleTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_autoscaleTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -217,9 +217,9 @@ </select> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_daysToShowTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_daysToShowTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -238,9 +238,9 @@ </select> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_rotationTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_rotationTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -255,9 +255,9 @@ <input id="input-scale" name="scale" type="range" step="1" min="10" max="90" value="{{scale}}"> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_scaleTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_scaleTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -272,9 +272,9 @@ <input id="input-switchtime" name="switchtime" type="range" step="1" min="1" max="120" value="{{switchtime}}"> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_switchTimeTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_switchTimeTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -338,7 +338,7 @@ document.addEventListener("DOMContentLoaded", function () { var $locInput = $('#locationids'); // Initialize fancy tooltips - $('a.helptext').tooltip(); + $('p.helptext').tooltip(); // Add listener to range sliders so their label can be updated $('input[type="range"]').change(function () { $(this).siblings().find('.range-display').text($(this).val()); diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html index 2a968fc2..3dc93680 100644 --- a/modules-available/locationinfo/templates/page-config-panel-summary.html +++ b/modules-available/locationinfo/templates/page-config-panel-summary.html @@ -28,9 +28,9 @@ <input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}"> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_displayNameTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -48,9 +48,9 @@ </select> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_languageTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_languageTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -64,9 +64,9 @@ <input id="input-eco" type="checkbox" name="eco" {{eco_checked}}> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_ecoTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_ecoTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -151,7 +151,7 @@ document.addEventListener("DOMContentLoaded", function () { var $locInput = $('#locationids'); // Initialize fancy tooltips - $('a.helptext').tooltip(); + $('p.helptext').tooltip(); // Add listener to range sliders so their label can be updated $('input[type="range"]').change(function () { $(this).siblings().find('.range-display').text($(this).val()); diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html index 401214bd..798ff55d 100644 --- a/modules-available/locationinfo/templates/page-config-panel-url.html +++ b/modules-available/locationinfo/templates/page-config-panel-url.html @@ -25,9 +25,9 @@ <input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}"> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_displayNameTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_displayNameTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -42,9 +42,9 @@ placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_urlTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_urlTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> @@ -55,15 +55,35 @@ <label for="input-ssl">{{lang_insecureSsl}}</label> </div> <div class="col-sm-7"> - <input id="input-ssl" type="checkbox" name="insecure-ssl" {{ssl_checked}} value="1"> + <div class="checkbox"> + <input id="input-ssl" type="checkbox" name="insecure-ssl" {{ssl_checked}} value="1"> + <label></label> + </div> </div> <div class="col-sm-2"> - <a class="btn btn-default helptext" title="{{lang_ignoreSslTooltip}}"> + <p class="btn btn-static helptext" title="{{lang_ignoreSslTooltip}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> </div> </div> </div> + + <div class="list-group-item"> + <div class="row"> + <div class="col-sm-3"> + <label for="input-reload">{{lang_reloadIntervalMins}}</label> + </div> + <div class="col-sm-7"> + <input class="form-control" id="input-reload" type="number" min="0" max="999" name="reloadminutes" pattern="\d*" value="{{reloadminutes}}"> + </div> + <div class="col-sm-2"> + <p class="btn btn-static helptext" title="{{lang_reloadIntervalTooltip}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </p> + </div> + </div> + </div> + </div> </div> </div> @@ -75,6 +95,8 @@ <script type="text/javascript"><!-- document.addEventListener("DOMContentLoaded", function () { + // Initialize fancy tooltips + $('p.helptext').tooltip(); }); diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html index b30ef2ed..37d8dd96 100644 --- a/modules-available/locationinfo/templates/page-locations.html +++ b/modules-available/locationinfo/templates/page-locations.html @@ -50,7 +50,7 @@ <div class="modal-body"></div> <div class="modal-footer"> <button type="submit" class="btn btn-primary">{{lang_save}}</button> - <a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a> + <a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a> </div> </form> </div> @@ -103,4 +103,4 @@ document.addEventListener("DOMContentLoaded", function () { $('#settings-form').submit(submitLocationSettings); }); -//--></script>
\ No newline at end of file +//--></script> diff --git a/modules-available/locationinfo/templates/page-servers.html b/modules-available/locationinfo/templates/page-servers.html index eefb1ed5..dbf18b5f 100644 --- a/modules-available/locationinfo/templates/page-servers.html +++ b/modules-available/locationinfo/templates/page-servers.html @@ -60,7 +60,7 @@ <div class="modal-footer"> <button type="submit" id="myModalSubmitButton" class="btn btn-primary" form="">{{lang_save}}</button> - <a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a> + <a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a> </div> </div> diff --git a/modules-available/locationinfo/templates/server-prop-bool.html b/modules-available/locationinfo/templates/server-prop-bool.html index f430d02c..bd9dcc64 100644 --- a/modules-available/locationinfo/templates/server-prop-bool.html +++ b/modules-available/locationinfo/templates/server-prop-bool.html @@ -7,10 +7,10 @@ </div> <div class="col-md-2"> {{#helptext}} - <a class="btn btn-default" title="{{helptext}}"> + <p class="btn btn-static" title="{{helptext}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> {{/helptext}} </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/modules-available/locationinfo/templates/server-prop-dropdown.html b/modules-available/locationinfo/templates/server-prop-dropdown.html index 80667766..d1351551 100644 --- a/modules-available/locationinfo/templates/server-prop-dropdown.html +++ b/modules-available/locationinfo/templates/server-prop-dropdown.html @@ -10,10 +10,10 @@ </div> <div class="col-md-2"> {{#helptext}} - <a class="btn btn-default" title="{{helptext}}"> + <p class="btn btn-static" title="{{helptext}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> {{/helptext}} </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/modules-available/locationinfo/templates/server-prop-generic.html b/modules-available/locationinfo/templates/server-prop-generic.html index 9e94c23d..23ff1e4e 100644 --- a/modules-available/locationinfo/templates/server-prop-generic.html +++ b/modules-available/locationinfo/templates/server-prop-generic.html @@ -7,10 +7,10 @@ </div> <div class="col-md-2"> {{#helptext}} - <a class="btn btn-default" title="{{helptext}}"> + <p class="btn btn-static" title="{{helptext}}"> <span class="glyphicon glyphicon-question-sign"></span> - </a> + </p> {{/helptext}} </div> </div> -</div>
\ No newline at end of file +</div> |