diff --git a/module/host/control.php b/module/host/control.php index eeaf13da85..3016bc9eb0 100644 --- a/module/host/control.php +++ b/module/host/control.php @@ -133,7 +133,7 @@ class host extends control $this->view->rooms = $this->loadModel('serverroom')->getPairs(); $this->view->optionMenu = $this->loadModel('tree')->getOptionMenu(0, 'host'); $this->view->actions = $this->loadModel('action')->getList('host', $id); - $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->accounts = $this->loadModel('account')->getPairs(); $this->display(); } diff --git a/module/host/lang/de.php b/module/host/lang/de.php index adfdbe9da3..38b12ff515 100644 --- a/module/host/lang/de.php +++ b/module/host/lang/de.php @@ -19,6 +19,7 @@ $lang->host->hardwareType = 'Hardware Type'; $lang->host->group = 'Host Group'; $lang->host->admin = 'Admin'; $lang->host->password = 'Password'; +$lang->host->defaultPWD = '******'; $lang->host->sshPort = 'SSH Port'; $lang->host->cabinet = 'Cabinet'; $lang->host->intranet = 'Intranet IP'; diff --git a/module/host/lang/en.php b/module/host/lang/en.php index adfdbe9da3..38b12ff515 100644 --- a/module/host/lang/en.php +++ b/module/host/lang/en.php @@ -19,6 +19,7 @@ $lang->host->hardwareType = 'Hardware Type'; $lang->host->group = 'Host Group'; $lang->host->admin = 'Admin'; $lang->host->password = 'Password'; +$lang->host->defaultPWD = '******'; $lang->host->sshPort = 'SSH Port'; $lang->host->cabinet = 'Cabinet'; $lang->host->intranet = 'Intranet IP'; diff --git a/module/host/lang/fr.php b/module/host/lang/fr.php index adfdbe9da3..38b12ff515 100644 --- a/module/host/lang/fr.php +++ b/module/host/lang/fr.php @@ -19,6 +19,7 @@ $lang->host->hardwareType = 'Hardware Type'; $lang->host->group = 'Host Group'; $lang->host->admin = 'Admin'; $lang->host->password = 'Password'; +$lang->host->defaultPWD = '******'; $lang->host->sshPort = 'SSH Port'; $lang->host->cabinet = 'Cabinet'; $lang->host->intranet = 'Intranet IP'; diff --git a/module/host/lang/zh-cn.php b/module/host/lang/zh-cn.php index 42112e9fa2..a89dc3ed59 100644 --- a/module/host/lang/zh-cn.php +++ b/module/host/lang/zh-cn.php @@ -19,6 +19,7 @@ $lang->host->hardwareType = '硬件类型'; $lang->host->group = '主机分组'; $lang->host->admin = '管理账号'; $lang->host->password = '密码'; +$lang->host->defaultPWD = '******'; $lang->host->sshPort = 'SSH端口'; $lang->host->cabinet = '机柜'; $lang->host->intranet = '内网IP'; diff --git a/module/host/ui/edit.html.php b/module/host/ui/edit.html.php index 3b27d4ce90..4f417186b0 100644 --- a/module/host/ui/edit.html.php +++ b/module/host/ui/edit.html.php @@ -78,7 +78,7 @@ formPanel set::label($lang->host->password), set::name('password'), set::control('password'), - set::value(zget($host, 'password', '')) + set::value($lang->host->defaultPWD) ), formGroup ( diff --git a/module/host/ui/view.html.php b/module/host/ui/view.html.php index ddb1507f1e..39af42fd17 100644 --- a/module/host/ui/view.html.php +++ b/module/host/ui/view.html.php @@ -32,10 +32,10 @@ detailBody setClass('table table-fixed canvas host-view-table'), h::tr ( + h::th($lang->host->CD), + h::td($host->CD), h::th($lang->host->name), - h::td($host->name), - h::th(), - h::td() + h::td($host->name) ), h::tr ( @@ -46,24 +46,21 @@ detailBody ), 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::th($lang->host->admin), + h::td(zget($host, 'admin', '') ? $accounts[$host->admin] : ''), ), + $host->CD == 'spug'? h::tr ( - h::th($lang->host->cpuBrand), - h::td($host->cpuBrand), - h::th($lang->host->cpuModel), - h::td($host->cpuModel) - ), + h::th($lang->host->password), + h::td($lang->host->defaultPWD), + h::th($lang->host->sshPort), + h::td($host->sshPort) + ) : null, h::tr ( h::th($lang->host->cpuNumber), h::td($host->cpuNumber), - h::th($lang->host->cpuCores), - h::td($host->cpuCores) ), h::tr (