diff options
author | Simon Rettberg | 2019-03-27 14:43:33 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-03-27 14:43:33 +0100 |
commit | 4a98dbcc5ee019708dde2f2ef18bd19305d3aac2 (patch) | |
tree | 97304080889434fad6a94ec0e42c61aea61a461f /modules-available | |
parent | [locationinfo] add nowrap to clients column (diff) | |
download | slx-admin-4a98dbcc5ee019708dde2f2ef18bd19305d3aac2.tar.gz slx-admin-4a98dbcc5ee019708dde2f2ef18bd19305d3aac2.tar.xz slx-admin-4a98dbcc5ee019708dde2f2ef18bd19305d3aac2.zip |
[locationinfo] PC counting config via combobox
Diffstat (limited to 'modules-available')
5 files changed, 16 insertions, 5 deletions
diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json index 92281537..e3a601c0 100644 --- a/modules-available/locationinfo/lang/de/template-tags.json +++ b/modules-available/locationinfo/lang/de/template-tags.json @@ -9,6 +9,8 @@ "lang_checkConnection": "Verbindung pr\u00fcfen", "lang_closed": "Geschlossen", "lang_closingTime": "Schlie\u00dfungszeit", + "lang_countIp": "\u00fcber IP-Adressbereich", + "lang_countRoomplan": "\u00fcber Raumplaner", "lang_createPanel": "Panel anlegen", "lang_credentials": "Anmeldung", "lang_day": "Tag", @@ -79,7 +81,7 @@ "lang_room": "Raum", "lang_roomId": "Raum ID", "lang_roomIdTooltip": "Die Raum ID, die der Server ben\u00f6tigt, um Kalenderdaten abzurufen (bei Exchange die Postfachadresse)", - "lang_roomplannerTooltip": "Nur PCs ber\u00fccksichtigen, die im Raumplaner gesetzt wurden", + "lang_roomplannerTooltip": "Legt fest, ob Rechner anhand der Zuordnung \u00fcber IP oder \u00fcber den Raumplan gez\u00e4hlt werden", "lang_roomupdateTooltip": "Zeit nach der die PCs aktualisiert werden (in Sekunden)", "lang_rotation": "Rotation", "lang_rotation0": "0\u00b0", diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json index d44d27ee..c7d7a252 100644 --- a/modules-available/locationinfo/lang/en/template-tags.json +++ b/modules-available/locationinfo/lang/en/template-tags.json @@ -9,6 +9,8 @@ "lang_checkConnection": "Check connection", "lang_closed": "Closed", "lang_closingTime": "Closing time", + "lang_countIp": "via IP-Range", + "lang_countRoomplan": "via roomplanner", "lang_createPanel": "Create panel", "lang_credentials": "Login", "lang_day": "Day", diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index d1644ce1..f03fdfd5 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -975,7 +975,7 @@ class Page_LocationInfo extends Page 'vertical_checked' => $config['vertical'] ? 'checked' : '', 'eco_checked' => $config['eco'] ? 'checked' : '', 'prettytime_checked' => $config['prettytime'] ? 'checked' : '', - 'roomplanner_checked' => $config['roomplanner'] ? 'checked' : '', + 'roomplanner' => $config['roomplanner'], 'scaledaysauto_checked' => $config['scaledaysauto'] ? 'checked' : '', 'daystoshow' => $config['daystoshow'], 'rotation' => $config['rotation'], @@ -1004,7 +1004,7 @@ class Page_LocationInfo extends Page 'panelname' => $panel['panelname'], 'languages' => $langs, 'panelupdate' => $config['panelupdate'], - 'roomplanner_checked' => $config['roomplanner'] ? 'checked' : '', + 'rpselected_' . $config['roomplanner'] => 'selected', 'locations' => Location::getLocations(), 'locationids' => $panel['locationids'], 'eco_checked' => $config['eco'] ? 'checked' : '', diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html index 116c2e11..7fdeede5 100644 --- a/modules-available/locationinfo/templates/page-config-panel-default.html +++ b/modules-available/locationinfo/templates/page-config-panel-default.html @@ -114,7 +114,10 @@ <label for="input-roomplanner">{{lang_useRoomplanner}}</label> </div> <div class="col-sm-7"> - <input id="input-roomplanner" type="checkbox" name="roomplanner" {{roomplanner_checked}}> + <select class="form-control" name="roomplanner" id="input-roomplanner"> + <option value="0" id="roomplanner0">{{lang_countIp}}</option> + <option value="1" id="roomplanner1">{{lang_countRoomplan}}</option> + </select> </div> <div class="col-sm-2"> <p class="btn btn-static helptext" title="{{lang_roomplannerTooltip}}"> @@ -382,6 +385,7 @@ document.addEventListener("DOMContentLoaded", function () { $('#daystoshow option[value="{{daystoshow}}"]').attr("selected", "selected"); $('#rotation option[value="{{rotation}}"]').attr("selected", "selected"); $('#mode option[value="{{mode}}"]').attr("selected", "selected"); + $('#input-roomplanner option[value="{{roomplanner}}"]').attr("selected", "selected"); $('#daystoshow').prop('disabled', document.getElementById('scaledaysauto').checked); diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html index 5ddcc904..e238edf9 100644 --- a/modules-available/locationinfo/templates/page-config-panel-summary.html +++ b/modules-available/locationinfo/templates/page-config-panel-summary.html @@ -77,7 +77,10 @@ <label for="input-roomplanner">{{lang_useRoomplanner}}</label> </div> <div class="col-sm-7"> - <input id="input-roomplanner" type="checkbox" name="roomplanner" {{roomplanner_checked}}> + <select class="form-control" name="roomplanner" id="input-roomplanner"> + <option value="0" id="roomplanner0" {{rpselected_0}}>{{lang_countIp}}</option> + <option value="1" id="roomplanner1" {{rpselected_1}}>{{lang_countRoomplan}}</option> + </select> </div> <div class="col-sm-2"> <p class="btn btn-static helptext" title="{{lang_roomplannerTooltip}}"> |