From 5af09e2471c78abea98617b1e0f0059867060949 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 5 Aug 2015 08:49:47 +0200
Subject: [PATCH] update LXC GUI (support new rootfs and size parameter).

---
 www/manager/lxc/CreateWizard.js | 19 ++++++++++++++++++-
 www/manager/lxc/Options.js      | 12 ++++++++----
 www/manager/lxc/Resources.js    | 20 --------------------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/www/manager/lxc/CreateWizard.js b/www/manager/lxc/CreateWizard.js
index 55067318c..d0373167a 100644
--- a/www/manager/lxc/CreateWizard.js
+++ b/www/manager/lxc/CreateWizard.js
@@ -97,7 +97,6 @@ Ext.define('PVE.lxc.CreateWizard', {
 			    value: '',
 			    allowBlank: true
 			},
-			storagesel,
 			{
 			    xtype: 'textfield',
 			    inputType: 'password',
@@ -142,6 +141,24 @@ Ext.define('PVE.lxc.CreateWizard', {
 		    title: gettext('Template'),
 		    column1: [ tmplstoragesel, tmplsel]
 		},
+		{
+		    xtype: 'inputpanel',
+		    title: gettext('Root Disk'),
+		    column1: [
+			storagesel,
+			{
+			    xtype: 'numberfield',
+			    name: 'size',
+			    minValue: 0.1,
+			    maxValue: 128*1024,
+			    decimalPrecision: 3,
+			    value: '8',
+			    step: 1,
+			    fieldLabel: gettext('Disk size') + ' (GB)',
+			    allowBlank: false
+			}
+		    ]
+		},
 		{
 		    xtype: 'pveLxcResourceInputPanel',
 		    title: gettext('Resources'),
diff --git a/www/manager/lxc/Options.js b/www/manager/lxc/Options.js
index c133e9cc3..9afe12f4f 100644
--- a/www/manager/lxc/Options.js
+++ b/www/manager/lxc/Options.js
@@ -43,12 +43,16 @@ Ext.define('PVE.lxc.Options', {
 		editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] ? 
 		    'PVE.qemu.StartupEdit' : undefined
 	    },
-	    ostemplate: {
-		header: gettext('Template'),
+	    ostype: {
+		header: gettext('OS Type'),
 		defaultValue: 'no set'
 	    },
-	    storage: {
-		header: gettext('Storage'),
+	    arch: {
+		header: gettext('Architecture'),
+		defaultValue: 'no set'
+	    },
+	    rootfs: {
+		header: gettext('Root Disk'),
 		defaultValue: 'no set'
 	    }
 	};
diff --git a/www/manager/lxc/Resources.js b/www/manager/lxc/Resources.js
index 3752d92e1..a8f1d9d20 100644
--- a/www/manager/lxc/Resources.js
+++ b/www/manager/lxc/Resources.js
@@ -35,18 +35,6 @@ Ext.define('PVE.lxc.RessourceInputPanel', {
 	];
 
 	me.column2 = [
-	    {
-	     	xtype: me.insideWizard ? 'numberfield' : 'displayfield',
-	     	name: 'disk',
-	     	minValue: 0,
-	     	maxValue: 128*1024,
-	     	decimalPrecision: 3,
-	     	value: '8',
-	     	step: 1,
-	     	fieldLabel: gettext('Disk size') + ' (GB)',
-	     	labelWidth: labelWidth,
-	     	allowBlank: false
-	    },
 	    {
 		xtype: 'numberfield',
 		name: 'cpulimit',
@@ -147,14 +135,6 @@ Ext.define('PVE.lxc.RessourceView', {
 		never_delete: true,
 		editor: resEditor,
 		defaultValue: 1024
-	    },
-	    disk: {
-		header: gettext('Disk size'),
-		editor: resEditor,
-		never_delete: true,
-		renderer: function(value) {
-		    return PVE.Utils.format_size(value*1024*1024*1024);
-		}
 	    }
 	};