Fix Qemu summary view:

* replace scrollable with autoScroll and move to prototype body
* use 'activate' to load store on F5
* do not set a height on the StatusView component: it hides some rows,
and the framework sets a good working default height
* replace deprecated 'rows' parameter in textareafield with
height in pixels

diff --git a/www/manager6/panel/NotesView.js b/www/manager6/panel/NotesView.js
index add9e5e30786ae65cf7326f81f1f70dd8e8a6ea9..54593d13eae1ac6dc7f396026ae0e70f8ed1d990 100644 (file)
--- a/www/manager6/panel/NotesView.js
+++ b/www/manager6/panel/NotesView.js
@@ -1,6 +1,12 @@
 Ext.define('PVE.panel.NotesView', {
     extend: 'Ext.panel.Panel',
 
+    title: gettext("Notes"),
+    style: 'padding-left:10px',
+    bodyStyle: 'white-space:pre',
+    bodyPadding: 10,
+    scrollable: true,
+
     load: function() {
        var me = this;
        
@@ -42,11 +48,6 @@ Ext.define('PVE.panel.NotesView', {
        }
 
        Ext.apply(me, {
-           title: gettext("Notes"),
-           style: 'padding-left:10px',
-           bodyStyle: 'white-space:pre',
-           bodyPadding: 10,
-           autoScroll: true,
            listeners: {
                render: function(c) {
                    c.el.on('dblclick', function() { 

diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js
index 4a094c74a896af94010b9f297a0127ed2b1144f7..1d666214515004fc78e8bb5d1b988d88ac35ecf4 100644 (file)
--- a/www/manager6/qemu/Config.js
+++ b/www/manager6/qemu/Config.js
@@ -132,10 +132,8 @@ Ext.define('PVE.qemu.Config', {
            defaults: { statusStore: me.statusStore },
            items: [
                {
-                   title: gettext('SummaryTODO'),
-                   xtype: 'panel',
-//                 title: gettext('Summary'),
-//                 xtype: 'pveQemuSummary',
+                   title: gettext('Summary'),
+                   xtype: 'pveQemuSummary',
                    itemId: 'summary'
                } ]
        });

diff --git a/www/manager6/qemu/StatusView.js b/www/manager6/qemu/StatusView.js
index ce224e5799ee283e97513ca4cb18a9ea82e48013..5cac29630eabde59e3bfd61d6745fe3444760d53 100644 (file)
--- a/www/manager6/qemu/StatusView.js
+++ b/www/manager6/qemu/StatusView.js
@@ -52,7 +52,6 @@ Ext.define('PVE.qemu.StatusView', {
 
        Ext.applyIf(me, {
            cwidth1: 150,
-           height: 166,
            rows: rows
        });
 

diff --git a/www/manager6/qemu/Summary.js b/www/manager6/qemu/Summary.js
index 273ba94c391bbd3b57449af7000b7e48caae40be..a71b4fd06a001325dbd13b75abcb1657515a710b 100644 (file)
--- a/www/manager6/qemu/Summary.js
+++ b/www/manager6/qemu/Summary.js
@@ -2,6 +2,14 @@ Ext.define('PVE.qemu.Summary', {
     extend: 'Ext.panel.Panel',
     alias: 'widget.pveQemuSummary',
 
+    tbar: [ '->', { xtype: 'pveRRDTypeSelector' } ],
+    scrollable: true,
+    bodyStyle: 'padding:10px',
+    defaults: {
+       style: 'padding-top:10px',
+       width: 800
+    },
+
     initComponent: function() {
         var me = this;
 
@@ -40,13 +48,6 @@ Ext.define('PVE.qemu.Summary', {
        });
 
        Ext.apply(me, {
-           tbar: [ '->', { xtype: 'pveRRDTypeSelector' } ],
-           autoScroll: true,
-           bodyStyle: 'padding:10px',
-           defaults: {
-               style: 'padding-top:10px',
-               width: 800
-           },          
            items: [
                {
                    style: 'padding-top:0px',
@@ -88,7 +89,7 @@ Ext.define('PVE.qemu.Summary', {
            ]
        });
 
-       me.on('show', function() {
+       me.on('activate', function() {
            notesview.load();
        });
 

diff --git a/www/manager6/window/NotesEdit.js b/www/manager6/window/NotesEdit.js
index 650b196b1f7cfae7c6411d126188137f6d0fea52..9212ae489c1fa34574e9f195553c9be9d0238909 100644 (file)
--- a/www/manager6/window/NotesEdit.js
+++ b/www/manager6/window/NotesEdit.js
@@ -11,7 +11,7 @@ Ext.define('PVE.window.NotesEdit', {
            items: {
                xtype: 'textarea',
                name: 'description',
-               rows: 7,
+               height: 200,
                value: '',
                hideLabel: true
            }