[pve-devel] r5911 - pve-manager/pve2/www/new/qemu

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-05-05 11:57:07 +0200 (Thu, 05 May 2011)
New Revision: 5911

Modified:
   pve-manager/pve2/www/new/qemu/CreateWizard.js
Log:
improve wizard


Modified: pve-manager/pve2/www/new/qemu/CreateWizard.js
===================================================================
--- pve-manager/pve2/www/new/qemu/CreateWizard.js	2011-05-05 09:22:49 UTC (rev 5910)
+++ pve-manager/pve2/www/new/qemu/CreateWizard.js	2011-05-05 09:57:07 UTC (rev 5911)
@@ -27,6 +27,15 @@
 	    ]
         });
 
+	diskFormatStore = Ext.create('Ext.data.ArrayStore', {
+            fields: ['key'],
+            data : [ 
+		['raw'], 
+		['qcow2'],
+		['vmdk']
+	    ]
+        });
+
 	var nextvmid = PVE.data.ResourceStore.findNextVMID();
 
 	var cdfilesel = Ext.create('PVE.form.FileSelector', {
@@ -58,7 +67,7 @@
 	    title: 'Create new virtual machine',
 	    items: [
 		{
-		    title: 'Name',
+		    title: 'General',
 		    items: [
 			{
 			    xtype: 'PVE.form.NodeSelector',
@@ -197,6 +206,45 @@
 		    ]
 		},
 		{
+		    title: 'Harddisk',
+		    items: [
+			hdstoragesel,
+			{
+			    xtype: 'numberfield',
+			    name: 'disksize',
+			    minValue: 1,
+			    maxValue: 128*1024,
+			    value: 32,
+			    fieldLabel: 'Disk size (GB)',
+			    allowBlank: false
+			},
+			{
+			    xtype: 'combobox',
+			    name: 'disktype',
+			    fieldLabel: 'Controller',
+			    store: diskTypeStore,
+			    queryMode: 'local',
+			    editable: false,
+			    value: 'IDE',
+			    displayField: 'key',
+			    valueField: 'key',
+			    allowBlank: false
+			},
+			{
+			    xtype: 'combobox',
+			    name: 'diskformat',
+			    fieldLabel: 'Image format',
+			    store: diskFormatStore,
+			    queryMode: 'local',
+			    editable: false,
+			    value: 'raw',
+			    displayField: 'key',
+			    valueField: 'key',
+			    allowBlank: false
+			}
+		    ]
+		},	
+		{
 		    title: 'CPU',
 		    items: [
 			{
@@ -235,33 +283,6 @@
 		    ]
 		},
 		{
-		    title: 'Harddisk',
-		    items: [
-			hdstoragesel,
-			{
-			    xtype: 'numberfield',
-			    name: 'disksize',
-			    minValue: 1,
-			    maxValue: 128*1024,
-			    value: 32,
-			    fieldLabel: 'Disk size (GB)',
-			    allowBlank: false
-			},
-			{
-			    xtype: 'combobox',
-			    name: 'disktype',
-			    fieldLabel: 'Controller',
-			    store: diskTypeStore,
-			    queryMode: 'local',
-			    editable: false,
-			    value: 'IDE',
-			    displayField: 'key',
-			    valueField: 'key',
-			    allowBlank: false
-			},
-		    ]
-		},	
-		{
 		    title: 'Network',
 		    items: [
 			{
@@ -287,8 +308,8 @@
 			    xtype: 'textfield',
 			    name: 'mac',
 			    fieldLabel: 'MAC address',
-			    value: 'auto',
-			    allowBlank: false
+			    allowBlank: true,
+			    emptyText: 'auto'
 			}
 		    ]
 		},