From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 E6872C2C3 for ; Fri, 15 Sep 2023 08:55:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1ADB58622 for ; Fri, 15 Sep 2023 08:55:07 +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 ; Fri, 15 Sep 2023 08:55:05 +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 60E09465ED for ; Fri, 15 Sep 2023 08:55:05 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 15 Sep 2023 08:54:48 +0200 Message-Id: <20230915065457.352953-15-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915065457.352953-1-h.laimer@proxmox.com> References: <20230915065457.352953-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.016 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 Subject: [pbs-devel] [PATCH proxmox-backup 14/23] ui: display removable datastores in list X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Sep 2023 06:55:34 -0000 Signed-off-by: Hannes Laimer --- www/NavigationTree.js | 10 +++++++--- www/css/ext6-pbs.css | 8 ++++++++ www/datastore/DataStoreListSummary.js | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/www/NavigationTree.js b/www/NavigationTree.js index 3e0040f7..08c796b2 100644 --- a/www/NavigationTree.js +++ b/www/NavigationTree.js @@ -261,13 +261,17 @@ Ext.define('PBS.view.main.NavigationTree', { j++; } - let [qtip, iconCls] = ['', 'fa fa-database']; + const mainIcon = `fa fa-${records[i].data.removable ? 'usb' : 'database'}`; + let [qtip, iconCls] = ['', mainIcon]; const maintenance = records[i].data.maintenance; if (maintenance) { const [type, message] = PBS.Utils.parseMaintenanceMode(maintenance); qtip = `${type}${message ? ': ' + message : ''}`; - let mainenanceTypeCls = type === 'delete' ? 'destroying' : 'maintenance'; - iconCls = `fa fa-database pmx-tree-icon-custom ${mainenanceTypeCls}`; + const maintenanceTypeCls = { + 'delete': 'destroying', + 'unplugged': 'unplugged', + }[type] ?? 'maintenance'; + iconCls = `${mainIcon} pmx-tree-icon-custom ${maintenanceTypeCls}`; } if (getChildTextAt(j).localeCompare(name) !== 0) { diff --git a/www/css/ext6-pbs.css b/www/css/ext6-pbs.css index 5fd65d25..2abff495 100644 --- a/www/css/ext6-pbs.css +++ b/www/css/ext6-pbs.css @@ -267,6 +267,10 @@ span.snapshot-comment-column { content: "\ "; } +.x-treelist-item-icon.fa-usb, .pmx-tree-icon-custom.fa-usb { + font-size: 12px; +} + /* datastore maintenance */ .pmx-tree-icon-custom.maintenance:after { content: "\f0ad"; @@ -286,6 +290,10 @@ span.snapshot-comment-column { color: #888; } +.pmx-tree-icon-custom.unplugged:before { + color: #888; +} + /*' PBS specific icons */ .pbs-icon-tape { diff --git a/www/datastore/DataStoreListSummary.js b/www/datastore/DataStoreListSummary.js index 968239b0..c8eaca9f 100644 --- a/www/datastore/DataStoreListSummary.js +++ b/www/datastore/DataStoreListSummary.js @@ -22,6 +22,7 @@ Ext.define('PBS.datastore.DataStoreListSummary', { stillbad: 0, deduplication: 1.0, error: "", + removable: false, maintenance: '', }, }, -- 2.39.2