]> git.proxmox.com Git - pve-manager.git/commitdiff
projects / pve-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 89ceb80)
Close #822: show the nodename in the page title
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Thu, 11 Feb 2016 08:54:55 +0000 (09:54 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Thu, 11 Feb 2016 11:05:08 +0000 (12:05 +0100)
PVE/ExtJSIndex.pm patch | blob | blame | history
PVE/ExtJSIndex6.pm patch | blob | blame | history
PVE/NoVncIndex.pm patch | blob | blame | history
PVE/Service/pveproxy.pm patch | blob | blame | history
PVE/TouchIndex.pm patch | blob | blame | history
www/manager/Workspace.js patch | blob | blame | history
www/manager6/Workspace.js patch | blob | blame | history

diff --git a/PVE/ExtJSIndex.pm b/PVE/ExtJSIndex.pm
index c8c8f641fa26360508c48ecd8c07b75392442d1c..2671c542cfb8f377f6752a15bf3e531a6ed673b1 100644 (file)
--- a/PVE/ExtJSIndex.pm
+++ b/PVE/ExtJSIndex.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 sub get_index {
-    my ($lang, $username, $csrftoken, $console) = @_;
+    my ($lang, $username, $csrftoken, $console, $nodename) = @_;
 
     my $page = <<_EOD;
 <!DOCTYPE html>
@@ -12,7 +12,7 @@ sub get_index {
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=10">
-    <title>Proxmox Virtual Environment</title>
+    <title>$nodename - Proxmox Virtual Environment</title>
  
     <link rel="stylesheet" type="text/css" href="/pve2/ext4/resources/css/ext-all.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/css/ext-pve.css" />
diff --git a/PVE/ExtJSIndex6.pm b/PVE/ExtJSIndex6.pm
index a49c4d7c524c111bc9145887de1b223547939aea..fde27cd5a873ccbc2a530ea8ee9aa7b5084d1356 100644 (file)
--- a/PVE/ExtJSIndex6.pm
+++ b/PVE/ExtJSIndex6.pm
@@ -7,7 +7,7 @@ use strict;
 use warnings;
 
 sub get_index {
-    my ($lang, $username, $csrftoken, $console) = @_;
+    my ($lang, $username, $csrftoken, $console, $nodename) = @_;
 
     my $manager_source_dir = '/usr/share/pve-manager/manager6/';
 
@@ -21,7 +21,7 @@ sub get_index {
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Proxmox Virtual Environment</title>
+    <title>$nodename - Proxmox Virtual Environment</title>
     <link rel="stylesheet" type="text/css" href="/pve2/ext6/theme-triton/resources/theme-triton-all.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/css/ext-pve.css" />
     <script type="text/javascript" src="/pve2/ext6/ext-all-debug.js"></script>
diff --git a/PVE/NoVncIndex.pm b/PVE/NoVncIndex.pm
index d17a003a23820b7f70896ddc6c5d60b2efa4bff1..2869c2a406c8e04219b3e7b0929e08924901232c 100644 (file)
--- a/PVE/NoVncIndex.pm
+++ b/PVE/NoVncIndex.pm
@@ -4,13 +4,13 @@ use strict;
 use warnings;
 
 sub get_index {
-    my ($lang, $username, $csrftoken, $console) = @_;
+    my ($lang, $username, $csrftoken, $console, $nodename) = @_;
 
     my $page = <<_EOD;
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Proxmox Console</title>
+    <title>$nodename - Proxmox Console</title>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <!-- Apple iOS Safari settings -->
diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index c7a3eba327bc1ed3a3f7e3fdde2b7c5389b790d8..a4080a0a519de80162566de77ab0945e12fc92c2 100755 (executable)
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -117,7 +117,7 @@ sub init {
        },
        # Note: there is no authentication for those pages and dirs!
        pages => {
-           '/' => \&get_index,
+           '/' => sub { get_index($self->{nodename}, @_) },
            # avoid authentication when accessing favicon
            '/favicon.ico' => {
                file => '/usr/share/pve-manager/images/favicon.ico',
@@ -171,7 +171,7 @@ sub is_phone {
 # so we must be very careful here
 
 sub get_index {
-    my ($server, $r, $args) = @_;
+    my ($nodename, $server, $r, $args) = @_;
 
     my $lang = 'en';
     my $username;
@@ -205,13 +205,13 @@ sub get_index {
     my $page;
 
     if (defined($args->{console}) && $args->{novnc}) {
-       $page = PVE::NoVncIndex::get_index($lang, $username, $token, $args->{console});
+       $page = PVE::NoVncIndex::get_index($lang, $username, $token, $args->{console}, $nodename);
     } elsif ($mobile) {
-       $page = PVE::TouchIndex::get_index($lang, $username, $token, $args->{console});
+       $page = PVE::TouchIndex::get_index($lang, $username, $token, $args->{console}, $nodename);
     } elsif ($ext6 && $ext6_dir_exists) {
-       $page = PVE::ExtJSIndex6::get_index($lang, $username, $token, $args->{console});
+       $page = PVE::ExtJSIndex6::get_index($lang, $username, $token, $args->{console}, $nodename);
     } else {
-       $page = PVE::ExtJSIndex::get_index($lang, $username, $token, $args->{console});
+       $page = PVE::ExtJSIndex::get_index($lang, $username, $token, $args->{console}, $nodename);
     }
     my $headers = HTTP::Headers->new(Content_Type => "text/html; charset=utf-8");
     my $resp = HTTP::Response->new(200, "OK", $headers, $page);
diff --git a/PVE/TouchIndex.pm b/PVE/TouchIndex.pm
index 9679c466f8a708600903013db96c52203a90e943..a83c30a746456e07da27c6f8f9ebcdf42127cdeb 100644 (file)
--- a/PVE/TouchIndex.pm
+++ b/PVE/TouchIndex.pm
@@ -4,14 +4,14 @@ use strict;
 use warnings;
 
 sub get_index {
-    my ($lang, $username, $csrftoken, $console) = @_;
+    my ($lang, $username, $csrftoken, $console, $nodename) = @_;
 
     my $page = <<_EOD;
 <!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Proxmox Virtual Environment</title>
+    <title>$nodename - Proxmox Virtual Environment</title>
  
     <link rel="stylesheet" type="text/css" href="/pve2/touch/resources/css/sencha-touch.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/touch/resources/css/pve.css" />
diff --git a/www/manager/Workspace.js b/www/manager/Workspace.js
index 2606fb934f7ed1e1c6fbea8c72d5ab1133686991..7233f6fba435e408d455fd6c6ae4538549a68e67 100644 (file)
--- a/www/manager/Workspace.js
+++ b/www/manager/Workspace.js
@@ -65,8 +65,6 @@ Ext.define('PVE.Workspace', {
            }
        });
 
-       document.title = me.title;
-
        me.callParent();
 
         if (!PVE.Utils.authOK()) {
diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js
index a807b419a1936965436a33dd2ca79912d6cbc664..c8c4cb665fb55166af14d5b3fe24a02b7d3546de 100644 (file)
--- a/www/manager6/Workspace.js
+++ b/www/manager6/Workspace.js
@@ -65,8 +65,6 @@ Ext.define('PVE.Workspace', {
            }
        });
 
-       document.title = me.title;
-
        me.callParent();
 
         if (!PVE.Utils.authOK()) {
The Proxmox VE Management API and Web UI