From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <c.heiss@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 36B41C0DA
for <pve-devel@lists.proxmox.com>; Wed, 5 Jul 2023 13:13:11 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 1FB1F335D2
for <pve-devel@lists.proxmox.com>; Wed, 5 Jul 2023 13:13:11 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Wed, 5 Jul 2023 13:13:10 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AFE3B45A75
for <pve-devel@lists.proxmox.com>; Wed, 5 Jul 2023 13:13:09 +0200 (CEST)
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 5 Jul 2023 13:12:49 +0200
Message-ID: <20230705111257.759836-6-c.heiss@proxmox.com>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20230705111257.759836-1-c.heiss@proxmox.com>
References: <20230705111257.759836-1-c.heiss@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.070 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
T_SCC_BODY_TEXT_LINE -0.01 -
Subject: [pve-devel] [PATCH manager v2 5/5] ui: GuestStatusView: show distro
logo and name in summary header
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 05 Jul 2023 11:13:11 -0000
It fits neatly there, is rather unintrusive and yet still visible at
first sight. It also solves the problem of having to create a bigger
row, so that the icon is still easily recognisable. At the default
font-size of 13pt, this really wasn't the case.
Verified that each supported distro is present in the font and the name
matches up and tested through all supported distros (including
'unmanaged').
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
www/manager6/panel/GuestStatusView.js | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/www/manager6/panel/GuestStatusView.js b/www/manager6/panel/GuestStatusView.js
index ca2f03453..c773f252d 100644
--- a/www/manager6/panel/GuestStatusView.js
+++ b/www/manager6/panel/GuestStatusView.js
@@ -29,6 +29,7 @@ Ext.define('PVE.panel.GuestStatusView', {
success: ({ result }) => {
view.down('#unprivileged').updateValue(
Proxmox.Utils.format_boolean(result.data.unprivileged));
+ view.ostype = result.data.ostype;
},
});
},
@@ -166,6 +167,22 @@ Ext.define('PVE.panel.GuestStatusView', {
+ ')';
}
- me.setTitle(me.getRecordValue('name') + text);
+ let title = `<div class="left-aligned">${me.getRecordValue('name') + text}</div>`;
+
+ if (me.pveSelNode.data.type === 'lxc' && me.ostype && me.ostype !== 'unmanaged') {
+ // Manual mappings for distros with special casing
+ const namemap = {
+ 'archlinux': 'Arch Linux',
+ 'nixos': 'NixOS',
+ 'opensuse': 'openSUSE',
+ 'centos': 'CentOS',
+ };
+
+ const distro = namemap[me.ostype] ?? Ext.String.capitalize(me.ostype);
+ title += `<div class="right-aligned">
+ <i class="fl-${me.ostype} fl-fw"></i> ${distro}</div>`;
+ }
+
+ me.setTitle(title);
},
});
--
2.41.0