From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 6C55D1FF0E9 for ; Thu, 16 Jul 2026 10:49:50 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 3C31A2143A; Thu, 16 Jul 2026 10:49:50 +0200 (CEST) From: Thomas Ellmenreich To: pve-devel@lists.proxmox.com Subject: [PATCH manager 1/2] fix #5475: configurable window title Date: Thu, 16 Jul 2026 10:48:06 +0200 Message-ID: <20260716084807.77400-2-t.ellmenreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260716084807.77400-1-t.ellmenreich@proxmox.com> References: <20260716084807.77400-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: 1784191736463 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.237 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: 763CQRUQZWK5T2Q377O7WYLZL2G2JN3O X-Message-ID-Hash: 763CQRUQZWK5T2Q377O7WYLZL2G2JN3O 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: Allows for setting of the new 'window-title' datacenter.cfg option through the ui. Adjusted the index.html templating to construct the correct window title on every request according to the cluster configuration. Signed-off-by: Thomas Ellmenreich --- PVE/Service/pveproxy.pm | 21 +++++++++++++++++++++ www/index.html.tpl | 2 +- www/manager6/Utils.js | 11 +++++++++++ www/manager6/dc/OptionView.js | 6 ++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index c6011a00..41b6e45e 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->{'window-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/Utils.js b/www/manager6/Utils.js index 040b5ae0..f435eedf 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -679,6 +679,17 @@ Ext.define('PVE.Utils', { return PVE.Utils.console_map[value] || value; }, + windowTitleMap: { + __default__: '$nodename - Proxmox Virtual Environment', + 'node-and-cluster': '$nodename - $clustername - Proxmox Virtual Environment', + fqdn: '$fqdn - Proxmox Virtual Environment', + }, + + renderWindowTitleViewer: function (value) { + value = value || '__default__'; + return PVE.Utils.windowTitleMap[value] || value; + }, + render_kvm_vga_driver: function (value) { if (!value) { return Proxmox.Utils.defaultText; diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index dc12aa7e..c7e73dc4 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -91,6 +91,12 @@ Ext.define('PVE.dc.OptionView', { defaultValue: '__default__', deleteEmpty: true, }); + me.add_combobox_row('window-title', gettext('Window Title'), { + renderer: PVE.Utils.renderWindowTitleViewer, + comboItems: Object.entries(PVE.Utils.windowTitleMap), + defaultValue: '__default__', + deleteEmpty: true, + }); me.add_text_row('email_from', gettext('Email from address'), { deleteEmpty: true, vtype: 'proxmoxMail', -- 2.47.3