[pve-devel] [PATCH manager v2] add eol notice

Dominik Csapak d.csapak at proxmox.com
Tue May 29 14:16:32 CEST 2018


since pve 4.4 goes out of support in june, add a notice at the top with
a link to the faq, where the EOL dates are

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
changes from v1:
* removed the githash to save space
* shortened the message to save space
* moved the message after the search box
* added tooltip

i left the icon as 2x because otherwise the text does not wrap correctly
also, i left the color 'critical' because the yellow 'warning'
has a bad contrast on the grey background

 www/css/ext6-pve.css      |  7 +++++++
 www/manager6/Workspace.js | 20 ++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/www/css/ext6-pve.css b/www/css/ext6-pve.css
index f42e935e..0114604f 100644
--- a/www/css/ext6-pve.css
+++ b/www/css/ext6-pve.css
@@ -517,3 +517,10 @@ table.osds td:first-of-type {
 .x-webkit :not(.x-form-textarea-body) > .x-form-trigger-wrap {
     height: initial;
 }
+
+.eolicon {
+    position: relative;
+    top: 4px;
+    float: left;
+    margin-right: 5px;
+}
diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js
index d5e7d718..1ddf2414 100644
--- a/www/manager6/Workspace.js
+++ b/www/manager6/Workspace.js
@@ -185,9 +185,8 @@ Ext.define('PVE.StdWorkspace', {
 	var ui = me.query('#versioninfo')[0];
 
 	if (PVE.VersionInfo) {
-	    var version = PVE.VersionInfo.version + '-' + PVE.VersionInfo.release + '/' +
-		PVE.VersionInfo.repoid;
-	    ui.update('Virtual Environment ' + version);
+	    var version = PVE.VersionInfo.version + '-' + PVE.VersionInfo.release;
+	    ui.update('Virtual Environment ' + version );
 	} else {
 	    ui.update('Virtual Environment');
 	}
@@ -303,7 +302,6 @@ Ext.define('PVE.StdWorkspace', {
 				'<img style="padding-top:4px;padding-right:5px" src="/pve2/images/proxmox_logo.png"/></a>'
 			},
 			{
-			    minWidth: 200,
 			    id: 'versioninfo',
 			    html: 'Virtual Environment'
 			},
@@ -315,6 +313,20 @@ Ext.define('PVE.StdWorkspace', {
 			    flex: 1
 			},
 			{
+			    id: 'eolannouncement',
+			    padding: '0 0 0 15',
+			    html: '<a href="https://pve.proxmox.com/wiki/FAQ#faq-support-table" target="_blank">'+
+				    '<i class="fa fa-2x eolicon critical fa-exclamation-triangle"></i> ' +
+				    'Support for 4.4 ends<br />on 30.06.2018</a>',
+			    autoEl: {
+				tag: 'div',
+				'data-qtip': gettext("You won't get any security fixes after the EOL date, Please consider upgrading.")
+			    }
+			},
+			{
+			    flex: 1
+			},
+			{
 			    pack: 'end',
 			    id: 'userinfo',
 			    stateful: false
-- 
2.11.0




More information about the pve-devel mailing list