[pve-devel] [PATCH manager v2 11/11] wizard: merge CD/DVD and OS panels

[Thomas Lamprecht]

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 at proxmox.com>
---

changes v1 -> v2:
 * move flex setting to defaults of parent container


 www/manager6/qemu/CDEdit.js       |  6 +-----
 www/manager6/qemu/CreateWizard.js | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js
index 51921b8d..aa359dc6 100644
--- 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 c3e2fc8a..954b8ef0 100644
--- 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',
-- 
2.11.0