proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-08 03:02:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove unnecessary information on template summary

Browse Source 
since most of the information on the summary page is
irrelevant for templates (e.g. status,ha,using memory,graphs, etc),
we only show just the information which is available and helpful

since we then have the vertical space, we move the notes panel
below the statuspanel, to allow visually more space for the description
(which makes sense for a template)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2016-06-15 15:33:51 +02:00 committed by Dietmar Maurer
parent 688677441d
commit a4d292d9da
2 changed files with 119 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/manager6/qemu/StatusView.js
View File

@ -16,6 +16,8 @@ Ext.define('PVE.qemu.StatusView', {
throw "no VM ID specified";
}
var template = !!me.pveSelNode.data.template;
var render_cpu = function(value, metaData, record, rowIndex, colIndex, store) {
if (!me.getObjectValue('uptime')) {
return '-';
@ -40,10 +42,20 @@ Ext.define('PVE.qemu.StatusView', {
return text;
};
var rows = {
var rows = {};
if (template) {
rows = {
name: { header: gettext('Name'), defaultValue: 'no name specified' },
cpus: { header: gettext('Processors'), required: true},
maxmem: { header: gettext('Memory'), renderer: PVE.Utils.render_size, required: true},
maxdisk: { header: gettext('Bootdisk size'), renderer: PVE.Utils.render_size, required: true}
};
} else {
rows = {
name: { header: gettext('Name'), defaultValue: 'no name specified' },
qmpstatus: { header: gettext('Status'), defaultValue: 'unknown' },
cpu: { header: gettext('CPU usage'), required: true, renderer: render_cpu },
cpu: { iconCls: 'fa fa-up', header: gettext('CPU usage'), required: true, renderer: render_cpu },
cpus: { visible: false },
mem: { header: gettext('Memory usage'), required: true, renderer: render_mem },
maxmem: { visible: false },
@ -51,6 +63,7 @@ Ext.define('PVE.qemu.StatusView', {
uptime: { header: gettext('Uptime'), required: true, renderer: PVE.Utils.render_uptime },
ha: { header: gettext('Managed by HA'), required: true, renderer: PVE.Utils.format_ha }
};
}
Ext.applyIf(me, {
cwidth1: 150,

40
www/manager6/qemu/Summary.js
View File

@ -2,7 +2,6 @@ Ext.define('PVE.qemu.Summary', {
extend: 'Ext.panel.Panel',
alias: 'widget.pveQemuSummary',
tbar: [ '->', { xtype: 'pveRRDTypeSelector' } ],
scrollable: true,
bodyPadding: 10,
@ -27,26 +26,60 @@ Ext.define('PVE.qemu.Summary', {
throw "no status storage specified";
}
var template = !!me.pveSelNode.data.template;
var rstore = me.statusStore;
var statusview = Ext.create('PVE.qemu.StatusView', {
title: gettext('Status'),
pveSelNode: me.pveSelNode,
width: 400,
width: template ? 800 : 400,
rstore: rstore
});
var notesview = Ext.create('PVE.panel.NotesView', {
pveSelNode: me.pveSelNode,
padding: '0 0 0 10',
padding: template? '10 0 0 0' : '0 0 0 10',
flex: 1
});
if (template) {
Ext.apply(me, {
plugins: {
ptype: 'lazyitems',
items: [
{
xtype: 'container',
layout: {
type: 'column'
},
defaults: {
padding: '0 10 10 0'
},
items: [{
width: 800,
layout: {
type: 'vbox',
align: 'stretch'
},
border: false,
items: [ statusview, notesview ]
}]
}
]
},
listeners: {
activate: function() { notesview.load(); }
}
});
} else {
var rrdstore = Ext.create('PVE.data.RRDStore', {
rrdurl: "/api2/json/nodes/" + nodename + "/qemu/" + vmid + "/rrddata"
});
Ext.apply(me, {
tbar: [ '->', { xtype: 'pveRRDTypeSelector' } ],
plugins: {
ptype: 'lazyitems',
items: [
@ -109,6 +142,7 @@ Ext.define('PVE.qemu.Summary', {
destroy: rrdstore.stopUpdate
}
});
}
me.callParent();
}