From 026c7425f843478890643f928980bd0ffbefcf73 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 14 Nov 2023 11:20:01 +0800 Subject: [PATCH] * Remove `,` at the end of row in the lastest children in host. --- module/host/ui/browse.html.php | 4 +-- module/host/ui/browseimage.html.php | 2 +- module/host/ui/changestatus.html.php | 6 ++-- module/host/ui/create.html.php | 42 ++++++++++++++-------------- module/host/ui/edit.html.php | 30 ++++++++++---------- module/host/ui/view.html.php | 24 ++++++++-------- 6 files changed, 54 insertions(+), 54 deletions(-) diff --git a/module/host/ui/browse.html.php b/module/host/ui/browse.html.php index 80a2b4671c..502c620a4d 100644 --- a/module/host/ui/browse.html.php +++ b/module/host/ui/browse.html.php @@ -47,7 +47,7 @@ sidebar 'settingText' => $lang->host->groupMaintenance, 'showDisplay' => false, 'settingLink' => $this->createLink('tree', 'browse', "productID=0&view=host"), - 'closeLink' => $this->createLink('host', 'browse'), + 'closeLink' => $this->createLink('host', 'browse') ))) ); @@ -59,7 +59,7 @@ dtable set::sortLink(createLink('host', 'browse', "browseType=$browseType¶m=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")), set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), - set::footPager(usePager()), + set::footPager(usePager()) ); render(); diff --git a/module/host/ui/browseimage.html.php b/module/host/ui/browseimage.html.php index 97966dbaf9..ac9f6a20a4 100644 --- a/module/host/ui/browseimage.html.php +++ b/module/host/ui/browseimage.html.php @@ -23,7 +23,7 @@ dtable set::sortLink(createLink('host', 'browseImage', "hostID={$hostID}&browseType=$browseType¶m=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")), set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), - set::footPager(usePager()), + set::footPager(usePager()) ); render(); diff --git a/module/host/ui/changestatus.html.php b/module/host/ui/changestatus.html.php index 26f73f7a57..418004e138 100644 --- a/module/host/ui/changestatus.html.php +++ b/module/host/ui/changestatus.html.php @@ -23,7 +23,7 @@ formPanel set::name('reason'), set::label(' '), set::control('editor'), - set::required(true), - ), - ), + set::required(true) + ) + ) ); diff --git a/module/host/ui/create.html.php b/module/host/ui/create.html.php index 7fb8edb3f7..ad615fdbbe 100644 --- a/module/host/ui/create.html.php +++ b/module/host/ui/create.html.php @@ -22,7 +22,7 @@ formPanel ( set::width('1/3'), set::name('name'), - set::label($lang->host->name), + set::label($lang->host->name) ), formGroup ( @@ -30,7 +30,7 @@ formPanel set::label($lang->host->admin), set::control('picker'), set::name('admin'), - set::items($accounts), + set::items($accounts) ) ), formRow @@ -41,13 +41,13 @@ formPanel set::label($lang->host->cpuBrand), set::control('picker'), set::name('cpuBrand'), - set::items($lang->host->cpuBrandList), + set::items($lang->host->cpuBrandList) ), formGroup ( set::width('1/3'), set::name('cpuModel'), - set::label($lang->host->cpuModel), + set::label($lang->host->cpuModel) ) ), formRow @@ -56,13 +56,13 @@ formPanel ( set::width('1/3'), set::name('cpuNumber'), - set::label($lang->host->cpuNumber), + set::label($lang->host->cpuNumber) ), formGroup ( set::width('1/3'), set::name('cpuCores'), - set::label($lang->host->cpuCores), + set::label($lang->host->cpuCores) ) ), formRow @@ -76,8 +76,8 @@ formPanel ( 'type' => 'inputControl', 'suffix' => 'GB', - 'suffixWidth' => 40, - )), + 'suffixWidth' => 40 + )) ), formGroup ( @@ -88,8 +88,8 @@ formPanel ( 'type' => 'inputControl', 'suffix' => 'GB', - 'suffixWidth' => 40, - )), + 'suffixWidth' => 40 + )) ) ), formRow @@ -100,7 +100,7 @@ formPanel set::label($lang->host->group), set::control('picker'), set::name('group'), - set::items($optionMenu), + set::items($optionMenu) ), formGroup ( @@ -108,7 +108,7 @@ formPanel set::label($lang->host->serverRoom), set::control('picker'), set::name('serverRoom'), - set::items($rooms), + set::items($rooms) ) ), formRow @@ -117,7 +117,7 @@ formPanel ( set::width('1/3'), set::name('serverModel'), - set::label($lang->host->serverModel), + set::label($lang->host->serverModel) ), formGroup ( @@ -139,7 +139,7 @@ formPanel set::name('osName'), set::items($lang->host->osNameList), set::value($osName ? $osName : $host->osName), - on::change('osChange'), + on::change('osChange') ), formGroup ( @@ -147,7 +147,7 @@ formPanel set::label($lang->host->osVersion), set::control('picker'), set::name('osVersion'), - set::items($lang->host->{"{$osName}List"}), + set::items($lang->host->{"{$osName}List"}) ) ), formRow @@ -157,7 +157,7 @@ formPanel set::width('1/3'), set::name('zap'), set::label($lang->host->zap), - set::value(8086), + set::value(8086) ), formGroup ( @@ -175,13 +175,13 @@ formPanel ( set::width('1/3'), set::name('intranet'), - set::label($lang->host->intranet), + set::label($lang->host->intranet) ), formGroup ( set::width('1/3'), set::name('extranet'), - set::label($lang->host->extranet), + set::label($lang->host->extranet) ) ), formRow @@ -192,7 +192,7 @@ formPanel set::label($lang->host->provider), set::control('picker'), set::name('provider'), - set::items($lang->host->providerList), + set::items($lang->host->providerList) ), formGroup ( @@ -202,7 +202,7 @@ formPanel set::label($lang->host->status), set::value('online'), set::inline(true), - set::items($lang->host->statusList), + set::items($lang->host->statusList) ) - ), + ) ); diff --git a/module/host/ui/edit.html.php b/module/host/ui/edit.html.php index ae0f9cf7b0..eabc7c1689 100644 --- a/module/host/ui/edit.html.php +++ b/module/host/ui/edit.html.php @@ -25,7 +25,7 @@ formPanel set::width('400px'), set::name('name'), set::label($lang->host->name), - set::value($host->name), + set::value($host->name) ), formGroup ( @@ -53,7 +53,7 @@ formPanel set::width('400px'), set::name('cpuModel'), set::label($lang->host->cpuModel), - set::value($host->cpuModel), + set::value($host->cpuModel) ) ), formRow @@ -63,14 +63,14 @@ formPanel set::width('400px'), set::name('cpuNumber'), set::label($lang->host->cpuNumber), - set::value($host->cpuNumber), + set::value($host->cpuNumber) ), formGroup ( set::width('400px'), set::name('cpuCores'), set::label($lang->host->cpuCores), - set::value($host->cpuCores), + set::value($host->cpuCores) ) ), formRow @@ -85,8 +85,8 @@ formPanel ( 'type' => 'inputControl', 'suffix' => 'GB', - 'suffixWidth' => 40, - )), + 'suffixWidth' => 40 + )) ), formGroup ( @@ -98,8 +98,8 @@ formPanel ( 'type' => 'inputControl', 'suffix' => 'GB', - 'suffixWidth' => 40, - )), + 'suffixWidth' => 40 + )) ) ), formRow @@ -130,7 +130,7 @@ formPanel set::width('400px'), set::name('serverModel'), set::label($lang->host->serverModel), - set::value($host->serverModel), + set::value($host->serverModel) ), formGroup ( @@ -152,7 +152,7 @@ formPanel set::name('osName'), set::items($lang->host->osNameList), set::value($osName ? $osName : $host->osName), - on::change('osChange'), + on::change('osChange') ), formGroup ( @@ -171,7 +171,7 @@ formPanel set::width('400px'), set::name('zap'), set::label($lang->host->zap), - set::value($host->zap ? $host->zap : 8086), + set::value($host->zap ? $host->zap : 8086) ), formGroup ( @@ -190,14 +190,14 @@ formPanel set::width('400px'), set::name('intranet'), set::label($lang->host->intranet), - set::value($host->intranet), + set::value($host->intranet) ), formGroup ( set::width('400px'), set::name('extranet'), set::label($lang->host->extranet), - set::value($host->extranet), + set::value($host->extranet) ) ), formRow @@ -219,7 +219,7 @@ formPanel set::label($lang->host->status), set::value($host->status ? $host->status : 'online'), set::inline(true), - set::items($lang->host->statusList), + set::items($lang->host->statusList) ) - ), + ) ); diff --git a/module/host/ui/view.html.php b/module/host/ui/view.html.php index 03bb1d41d2..47a6fd1fcd 100644 --- a/module/host/ui/view.html.php +++ b/module/host/ui/view.html.php @@ -18,7 +18,7 @@ detailHeader entityLabel( set(array('entityID' => $host->id, 'level' => 1, 'text' => $host->name)) ) - ), + ) ); $actions = $this->loadModel('common')->buildOperateMenu($host); @@ -35,74 +35,74 @@ detailBody h::th($lang->host->name), h::td($host->name), h::th(), - h::td(), + h::td() ), h::tr ( h::th($lang->host->group), h::td(zget($optionMenu, $host->group)), h::th($lang->host->serverRoom), - h::td(zget($rooms, $host->serverRoom, "")), + h::td(zget($rooms, $host->serverRoom, "")) ), h::tr ( h::th($lang->host->serverModel), h::td($host->serverModel), h::th($lang->host->hostType), - h::td(zget($lang->host->hostTypeList, $host->hostType, "")), + h::td(zget($lang->host->hostTypeList, $host->hostType, "")) ), h::tr ( h::th($lang->host->cpuBrand), h::td($host->cpuBrand), h::th($lang->host->cpuModel), - h::td($host->cpuModel), + h::td($host->cpuModel) ), h::tr ( h::th($lang->host->cpuNumber), h::td($host->cpuNumber), h::th($lang->host->cpuCores), - h::td($host->cpuCores), + h::td($host->cpuCores) ), h::tr ( h::th($lang->host->memory), h::td($host->memory ? $host->memory . ' GB' : ''), h::th($lang->host->diskSize), - h::td($host->diskSize ? $host->diskSize . ' GB' : ''), + h::td($host->diskSize ? $host->diskSize . ' GB' : '') ), h::tr ( h::th($lang->host->intranet), h::td($host->intranet), h::th($lang->host->extranet), - h::td($host->extranet), + h::td($host->extranet) ), h::tr ( h::th($lang->host->osName), h::td($host->osName), h::th($lang->host->osVersion), - h::td(zget($lang->host->{$host->osName.'List'}, $host->osVersion)), + h::td(zget($lang->host->{$host->osName.'List'}, $host->osVersion)) ), h::tr ( h::th($lang->host->status), h::td($lang->host->statusList[$host->status]), h::th(), - h::td(), + h::td() ) ) ), history ( - set::commentUrl(createLink('action', 'comment', array('objectType' => 'host', 'objectID' => $host->id))), + set::commentUrl(createLink('action', 'comment', array('objectType' => 'host', 'objectID' => $host->id))) ), floatToolbar ( set::object($host), isAjaxRequest('modal') ? null : to::prefix(backBtn(set::icon('back'), set::className('ghost text-white'), $lang->goback)), set::suffix($actions['suffixActions']) - ), + ) );