Commit fcbe81f1 authored by Dietmar Maurer's avatar Dietmar Maurer

update LXC GUI (support new rootfs and size parameter).

parent 5d4a615b
...@@ -97,7 +97,6 @@ Ext.define('PVE.lxc.CreateWizard', { ...@@ -97,7 +97,6 @@ Ext.define('PVE.lxc.CreateWizard', {
value: '', value: '',
allowBlank: true allowBlank: true
}, },
storagesel,
{ {
xtype: 'textfield', xtype: 'textfield',
inputType: 'password', inputType: 'password',
...@@ -142,6 +141,24 @@ Ext.define('PVE.lxc.CreateWizard', { ...@@ -142,6 +141,24 @@ Ext.define('PVE.lxc.CreateWizard', {
title: gettext('Template'), title: gettext('Template'),
column1: [ tmplstoragesel, tmplsel] 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', xtype: 'pveLxcResourceInputPanel',
title: gettext('Resources'), title: gettext('Resources'),
......
...@@ -43,12 +43,16 @@ Ext.define('PVE.lxc.Options', { ...@@ -43,12 +43,16 @@ Ext.define('PVE.lxc.Options', {
editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] ? editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] ?
'PVE.qemu.StartupEdit' : undefined 'PVE.qemu.StartupEdit' : undefined
}, },
ostemplate: { ostype: {
header: gettext('Template'), header: gettext('OS Type'),
defaultValue: 'no set' defaultValue: 'no set'
}, },
storage: { arch: {
header: gettext('Storage'), header: gettext('Architecture'),
defaultValue: 'no set'
},
rootfs: {
header: gettext('Root Disk'),
defaultValue: 'no set' defaultValue: 'no set'
} }
}; };
......
...@@ -35,18 +35,6 @@ Ext.define('PVE.lxc.RessourceInputPanel', { ...@@ -35,18 +35,6 @@ Ext.define('PVE.lxc.RessourceInputPanel', {
]; ];
me.column2 = [ 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', xtype: 'numberfield',
name: 'cpulimit', name: 'cpulimit',
...@@ -147,14 +135,6 @@ Ext.define('PVE.lxc.RessourceView', { ...@@ -147,14 +135,6 @@ Ext.define('PVE.lxc.RessourceView', {
never_delete: true, never_delete: true,
editor: resEditor, editor: resEditor,
defaultValue: 1024 defaultValue: 1024
},
disk: {
header: gettext('Disk size'),
editor: resEditor,
never_delete: true,
renderer: function(value) {
return PVE.Utils.format_size(value*1024*1024*1024);
}
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment