From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 9E7BF1FF138 for ; Mon, 20 Jul 2026 12:04:07 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 70A7C21494; Mon, 20 Jul 2026 12:04:07 +0200 (CEST) From: Thomas Ellmenreich To: pve-devel@lists.proxmox.com Subject: [PATCH manager v2 1/2] fix #5475: configurable window title Date: Mon, 20 Jul 2026 12:03:28 +0200 Message-ID: <20260720100329.118508-2-t.ellmenreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260720100329.118508-1-t.ellmenreich@proxmox.com> References: <20260720100329.118508-1-t.ellmenreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1784541788474 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.178 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: R37WV6EJ5R26HEJ7VDLQK5BITOJFU2CF X-Message-ID-Hash: R37WV6EJ5R26HEJ7VDLQK5BITOJFU2CF X-MailFrom: t.ellmenreich@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Thomas Ellmenreich X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Allow setting of the new 'ui-settings' format string and the nested 'title' property. Setting this property defines the window titles for all cluster nodes. Signed-off-by: Thomas Ellmenreich --- PVE/Service/pveproxy.pm | 21 ++++++++++++ www/index.html.tpl | 2 +- www/manager6/UIOptions.js | 6 ++++ www/manager6/dc/OptionView.js | 61 +++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index c6011a00..811295f4 100755 --- a/PVE/Service/pveproxy.pm +++ b/PVE/Service/pveproxy.pm @@ -202,6 +202,24 @@ my sub get_path_mtime { return $mtime; } +# builds the window title from the datacenter.cfg configuration +my $get_window_title = sub { + my ($title_enum, $nodename) = @_; + + my $title = "$nodename"; + + if ($title_enum eq "node-and-cluster") { + my $clinfo = PVE::Cluster::get_clinfo(); + my $clustername = $clinfo->{cluster}->{name}; + + $title = "$nodename - $clustername"; + } elsif ($title_enum eq "fqdn") { + $title = PVE::Tools::get_fqdn(); + } + + return $title . " - Proxmox Virtual Environment"; +}; + # NOTE: Requests to those pages are not authenticated so we must be very careful here sub get_index { my ($nodename, $server, $r, $args) = @_; @@ -232,10 +250,12 @@ sub get_index { } } + my $window_title; my $consent_text; eval { my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg'); $consent_text = $dc_conf->{'consent-text'}; + $window_title = $get_window_title->($dc_conf->{'ui-settings'}->{'title'}, $nodename); if (!$lang) { $lang = $dc_conf->{language} // 'en'; @@ -276,6 +296,7 @@ sub get_index { token => $token, console => $args->{console}, nodename => $nodename, + window_title => $window_title, debug => $debug, version => "$version", wtversion => $wtversion, diff --git a/www/index.html.tpl b/www/index.html.tpl index 74ee02d9..5138b7cc 100644 --- a/www/index.html.tpl +++ b/www/index.html.tpl @@ -4,7 +4,7 @@ - [% nodename %] - Proxmox Virtual Environment + [% window_title %] diff --git a/www/manager6/UIOptions.js b/www/manager6/UIOptions.js index 8c4674af..bb0af8d5 100644 --- a/www/manager6/UIOptions.js +++ b/www/manager6/UIOptions.js @@ -90,6 +90,12 @@ Ext.define('PVE.UIOptions', { alphabetical: gettext('Alphabetical'), }, + titleOptions: { + __default__: '$nodename - Proxmox Virtual Environment', + 'node-and-cluster': '$nodename - $clustername - Proxmox Virtual Environment', + fqdn: '$fqdn - Proxmox Virtual Environment', + }, + shouldSortTags: function () { return !(PVE.UIOptions.options['tag-style']?.ordering === 'config'); }, diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index dc12aa7e..208cc147 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -91,6 +91,67 @@ Ext.define('PVE.dc.OptionView', { defaultValue: '__default__', deleteEmpty: true, }); + me.rows['ui-settings'] = { + required: true, + renderer: (value) => { + if (value === undefined) { + return gettext('No Overrides'); + } + let txt = ''; + if (value.title) { + txt += Ext.String.format(gettext('Title: {0}'), value.title); + } + return txt; + }, + header: gettext('Ui Settings'), + editor: { + xtype: 'proxmoxWindowEdit', + width: 800, + subject: gettext('Ui Settings'), + fieldDefaults: { + labelWidth: 100, + }, + url: '/api2/extjs/cluster/options', + items: [ + { + xtype: 'inputpanel', + setValues: function (values) { + if (values === undefined) { + return undefined; + } + values = values?.['ui-settings'] ?? {}; + values.title = values.title || '__default__'; + return Proxmox.panel.InputPanel.prototype.setValues.call(this, values); + }, + onGetValues: function (values) { + let style = {}; + if (values.title) { + style.title = values.title; + } + let value = PVE.Parser.printPropertyString(style); + if (value === '') { + return { + delete: 'ui-settings', + }; + } + return { + 'ui-settings': value, + }; + }, + items: [ + { + xtype: 'proxmoxKVComboBox', + name: 'title', + fieldLabel: gettext('Title'), + comboItems: Object.entries(PVE.UIOptions.titleOptions), + deleteEmpty: true, + defaultValue: '__default__', + }, + ], + }, + ], + }, + }; me.add_text_row('email_from', gettext('Email from address'), { deleteEmpty: true, vtype: 'proxmoxMail', -- 2.47.3