diff options
| author | Simon Rettberg | 2021-10-18 16:11:21 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2021-10-18 16:11:21 +0200 |
| commit | d7279ecedb062cc59b0d932ac7c13079ce9fc21a (patch) | |
| tree | 4f299d1ddc9223ee2e9610a3fa194eb58d77bc3c | |
| parent | [statistica] Query support etc. (diff) | |
| parent | [sysconfig] Urge users to upload only svg images... (diff) | |
| download | slx-admin-d7279ecedb062cc59b0d932ac7c13079ce9fc21a.tar.gz slx-admin-d7279ecedb062cc59b0d932ac7c13079ce9fc21a.tar.xz slx-admin-d7279ecedb062cc59b0d932ac7c13079ce9fc21a.zip | |
Merge branch 'master' into hardware-stats
| -rw-r--r-- | modules-available/statistics/templates/clientlist.html | 20 | ||||
| -rw-r--r-- | modules-available/sysconfig/templates/branding-start.html | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html index af349437..67e1a56f 100644 --- a/modules-available/statistics/templates/clientlist.html +++ b/modules-available/statistics/templates/clientlist.html @@ -170,6 +170,11 @@ data-target="#mac-list"> {{lang_uuid}} </a></li> + <hr style="margin: 0px"> + <li><a href="#" class="list-btn" data-what="hostname ip mac uuid" data-toggle="modal" + data-target="#mac-list"> + {{lang_fullInfo}} + </a></li> </ul> </div> {{#rebootcontrol}} @@ -302,14 +307,19 @@ document.addEventListener("DOMContentLoaded", function () { $fn(); }); $('.list-btn').click(function() { - var what = $(this).data('what'); + var what = $(this).data('what').split(" "); var $el = $('#mac-list-content'); $el.empty(); var result = ''; - var num = $('.machine').has('input[type=checkbox]:checked').find('.' + what).each(function() { - var text = this.innerText; - if (what === 'mac') text = text.replace(/-/g, ':'); - result += text + "\n"; + var num = $('.machine').has('input[type=checkbox]:checked').each(function(index, element) { + what.forEach(function (w) { + $(element).find('.' + w).each(function() { + var text = this.innerText; + if (w === 'mac') text = text.replace(/-/g, ':'); + result += text + "\t"; + }); + }); + result += "\n"; }).length; $el.text(result).prop('rows', Math.min(24, Math.max(5, num))); }); diff --git a/modules-available/sysconfig/templates/branding-start.html b/modules-available/sysconfig/templates/branding-start.html index 0db085d9..a6346552 100644 --- a/modules-available/sysconfig/templates/branding-start.html +++ b/modules-available/sysconfig/templates/branding-start.html @@ -14,7 +14,7 @@ <input type="text" class="form-control" readonly placeholder="{{lang_selectFile}}"> <span class="input-group-btn"> <span class="btn btn-default btn-file"> - {{lang_browseForFile}}… <input type="file" name="file" id="input-file"> + {{lang_browseForFile}}… <input type="file" accept="image/svg+xml" name="file" id="input-file"> </span> </span> </div> |