wizard: merge CD/DVD and OS panels

We had a single column for the CD/DVD panel, fill the second column
with the now in size reduced OS type selector, as ISO selection and
OS type selection are tied together.

Reduces steps needed for creating a VM.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js
index 51921b8dfc8f53230f35c6c9a8e24688637d29df..aa359dc6860b57fbc01546fc16b8f687503a3b2b 100644 (file)
--- a/www/manager6/qemu/CDEdit.js
+++ b/www/manager6/qemu/CDEdit.js
@@ -135,11 +135,7 @@ Ext.define('PVE.qemu.CDInputPanel', {
            boxLabel: gettext('Do not use any media')
        });
 
-       if (me.insideWizard) {
-           me.column1 = items;
-       } else {
-           me.items = items;
-       }
+       me.items = items;
 
        me.callParent();
     }

diff --git a/www/manager6/qemu/CreateWizard.js b/www/manager6/qemu/CreateWizard.js
index c3e2fc8a056ade4aae565bc8e99241358984ceb7..954b8ef0e6537e8a9204d70c05ac73c48dea0e75 100644 (file)
--- a/www/manager6/qemu/CreateWizard.js
+++ b/www/manager6/qemu/CreateWizard.js
@@ -86,19 +86,25 @@ Ext.define('PVE.qemu.CreateWizard', {
                    }
                },
                {
-                   xtype: 'pveQemuCDInputPanel',
-                   reference: 'cdpanel',
-                   title: gettext('CD/DVD'),
-                   confid: 'ide2',
-                   fieldDefaults: {
-                       labelWidth: 160
+                   xtype: 'container',
+                   layout: 'hbox',
+                   defaults: {
+                       flex: 1,
+                       padding: '0 10'
                    },
-                   insideWizard: true
-               },
-               {
                    title: gettext('OS'),
-                   xtype: 'pveQemuOSTypePanel',
-                   insideWizard: true
+                   items: [
+                       {
+                           xtype: 'pveQemuCDInputPanel',
+                           reference: 'cdpanel',
+                           confid: 'ide2',
+                           insideWizard: true
+                       },
+                       {
+                           xtype: 'pveQemuOSTypePanel',
+                           insideWizard: true
+                       }
+                   ]
                },
                {
                    xtype: 'pveQemuHDInputPanel',