From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v6 10/11] ui: tree/ResourceTree: show Tags in tree
Date: Tue, 12 Apr 2022 15:34:22 +0200 [thread overview]
Message-ID: <20220412133423.1021857-15-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220412133423.1021857-1-d.csapak@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/lxc/Config.js | 4 +++-
www/manager6/qemu/Config.js | 4 +++-
www/manager6/tree/ResourceTree.js | 4 ++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js
index 9f1994d3..1b79628e 100644
--- a/www/manager6/lxc/Config.js
+++ b/www/manager6/lxc/Config.js
@@ -206,8 +206,10 @@ Ext.define('PVE.lxc.Config', {
},
});
+ let vm_text = `${vm.vmid} (${vm.name})`;
+
Ext.apply(me, {
- title: Ext.String.format(gettext("Container {0} on node '{1}'"), vm.text, nodename),
+ title: Ext.String.format(gettext("Container {0} on node '{1}'"), vm_text, nodename),
hstateid: 'lxctab',
tbarSpacing: false,
tbar: [statusTxt, tagsContainer, '->', startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn],
diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js
index 2cd6d856..5c8fa620 100644
--- a/www/manager6/qemu/Config.js
+++ b/www/manager6/qemu/Config.js
@@ -242,8 +242,10 @@ Ext.define('PVE.qemu.Config', {
},
});
+ let vm_text = `${vm.vmid} (${vm.name})`;
+
Ext.apply(me, {
- title: Ext.String.format(gettext("Virtual Machine {0} on node '{1}'"), vm.text, nodename),
+ title: Ext.String.format(gettext("Virtual Machine {0} on node '{1}'"), vm_text, nodename),
hstateid: 'kvmtab',
tbarSpacing: false,
tbar: [statusTxt, tagsContainer, '->', resumeBtn, startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn],
diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js
index 139defab..d41721b9 100644
--- a/www/manager6/tree/ResourceTree.js
+++ b/www/manager6/tree/ResourceTree.js
@@ -5,6 +5,8 @@ Ext.define('PVE.tree.ResourceTree', {
extend: 'Ext.tree.TreePanel',
alias: ['widget.pveResourceTree'],
+ userCls: 'proxmox-tags-circle',
+
statics: {
typeDefaults: {
node: {
@@ -114,6 +116,8 @@ Ext.define('PVE.tree.ResourceTree', {
}
}
+ info.text += PVE.Utils.renderTags(info.tags, PVE.Utils.tagOverrides);
+
info.text = status + info.text;
},
--
2.30.2
next prev parent reply other threads:[~2022-04-12 13:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 13:34 [pve-devel] [PATCH cluster/widget-toolkit/manager v6] add tags to ui Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH cluster v6 1/3] add CFS_IPC_GET_GUEST_CONFIG_PROPERTIES method Dominik Csapak
2022-04-27 7:17 ` Thomas Lamprecht
2022-04-12 13:34 ` [pve-devel] [PATCH cluster v6 2/3] Cluster: add get_guest_config_properties Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH cluster v6 3/3] datacenter.cfg: add option for tag-tree-style and tag-colors Dominik Csapak
2022-04-27 5:55 ` Thomas Lamprecht
2022-04-12 13:34 ` [pve-devel] [PATCH widget-toolkit v6 1/1] add tag related helpers Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 01/11] api: /cluster/resources: add tags to returned properties Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 02/11] api: /version: add 'tag-colors' and 'tag-tree-style' Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 03/11] ui: parse and save tag color overrides from /version Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 04/11] ui: tree/ResourceTree: collect tags on update Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 05/11] ui: add form/TagColorGrid Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 06/11] ui: dc/OptionView: add editors for tag settings Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 07/11] ui: add form/Tag Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 08/11] ui: add form/TagEdit.js Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 09/11] ui: {lxc, qemu}/Config: show Tags and make them editable Dominik Csapak
2022-04-12 13:34 ` Dominik Csapak [this message]
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 11/11] ui: form/GlobalSearchField: display tags and allow to search for them Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220412133423.1021857-15-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox