diff --git a/module/zahost/control.php b/module/zahost/control.php index 3698bd10ff..668a66614a 100644 --- a/module/zahost/control.php +++ b/module/zahost/control.php @@ -69,7 +69,7 @@ class zahost extends control $this->view->zahost = $this->zahost->getById($id); $this->view->orderBy = $orderBy; - $this->view->nodeList = $this->loadModel("zanode")->getListByHost($this->view->zahost->parent, $orderBy); + $this->view->nodeList = $this->loadModel("zanode")->getListByHost($this->view->zahost->id, $orderBy); $this->view->actions = $this->loadModel('action')->getList('zahost', $id); $this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted'); $this->display(); diff --git a/module/zahost/css/browse.css b/module/zahost/css/browse.css index 420038798f..299428cebc 100644 --- a/module/zahost/css/browse.css +++ b/module/zahost/css/browse.css @@ -1,5 +1,5 @@ .c-ip {width: 100px;} -.c-memory, .c-diskSize, .c-status, .c-cpuCores, .c-software, .c-instanceNum {width: 90px;} +.c-memory, .c-diskSize, .c-status, .c-cpu, .c-software, .c-instanceNum {width: 90px;} .c-datetime {width: 150px;} .status-wait {color: #f00;} .c-actions {overflow: visible!important;} diff --git a/module/zahost/css/init.css b/module/zahost/css/init.css index 354f2c7e14..0e1d888e3c 100644 --- a/module/zahost/css/init.css +++ b/module/zahost/css/init.css @@ -1,19 +1,6 @@ -.dot-symbol{ - margin-right: 10px; -} -#statusContainer h5{ - line-height: 20px; -} -.host-desc-container{ - margin-top: 20px; -} -.host-action{ - margin-top: 60px; -} -.host-action .btn{ - margin-left: 20px; - min-width: 100px; -} -.zahost-init-desc{ - display: inline-block; -} \ No newline at end of file +.dot-symbol {margin-right: 10px;} +#statusContainer h5 {line-height: 20px;} +.host-desc-container {margin-top: 20px;} +.host-action {margin-top: 60px;} +.host-action .btn {margin-left: 20px;min-width: 100px;} +.zahost-init-desc {display: inline-block;} \ No newline at end of file diff --git a/module/zahost/css/view.css b/module/zahost/css/view.css index 734631374a..33bc7c03f6 100644 --- a/module/zahost/css/view.css +++ b/module/zahost/css/view.css @@ -1,5 +1,11 @@ .zahost-detail .text-right{text-align: right;} .zahost-detail .col-8{padding-left: 10px;} -.zahost-detail .detail-content{color: #838a9d;} .table.has-sort-head thead tr th a:after{line-height: 22px;} -.table.has-sort-head thead tr th a:before{line-height: 22px;} \ No newline at end of file +.table.has-sort-head thead tr th a:before{line-height: 22px;} +.c-cpu {width: 100px;} +.c-os {width: 200px;} +.c-memory, .c-diskSize, .c-status, .c-software, .c-instanceNum {width: 90px;} +.c-datetime {width: 150px;} +.status-wait {color: #f00;} +.c-actions {overflow: visible!important;} +.zanode-mt-8{margin-top: 8px;} \ No newline at end of file diff --git a/module/zahost/lang/zh-cn.php b/module/zahost/lang/zh-cn.php index 75fa49327c..cf943d2ede 100644 --- a/module/zahost/lang/zh-cn.php +++ b/module/zahost/lang/zh-cn.php @@ -66,7 +66,7 @@ $lang->zahost->init->statusTitle = "服务状态"; $lang->zahost->image = new stdclass; $lang->zahost->image->list = '镜像仓库'; -$lang->zahost->image->browseImage = '镜像列表'; +$lang->zahost->image->browseImage = '镜像仓库'; $lang->zahost->image->createImage = '创建镜像'; $lang->zahost->image->choseImage = '选择镜像'; $lang->zahost->image->downloadImage = '下载镜像'; diff --git a/module/zahost/view/browse.html.php b/module/zahost/view/browse.html.php index e974f9d4c8..433c4fc774 100644 --- a/module/zahost/view/browse.html.php +++ b/module/zahost/view/browse.html.php @@ -38,7 +38,7 @@

- +
recTotal}&recPerPage={$pager->recPerPage}";?> diff --git a/module/zahost/view/view.html.php b/module/zahost/view/view.html.php index 47d2887808..0ffa9f3353 100644 --- a/module/zahost/view/view.html.php +++ b/module/zahost/view/view.html.php @@ -33,7 +33,7 @@
zahost->view;?>
-
+
zahost->zaHostType;?>:
@@ -53,7 +53,7 @@
-
+
zahost->vsoft;?>:
diff --git a/module/zanode/css/init.css b/module/zanode/css/init.css index 354f2c7e14..fefc9d2c00 100644 --- a/module/zanode/css/init.css +++ b/module/zanode/css/init.css @@ -1,19 +1,6 @@ -.dot-symbol{ - margin-right: 10px; -} -#statusContainer h5{ - line-height: 20px; -} -.host-desc-container{ - margin-top: 20px; -} -.host-action{ - margin-top: 60px; -} -.host-action .btn{ - margin-left: 20px; - min-width: 100px; -} -.zahost-init-desc{ - display: inline-block; -} \ No newline at end of file +.dot-symbol{margin-right: 10px;} +#statusContainer h5{line-height: 20px;} +.host-desc-container{margin-top: 20px;} +.host-action{margin-top: 60px;} +.host-action .btn{margin-left: 20px;min-width: 100px;} +.zahost-init-desc{display: inline-block;} \ No newline at end of file diff --git a/module/zanode/css/view.css b/module/zanode/css/view.css index dba5746e72..525953f674 100644 --- a/module/zanode/css/view.css +++ b/module/zanode/css/view.css @@ -1,5 +1,6 @@ .zanode-detail .text-right{text-align: right;} .zanode-detail .col-8{padding-left: 10px;} -.zanode-detail .detail-content{color: #838a9d;} .table.has-sort-head thead tr th a:after{line-height: 22px;} -.table.has-sort-head thead tr th a:before{line-height: 22px;} \ No newline at end of file +.table.has-sort-head thead tr th a:before{line-height: 22px;} +.main-row-last{table-layout: auto;} +.zanode-mt-8{margin-top: 8px;} \ No newline at end of file diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php index e55b2a5fd7..704152b801 100644 --- a/module/zanode/lang/de.php +++ b/module/zanode/lang/de.php @@ -81,6 +81,8 @@ $lang->zanode->statusList['destroy'] = 'Destroyed'; $lang->zanode->statusList['shutoff'] = 'Shutoff'; $lang->zanode->statusList['shutdown'] = 'shutdown'; $lang->zanode->statusList['destroy_fail'] = 'Destroy Fail'; +$lang->zanode->statusList['wait'] = 'Waiting For Init'; +$lang->zanode->statusList['online'] = 'Online'; $lang->zanode->init = new stdclass; $lang->zanode->init->checkStatus = "Check Service Status"; diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php index 0d26467b61..53513c118e 100644 --- a/module/zanode/lang/en.php +++ b/module/zanode/lang/en.php @@ -81,6 +81,8 @@ $lang->zanode->statusList['destroy'] = 'Destroyed'; $lang->zanode->statusList['shutoff'] = 'Shutoff'; $lang->zanode->statusList['shutdown'] = 'shutdown'; $lang->zanode->statusList['destroy_fail'] = 'Destroy Fail'; +$lang->zanode->statusList['wait'] = 'Waiting For Init'; +$lang->zanode->statusList['online'] = 'Online'; $lang->zanode->init = new stdclass; $lang->zanode->init->checkStatus = "Check Service Status"; diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php index ff555af612..7f38c29a74 100644 --- a/module/zanode/lang/fr.php +++ b/module/zanode/lang/fr.php @@ -81,6 +81,8 @@ $lang->zanode->statusList['destroy'] = 'Destroyed'; $lang->zanode->statusList['shutoff'] = 'Shutoff'; $lang->zanode->statusList['shutdown'] = 'shutdown'; $lang->zanode->statusList['destroy_fail'] = 'Destroy Fail'; +$lang->zanode->statusList['wait'] = 'Waiting For Init'; +$lang->zanode->statusList['online'] = 'Online'; $lang->zanode->init = new stdclass; $lang->zanode->init->checkStatus = "Check Service Status"; diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php index 4f31710bde..9266f40c30 100644 --- a/module/zanode/lang/zh-cn.php +++ b/module/zanode/lang/zh-cn.php @@ -18,7 +18,7 @@ $lang->zanode->byQuery = '搜索'; $lang->zanode->osName = '操作系统'; $lang->zanode->image = '镜像'; $lang->zanode->imageName = '镜像名称'; -$lang->zanode->name = '执行节点名称'; +$lang->zanode->name = '名称'; $lang->zanode->start = '创建后自动开启'; $lang->zanode->hostName = '所属宿主机'; $lang->zanode->host = $lang->zanode->hostName; @@ -81,6 +81,8 @@ $lang->zanode->statusList['destroy'] = '已销毁'; $lang->zanode->statusList['shutoff'] = '已关机'; $lang->zanode->statusList['shutodown'] = '已关机'; $lang->zanode->statusList['destroy_fail'] = '销毁失败'; +$lang->zanode->statusList['wait'] = '待初始化'; +$lang->zanode->statusList['online'] = '已上架'; $lang->zanode->init = new stdclass; $lang->zanode->init->statusTitle = "服务状态"; @@ -100,4 +102,4 @@ $lang->zanode->init->serviceStatus = [ ]; $lang->zanode->init->title = "初始化执行节点"; $lang->zanode->init->descTitle = "请根据引导完成执行节点上的初始化: "; -$lang->zanode->init->initDesc = "- 在执行节点上执行命令:bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -s zvm -k %s
- 点击检测服务状态。";$lang->zanode->init->statusTitle = "Service Status"; \ No newline at end of file +$lang->zanode->init->initDesc = "- 在执行节点上执行命令:bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -s zvm -k %s
- 点击检测服务状态。";$lang->zanode->init->statusTitle = "服务状态"; \ No newline at end of file diff --git a/module/zanode/view/view.html.php b/module/zanode/view/view.html.php index 6e0dedecaf..9bb7ceb9e3 100644 --- a/module/zanode/view/view.html.php +++ b/module/zanode/view/view.html.php @@ -39,7 +39,7 @@
zanode->view; ?>
-
+
IP:
@@ -59,11 +59,11 @@
-
+
-
zanode->hostName; ?>:
-
hostName; ?>
+
zanode->status; ?>:
+
zanode->statusList, $zanode->status); ?>
@@ -79,11 +79,11 @@
-
+
-
zanode->status; ?>:
-
zanode->statusList, $zanode->status); ?>
+
zanode->hostName; ?>:
+
hostName; ?>
@@ -114,7 +114,7 @@ } elseif($zanode->status == "suspend") { - common::printLink('zanode', 'resume', "id={$zanode->id}", " " . $lang->zanode->resume, '', "title='{$lang->zanode->resume}' class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmResume}\")==false) return false;'"); + common::printLink('zanode', 'resume', "id={$zanode->id}", " " . $lang->zanode->resume, '', "title='{$lang->zanode->resume}' class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmResume}\")==false) return false;'"); } common::printLink('zanode', 'getVNC', "id={$zanode->id}", " " . $lang->zanode->getVNC, '', "title='{$lang->zanode->getVNC}' class='btn iframe " . (common::hasPriv('zahost', 'getVNC') && $zanode->status == 'running' ? '':'disabled') . "'", '', true); }