diff --git a/module/zanode/ui/browse.html.php b/module/zanode/ui/browse.html.php index bd15a42c1f..6cd10c21d7 100644 --- a/module/zanode/ui/browse.html.php +++ b/module/zanode/ui/browse.html.php @@ -47,7 +47,7 @@ dtable set::sortLink(createLink('zanode', 'browse', "browseType={$browseType}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::orderBy($orderBy), set::footPager(usePager()), - set::orderBy(str_replace('t1.', '', $orderBy)), + set::orderBy(str_replace('t1.', '', $orderBy)) ); render(); diff --git a/module/zanode/ui/browsesnapshot.html.php b/module/zanode/ui/browsesnapshot.html.php index 38d1484e2e..dfe4b128d4 100644 --- a/module/zanode/ui/browsesnapshot.html.php +++ b/module/zanode/ui/browsesnapshot.html.php @@ -24,7 +24,7 @@ dtable ( set::cols($config->zanode->snapshotDtable->fieldList), set::data($snapshotList), - set::afterRender(jsRaw('window.afterRender')), + set::afterRender(jsRaw('window.afterRender')) ); render(); diff --git a/module/zanode/ui/create.html.php b/module/zanode/ui/create.html.php index 564afc898c..b12dd5ab78 100644 --- a/module/zanode/ui/create.html.php +++ b/module/zanode/ui/create.html.php @@ -28,7 +28,7 @@ formPanel set('data-type', 'white'), set('data-class-name', 'text-gray border border-light'), setClass('text-gray') - ), + ) )), formGroup ( @@ -41,7 +41,7 @@ formPanel set::value('node'), set::items($lang->zanode->typeList), set::required(true), - on::change('onChangeType'), + on::change('onChangeType') ) ), formRow @@ -53,22 +53,22 @@ formPanel set::items($hostPairs), set::value($hostID), set::width('1/2'), - on::change('onHostChange'), + on::change('onHostChange') ), a ( set::href(createLink('zahost', 'create')), $lang->zahost->create, set('data-toggle', 'modal'), - setClass('leading-8 ml-2'), - ), + setClass('leading-8 ml-2') + ) ), formGroup ( set::name('name'), set::label($lang->zanode->name), set::required(true), - set::width('1/2'), + set::width('1/2') ), formRow ( @@ -78,8 +78,8 @@ formPanel set::name('extranet'), set::label($lang->zahost->IP), set::required(true), - set::width('1/2'), - ), + set::width('1/2') + ) ), formGroup ( @@ -87,7 +87,7 @@ formPanel set::label($lang->zanode->image), set::items(array()), set::width('1/2'), - on::change('onImageChange'), + on::change('onImageChange') ), formGroup ( @@ -98,8 +98,8 @@ formPanel ( set::name('cpuCores'), set::items($config->zanode->os->cpuCores), - set::required(true), - ), + set::required(true) + ) ), formRow ( @@ -112,11 +112,11 @@ formPanel ( input ( - set::name('memory'), + set::name('memory') ), 'GB' - ), - ), + ) + ) ), formRow ( @@ -128,11 +128,11 @@ formPanel ( input ( - set::name('diskSize'), + set::name('diskSize') ), 'GB' - ), - ), + ) + ) ), formRow ( @@ -142,8 +142,8 @@ formPanel set::label($lang->zanode->osName), set::required(true), set::readonly(true), - set::width('1/2'), - ), + set::width('1/2') + ) ), formRow ( @@ -158,22 +158,22 @@ formPanel set::name('osNamePre'), set::required(true), set::width('1/4'), - on::change('onChangeSystem'), + on::change('onChangeSystem') ), formGroup ( set::name('osNamePhysics'), set::items($config->zanode->linuxList), set::width('1/4'), - set::required(true), + set::required(true) ) ), formGroup ( set::name('desc'), set::label($lang->zanode->desc), - set::control('editor'), - ), + set::control('editor') + ) ); render(); diff --git a/module/zanode/ui/createimage.html.php b/module/zanode/ui/createimage.html.php index ea7c07c75b..36e9b83f06 100644 --- a/module/zanode/ui/createimage.html.php +++ b/module/zanode/ui/createimage.html.php @@ -29,13 +29,13 @@ if($task) modalHeader(set::title($lang->zanode->createImage)); formGroup ( set::name('name'), - set::label($lang->zanode->imageName), + set::label($lang->zanode->imageName) ), formGroup ( set::name('desc'), set::label($lang->zanode->desc), - set::control('editor'), + set::control('editor') ) ) : h::div ( @@ -50,8 +50,8 @@ if($task) modalHeader(set::title($lang->zanode->createImage)); div ( setClass('progress-bar primary'), - setStyle('width', $task->rate), - ), + setStyle('width', $task->rate) + ) ), h6 ( @@ -62,14 +62,14 @@ if($task) modalHeader(set::title($lang->zanode->createImage)); setStyle('color', '#2e7fff'), set::target('_parent'), set::href($link), - $lang->zanode->createImageButton, - ), + $lang->zanode->createImageButton + ) ), h6 ( setClass('text-center fail hidden'), $lang->zanode->createImageFail - ), + ) ); render(); diff --git a/module/zanode/ui/createsnapshot.html.php b/module/zanode/ui/createsnapshot.html.php index b0cccc9be7..8413bd1eaf 100644 --- a/module/zanode/ui/createsnapshot.html.php +++ b/module/zanode/ui/createsnapshot.html.php @@ -22,8 +22,8 @@ formPanel ( set::name('desc'), set::label($lang->zanode->desc), - set::control('textarea'), - ), + set::control('textarea') + ) ); render(); diff --git a/module/zanode/ui/edit.html.php b/module/zanode/ui/edit.html.php index 330885f1a5..4a8ba49258 100644 --- a/module/zanode/ui/edit.html.php +++ b/module/zanode/ui/edit.html.php @@ -28,7 +28,7 @@ formPanel set('data-type', 'white'), set('data-class-name', 'text-gray border border-light'), setClass('text-gray') - ), + ) )), $zanode->hostType != 'physics' ? formGroup ( @@ -36,7 +36,7 @@ formPanel set::label($lang->zanode->hostName), set::value($host->name), set::width('1/2'), - set::readonly(true), + set::readonly(true) ) : null, formGroup ( @@ -45,7 +45,7 @@ formPanel set::required(true), set::width('1/2'), set::value($zanode->name), - set::readonly($zanode->hostType != 'physics' ? true : false), + set::readonly($zanode->hostType != 'physics' ? true : false) ), $zanode->hostType != 'physics' ? formGroup ( @@ -53,14 +53,14 @@ formPanel set::label($lang->zanode->image), set::width('1/2'), set::value($image->name), - set::readonly(true), + set::readonly(true) ) : formGroup ( set::name('extranet'), set::label($lang->zahost->IP), set::readonly(true), set::width('1/2'), - set::value($zanode->extranet), + set::value($zanode->extranet) ), formGroup ( @@ -68,7 +68,7 @@ formPanel set::width('1/2'), set::name(''), set::value(zget($config->zanode->os->cpuCores, $zanode->cpuCores)), - set::readonly(true), + set::readonly(true) ), formRow ( @@ -82,11 +82,11 @@ formPanel ( set::name('memory'), set::readonly(true), - set::value($zanode->memory), + set::value($zanode->memory) ), 'GB' - ), - ), + ) + ) ), formRow ( @@ -100,11 +100,11 @@ formPanel ( set::name('diskSize'), set::readonly(true), - set::value($zanode->diskSize), + set::value($zanode->diskSize) ), 'GB' - ), - ), + ) + ) ), formRow ( @@ -114,8 +114,8 @@ formPanel set::label($lang->zanode->osName), set::readonly(true), set::width('1/2'), - set::value($zanode->hostType != 'physics' ? $zanode->osName : zget($config->zanode->linuxList, $zanode->osName, zget($config->zanode->windowsList, $zanode->osName))), - ), + set::value($zanode->hostType != 'physics' ? $zanode->osName : zget($config->zanode->linuxList, $zanode->osName, zget($config->zanode->windowsList, $zanode->osName))) + ) ), formGroup ( @@ -123,9 +123,9 @@ formPanel editor ( set::name('desc'), - html($zanode->desc), - ), - ), + html($zanode->desc) + ) + ) ); render(); diff --git a/module/zanode/ui/editsnapshot.html.php b/module/zanode/ui/editsnapshot.html.php index 27cf2cccac..0b5d63641b 100644 --- a/module/zanode/ui/editsnapshot.html.php +++ b/module/zanode/ui/editsnapshot.html.php @@ -25,7 +25,7 @@ formPanel set::label($lang->zanode->desc), set::control('textarea'), set::value($snapshot->desc) - ), + ) ); render(); diff --git a/module/zanode/ui/nodelist.html.php b/module/zanode/ui/nodelist.html.php index 3dbbbdd345..648214d981 100644 --- a/module/zanode/ui/nodelist.html.php +++ b/module/zanode/ui/nodelist.html.php @@ -30,7 +30,7 @@ to::header(''); dtable ( set::cols($fieldList), - set::data($nodeList), + set::data($nodeList) ); render(); diff --git a/module/zanode/ui/view.html.php b/module/zanode/ui/view.html.php index 2470eeec1e..4db6143b10 100644 --- a/module/zanode/ui/view.html.php +++ b/module/zanode/ui/view.html.php @@ -80,9 +80,9 @@ if($zanode->hostType == 'physics') ( setClass('icon-common-copy icon-copy'), set::title($lang->zanode->copy), - set::name(''), + set::name('') ), - on::click('sshCopy'), + on::click('sshCopy') ) : null, h::textarea ( @@ -184,7 +184,7 @@ else ( setClass('icon-common-copy icon-copy'), set::title($lang->zanode->copy), - set::name(''), + set::name('') ), on::click('sshCopy') ) : null, @@ -289,7 +289,7 @@ else ( setClass('icon-common-copy icon-copy'), set::title($lang->zanode->copy), - set::name(''), + set::name('') ), on::click('pwdCopy') ), @@ -300,9 +300,9 @@ else ( setClass('icon-common-eye icon-eye'), set::title($lang->zanode->showPwd), - set::name(''), + set::name('') ), - on::click('pwdShow'), + on::click('pwdShow') ), h::textarea ( @@ -324,7 +324,7 @@ detailHeader set::level(1), set::text($zanode->name) ), - $zanode->deleted ? span(setClass('label danger'), $lang->zanode->deleted) : null, + $zanode->deleted ? span(setClass('label danger'), $lang->zanode->deleted) : null ) ); @@ -347,7 +347,7 @@ detailBody setClass('flex flex-wrap pt-2 mx-4'), $baseInfo ) - ), + ) ) ) ), @@ -368,8 +368,8 @@ detailBody setClass('ghost btn'), icon('refresh', setClass('text-primary')), $lang->zanode->init->checkStatus, - on::click('checkServiceStatus'), - ), + on::click('checkServiceStatus') + ) ), $zanode->hostType != 'physics' ? div ( @@ -386,7 +386,7 @@ detailBody ( setClass('zenagent-status'), $lang->zanode->initializing - ), + ) ) ) : null, div @@ -404,12 +404,12 @@ detailBody ( setClass('ztf-status'), $lang->zanode->initializing - ), + ) ) ), div ( - set::id('statusContainer'), + set::id('statusContainer') ), div ( @@ -442,11 +442,11 @@ detailBody set::title($lang->zanode->copy), set::name('') ), - on::click('onCopy'), + on::click('onCopy') ) - ), - ) : null, - ), + ) + ) : null + ) ), common::hasPriv('zanode', 'browseSnapshot') && $zanode->hostType == '' ? sectionList ( @@ -465,30 +465,30 @@ detailBody set::url(createLink('zanode', 'createSnapshot', "zanodeID={$zanode->id}")), set::icon('plus'), set('data-toggle', 'modal'), - set::disabled($zanode->status != 'running' ? true : false), + set::disabled($zanode->status != 'running' ? true : false) ) ) - ), + ) ), !empty($snapshotList) ? h::iframe ( set::src(createLink('zanode', 'browseSnapshot', "nodeID={$zanode->id}", '', true)), set::scrolling('auto'), set::frameborder('no'), - setStyle('min-height', '300px'), - ) : $lang->noData, + setStyle('min-height', '300px') + ) : $lang->noData ) : null, floatToolbar ( to::prefix(backBtn(set::icon('back'), $lang->goback)), set::main($mainActions), set::suffix($commonActions), - set::object($zanode), + set::object($zanode) ), detailSide ( history() - ), + ) ); render();