diff --git a/module/zanode/ui/create.html.php b/module/zanode/ui/create.html.php
index ade04318d8..e07ce7b184 100644
--- a/module/zanode/ui/create.html.php
+++ b/module/zanode/ui/create.html.php
@@ -37,37 +37,40 @@ formPanel
setClass('text-gray')
)
)),
- formGroup
- (
- set::label($lang->zahost->type),
- set::width('1/2'),
- set::control('static'),
- picker
- (
- set::name('hostType'),
- set::value('node'),
- set::items($lang->zanode->typeList),
- set::required(true),
- on::change('onChangeType')
- )
- ),
- formRow
+ $hiddenHost ? array(formHidden('hostType', 'physics'), formHidden('parent', 0)) : array
(
formGroup
(
- set::name('parent'),
- set::label($lang->zanode->hostName),
- set::items($hostPairs),
- set::value($hostID),
+ set::label($lang->zahost->type),
set::width('1/2'),
- on::change('onHostChange')
+ set::control('static'),
+ picker
+ (
+ set::name('hostType'),
+ set::value('node'),
+ set::items($lang->zanode->typeList),
+ set::required(true),
+ on::change('onChangeType')
+ )
),
- a
+ formRow
(
- set::href(createLink('zahost', 'create')),
- $lang->zahost->create,
- setData(array('toggle' => 'modal')),
- setClass('leading-8 ml-2')
+ formGroup
+ (
+ set::name('parent'),
+ set::label($lang->zanode->hostName),
+ set::items($hostPairs),
+ set::value($hostID),
+ set::width('1/2'),
+ on::change('onHostChange')
+ ),
+ a
+ (
+ set::href(createLink('zahost', 'create')),
+ $lang->zahost->create,
+ setData(array('toggle' => 'modal')),
+ setClass('leading-8 ml-2')
+ )
)
),
formGroup
@@ -79,7 +82,7 @@ formPanel
),
formRow
(
- setClass('hidden'),
+ $hiddenHost ? null : setClass('hidden'),
formGroup
(
set::name('extranet'),
@@ -88,74 +91,77 @@ formPanel
set::width('1/2')
)
),
- formGroup
- (
- set::name('image'),
- set::label($lang->zanode->image),
- set::items(array()),
- set::width('1/2'),
- on::change('onImageChange')
- ),
- formGroup
- (
- set::label($lang->zanode->cpuCores),
- set::width('1/2'),
- set::control('static'),
- picker
- (
- set::name('cpuCores'),
- set::items($config->zanode->os->cpuCores),
- set::required(true)
- )
- ),
- formRow
+ $hiddenHost ? array(formHidden('image', 0), formHidden('cpuCores', 0), formHidden('memory', 0), formHidden('diskSize', 0)) : array
(
formGroup
(
- set::label($lang->zanode->memory),
- set::required(true),
+ set::name('image'),
+ set::label($lang->zanode->image),
+ set::items(array()),
set::width('1/2'),
- inputGroup
- (
- input
- (
- set::name('memory')
- ),
- 'GB'
- )
- )
- ),
- formRow
- (
+ on::change('onImageChange')
+ ),
formGroup
(
- set::label($lang->zanode->diskSize),
+ set::label($lang->zanode->cpuCores),
set::width('1/2'),
- inputGroup
+ set::control('static'),
+ picker
(
- input
- (
- set::name('diskSize')
- ),
- 'GB'
+ set::name('cpuCores'),
+ set::items($config->zanode->os->cpuCores),
+ set::required(true)
)
- )
- ),
- formRow
- (
- formGroup
+ ),
+ formRow
(
- set::name('osName'),
- set::label($lang->zanode->osName),
- set::required(true),
- set::readonly(true),
- set::width('1/2')
+ formGroup
+ (
+ set::label($lang->zanode->memory),
+ set::required(true),
+ set::width('1/2'),
+ inputGroup
+ (
+ input
+ (
+ set::name('memory')
+ ),
+ 'GB'
+ )
+ )
+ ),
+ formRow
+ (
+ formGroup
+ (
+ set::label($lang->zanode->diskSize),
+ set::width('1/2'),
+ inputGroup
+ (
+ input
+ (
+ set::name('diskSize')
+ ),
+ 'GB'
+ )
+ )
+ ),
+ formRow
+ (
+ formGroup
+ (
+ set::name('osName'),
+ set::label($lang->zanode->osName),
+ set::required(true),
+ set::readonly(true),
+ set::width('1/2')
+ )
)
),
formRow
(
setID('osNamePhysicsContainer'),
- setClass('hidden'),
+ $hiddenHost ? null : setClass('hidden'),
formGroup
(
setID('osNamePhysicsPre'),
diff --git a/module/zanode/ui/edit.html.php b/module/zanode/ui/edit.html.php
index 4a8ba49258..2e7e4329c6 100644
--- a/module/zanode/ui/edit.html.php
+++ b/module/zanode/ui/edit.html.php
@@ -62,47 +62,50 @@ formPanel
set::width('1/2'),
set::value($zanode->extranet)
),
- formGroup
- (
- set::label($lang->zanode->cpuCores),
- set::width('1/2'),
- set::name(''),
- set::value(zget($config->zanode->os->cpuCores, $zanode->cpuCores)),
- set::readonly(true)
- ),
- formRow
+ $hiddenHost ? array(formHidden('cpuCores', 0), formHidden('memory', 0), formHidden('diskSize', 0)) : array
(
formGroup
(
- set::label($lang->zanode->memory),
+ set::label($lang->zanode->cpuCores),
set::width('1/2'),
- inputGroup
+ set::name(''),
+ set::value(zget($config->zanode->os->cpuCores, $zanode->cpuCores)),
+ set::readonly(true)
+ ),
+ formRow
+ (
+ formGroup
(
- input
+ set::label($lang->zanode->memory),
+ set::width('1/2'),
+ inputGroup
(
- set::name('memory'),
- set::readonly(true),
- set::value($zanode->memory)
- ),
- 'GB'
+ input
+ (
+ set::name('memory'),
+ set::readonly(true),
+ set::value($zanode->memory)
+ ),
+ 'GB'
+ )
)
- )
- ),
- formRow
- (
- formGroup
+ ),
+ formRow
(
- set::label($lang->zanode->diskSize),
- set::width('1/2'),
- inputGroup
+ formGroup
(
- input
+ set::label($lang->zanode->diskSize),
+ set::width('1/2'),
+ inputGroup
(
- set::name('diskSize'),
- set::readonly(true),
- set::value($zanode->diskSize)
- ),
- 'GB'
+ input
+ (
+ set::name('diskSize'),
+ set::readonly(true),
+ set::value($zanode->diskSize)
+ ),
+ 'GB'
+ )
)
)
),
diff --git a/module/zanode/ui/view.html.php b/module/zanode/ui/view.html.php
index b766146992..87e5e26087 100644
--- a/module/zanode/ui/view.html.php
+++ b/module/zanode/ui/view.html.php
@@ -92,7 +92,7 @@ if($zanode->hostType == 'physics')
)
)
);
- $baseInfo[] = div
+ $hiddenHost || $zanode->cpuCores == 0 ? null : $baseInfo[] = div
(
setClass('w-1/6'),
span
@@ -108,7 +108,7 @@ if($zanode->hostType == 'physics')
);
$baseInfo[] = div
(
- setClass('w-1/3 mt-4'),
+ $hiddenHost || $zanode->cpuCores == 0 ? setClass('w-1/6') : setClass('w-1/3 mt-2'),
span
(
setClass('text-gray'),
@@ -120,7 +120,7 @@ if($zanode->hostType == 'physics')
zget($lang->zanode->statusList, $zanode->status)
)
);
- $baseInfo[] = div
+ $hiddenHost || $zanode->memory == 0 ? null : $baseInfo[] = div
(
setClass('w-1/2 mt-4'),
span
@@ -134,7 +134,7 @@ if($zanode->hostType == 'physics')
$zanode->memory . 'GB'
)
);
- $baseInfo[] = div
+ $hiddenHost || $zanode->diskSize == 0 ? null : $baseInfo[] = div
(
setClass('w-1/6 mt-4'),
span