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 503687AAD5 for ; Tue, 5 Jul 2022 15:17:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3A1892FABA for ; Tue, 5 Jul 2022 15:16:38 +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 ; Tue, 5 Jul 2022 15:16:33 +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 7A5B643C2E for ; Tue, 5 Jul 2022 15:08:49 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 5 Jul 2022 13:08:25 +0000 Message-Id: <20220705130834.14285-20-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220705130834.14285-1-h.laimer@proxmox.com> References: <20220705130834.14285-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.041 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pbs-devel] [PATCH proxmox-backup 17/26] ui: add removable datastore specific icons to 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: Tue, 05 Jul 2022 13:17:08 -0000 Signed-off-by: Hannes Laimer --- www/NavigationTree.js | 17 +++++++++++++---- www/css/ext6-pbs.css | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/www/NavigationTree.js b/www/NavigationTree.js index aae35012..f316f678 100644 --- a/www/NavigationTree.js +++ b/www/NavigationTree.js @@ -1,6 +1,6 @@ Ext.define('pbs-datastore-list', { extend: 'Ext.data.Model', - fields: ['name', 'comment', 'maintenance'], + fields: ['name', 'comment', 'maintenance', 'removable'], proxy: { type: 'proxmox', url: "/api2/json/admin/datastore", @@ -255,9 +255,18 @@ Ext.define('PBS.view.main.NavigationTree', { } let [qtip, iconCls] = ['', 'fa fa-database']; - const maintenanceString = records[i].data.maintenance; - if (maintenanceString) { - const maintenance = PBS.Utils.parsePropertyString(maintenanceString, 'type'); + const maintenance = records[i].data.maintenance + ? PBS.Utils.parsePropertyString(records[i].data.maintenance, 'type') : null; + const removable = records[i].data.removable; + if (removable) { + iconCls = `fa fa-database pmx-tree-icon-custom removable-present`; + if (maintenance) { + iconCls = `fa fa-database pmx-tree-icon-custom removable-not-present`; + qtip = `${maintenance.message ? maintenance.message : 'no device present'}`; + } + } + + if (maintenance && maintenance.type !== 'unplugged') { qtip = `${maintenance.type}${maintenance.message ? ': ' + maintenance.message : ''}`; iconCls = 'fa fa-database pmx-tree-icon-custom maintenance'; } diff --git a/www/css/ext6-pbs.css b/www/css/ext6-pbs.css index 045a7376..a7aa36cb 100644 --- a/www/css/ext6-pbs.css +++ b/www/css/ext6-pbs.css @@ -301,6 +301,23 @@ span.snapshot-comment-column { color: #888; } +/* removable datastore */ +.pmx-tree-icon-custom.removable-present:after { + content: "\f287"; + font-size: 0.7em; + color: #000; +} + +.pmx-tree-icon-custom.removable-not-present:after { + content: "\f287"; + font-size: 0.7em; + color: #000; +} + +.pmx-tree-icon-custom.removable-not-present:before { + color: #888; +} + /*' PBS specific icons */ .pbs-icon-tape { -- 2.30.2