From 05aefc85457546a3d062fa211da3dc52955b56cd Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Fri, 15 Oct 2021 16:49:30 +0200
Subject: [statistics] Add additional option to show sysinfos

fixes: #3657
---
 .../statistics/templates/clientlist.html             | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 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)));
 	});
-- 
cgit v1.2.3-55-g7522


From 094a6a7bac34c049f7d8b6209d2ca1c96b44d70b Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Mon, 18 Oct 2021 11:24:13 +0200
Subject: [sysconfig] Urge users to upload only svg images...

as branding. You can still change the file format in the
browser dialog and hope that other file extensions work.

Partly fixes #2861
---
 modules-available/sysconfig/templates/branding-start.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}}&hellip; <input type="file" name="file" id="input-file">
+						{{lang_browseForFile}}&hellip; <input type="file" accept="image/svg+xml" name="file" id="input-file">
 					</span>
 				</span>
 			</div>
-- 
cgit v1.2.3-55-g7522