ui: fix Guest Summary Notes height

[pve-manager.git] / www / manager6 / panel / GuestStatusView.js

diff --git a/www/manager6/panel/GuestStatusView.js b/www/manager6/panel/GuestStatusView.js
index 250a93a76f46a78157f52d2d9c6b6a892d4050a6..8db1f492c37330f81648170bdb4b8fa5a9169135 100644 (file)
--- a/www/manager6/panel/GuestStatusView.js
+++ b/www/manager6/panel/GuestStatusView.js
@@ -1,67 +1,99 @@
 Ext.define('PVE.panel.GuestStatusView', {
-    extend: 'PVE.panel.StatusView',
+    extend: 'Proxmox.panel.StatusView',
     alias: 'widget.pveGuestStatusView',
+    mixins: ['Proxmox.Mixin.CBind'],
 
-    height: 300,
+    cbindData: function(initialConfig) {
+       var me = this;
+       return {
+           isQemu: me.pveSelNode.data.type === 'qemu',
+           isLxc: me.pveSelNode.data.type === 'lxc',
+       };
+    },
+
+    layout: {
+       type: 'vbox',
+       align: 'stretch',
+    },
 
     defaults: {
-       xtype: 'pveInfoWidget',
-       padding: '0 30 5 30',
-       // parent panel is 400 wide
-       // minus 2 pixels for the border
-       width: 398
+       xtype: 'pmxInfoWidget',
+       padding: '2 25',
     },
     items: [
        {
            xtype: 'box',
-           height: 30
+           height: 20,
        },
        {
            itemId: 'status',
            title: gettext('Status'),
+           iconCls: 'fa fa-info fa-fw',
            printBar: false,
-           textField: 'status'
+           multiField: true,
+           renderer: function(record) {
+               var me = this;
+               var text = record.data.status;
+               var qmpstatus = record.data.qmpstatus;
+               if (qmpstatus && qmpstatus !== record.data.status) {
+                   text += ' (' + qmpstatus + ')';
+               }
+               return text;
+           },
        },
        {
            itemId: 'hamanaged',
+           iconCls: 'fa fa-heartbeat fa-fw',
            title: gettext('HA State'),
            printBar: false,
            textField: 'ha',
-           renderer: PVE.Utils.format_ha
+           renderer: PVE.Utils.format_ha,
        },
        {
            itemId: 'node',
+           iconCls: 'fa fa-building fa-fw',
            title: gettext('Node'),
-           printBar: false
+           cbind: {
+               text: '{pveSelNode.data.node}',
+           },
+           printBar: false,
        },
        {
            xtype: 'box',
-           height: 20
+           height: 15,
        },
        {
            itemId: 'cpu',
+           iconCls: 'fa fa-fw pmx-itype-icon-processor pmx-icon',
            title: gettext('CPU usage'),
            valueField: 'cpu',
            maxField: 'cpus',
-           renderer: PVE.Utils.render_cpu_usage,
+           renderer: Proxmox.Utils.render_cpu_usage,
            // in this specific api call
            // we already have the correct value for the usage
-           calculate: Ext.identityFn
+           calculate: Ext.identityFn,
        },
        {
            itemId: 'memory',
+           iconCls: 'fa fa-fw pmx-itype-icon-memory pmx-icon',
            title: gettext('Memory usage'),
            valueField: 'mem',
-           maxField: 'maxmem'
+           maxField: 'maxmem',
        },
        {
            itemId: 'swap',
+           iconCls: 'fa fa-refresh fa-fw',
            title: gettext('SWAP usage'),
            valueField: 'swap',
-           maxField: 'maxswap'
+           maxField: 'maxswap',
+           cbind: {
+               hidden: '{isQemu}',
+               disabled: '{isQemu}',
+           },
        },
        {
            itemId: 'rootfs',
+           iconCls: 'fa fa-hdd-o fa-fw',
            title: gettext('Bootdisk size'),
            valueField: 'disk',
            maxField: 'maxdisk',
@@ -70,12 +102,26 @@ Ext.define('PVE.panel.GuestStatusView', {
                var me = this;
                me.setPrintBar(used > 0);
                if (used === 0) {
-                   return PVE.Utils.render_size(max);
+                   return Proxmox.Utils.render_size(max);
                } else {
-                   return PVE.Utils.render_size_usage(used,max);
+                   return Proxmox.Utils.render_size_usage(used, max);
                }
-           }
-       }
+           },
+       },
+       {
+           xtype: 'box',
+           height: 15,
+       },
+       {
+           itemId: 'ips',
+           xtype: 'pveAgentIPView',
+           cbind: {
+               rstore: '{rstore}',
+               pveSelNode: '{pveSelNode}',
+               hidden: '{isLxc}',
+               disabled: '{isLxc}',
+           },
+       },
     ],
 
     updateTitle: function() {
@@ -90,14 +136,4 @@ Ext.define('PVE.panel.GuestStatusView', {
 
        me.setTitle(me.getRecordValue('name') + text);
     },
-
-    initComponent: function() {
-       var me = this;
-
-       me.callParent();
-       if (me.pveSelNode.data.type !== 'lxc') {
-           me.remove(me.getComponent('swap'));
-       }
-       me.getComponent('node').updateValue(me.pveSelNode.data.node);
-    }
 });