From e32a0187009530583e94b39edde6cef92c7d0c61 Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Wed, 2 Nov 2022 15:21:00 +0800 Subject: [PATCH] * Finish task #74676. --- module/common/lang/de.php | 2 +- module/common/lang/en.php | 2 +- module/common/lang/fr.php | 2 +- module/common/lang/menu.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/common/lang/zh-tw.php | 2 +- module/zahost/control.php | 5 +- module/zahost/css/create.css | 2 +- module/zahost/css/edit.css | 2 +- module/zahost/view/create.html.php | 122 +++++++++++++++-------------- module/zahost/view/edit.html.php | 120 ++++++++++++++-------------- 11 files changed, 135 insertions(+), 128 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index dc2bebf740..3649317b63 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -177,7 +177,7 @@ $lang->testtask->common = 'Request'; $lang->score->common = 'Score'; $lang->build->common = 'Build'; $lang->testreport->common = 'Report'; -$lang->automation->common = 'Automation'; +$lang->automation->common = 'Automation:'; $lang->zahost->common = 'ZAhost'; $lang->executionnode->common = 'Execution Node'; $lang->team->common = 'Team'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 18725cf243..b7099dc60e 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -177,7 +177,7 @@ $lang->testtask->common = 'Request'; $lang->score->common = 'Score'; $lang->build->common = 'Build'; $lang->testreport->common = 'Report'; -$lang->automation->common = 'Automation'; +$lang->automation->common = 'Automation:'; $lang->zahost->common = 'ZAhost'; $lang->executionnode->common = 'Execution Node'; $lang->team->common = 'Team'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 245655c660..1d95e3533d 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -177,7 +177,7 @@ $lang->testtask->common = 'Request'; $lang->score->common = 'Score'; $lang->build->common = 'Build'; $lang->testreport->common = 'Report'; -$lang->automation->common = 'Automation'; +$lang->automation->common = 'Automation:'; $lang->zahost->common = 'ZAhost'; $lang->executionnode->common = 'Execution Node'; $lang->team->common = 'Team'; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 010a8a587a..a5fc0034d2 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -383,7 +383,7 @@ $lang->qa->menu->testsuite = array('link' => "{$lang->testcase->testsuite}|t $lang->qa->menu->testtask = array('link' => "{$lang->testtask->common}|testtask|browse|productID=%s", 'subModule' => 'testtask', 'alias' => 'view,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult'); $lang->qa->menu->report = array('link' => "{$lang->testreport->common}|testreport|browse|productID=%s", 'subModule' => 'testreport'); $lang->qa->menu->caselib = array('link' => "{$lang->testcase->caselib}|caselib|browse|libID=0", 'subModule' => 'caselib'); -$lang->qa->menu->automation = array('link' => "{$lang->automation->common}:|automation|browse|productID=%s", 'subModule' => 'automation', 'alias' => ''); +$lang->qa->menu->automation = array('link' => "{$lang->automation->common}|automation|browse|productID=%s", 'subModule' => 'automation', 'alias' => ''); $lang->qa->menu->zahost = array('link' => "{$lang->zahost->common}|zahost|browse", 'subModule' => 'zahost'); $lang->qa->menu->executionnode = array('link' => "{$lang->executionnode->common}|executionnode|browse", 'subModule' => 'executionnode'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 0791759a51..4a74877bcf 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -177,7 +177,7 @@ $lang->testtask->common = '测试单'; $lang->score->common = '我的积分'; $lang->build->common = '版本'; $lang->testreport->common = '测试报告'; -$lang->automation->common = '自动化'; +$lang->automation->common = '自动化：'; $lang->zahost->common = '宿主机'; $lang->executionnode->common = '执行节点'; $lang->team->common = '团队'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 62021da8fb..2037027d78 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -162,7 +162,7 @@ $lang->testtask->common = '測試單'; $lang->score->common = '我的積分'; $lang->build->common = '版本'; $lang->testreport->common = '測試報告'; -$lang->automation->common = '自動化'; +$lang->automation->common = '自動化：'; $lang->zahost->common = '宿主機'; $lang->team->common = '團隊'; $lang->user->common = '用戶'; diff --git a/module/zahost/control.php b/module/zahost/control.php index e375fd1c07..def6586261 100644 --- a/module/zahost/control.php +++ b/module/zahost/control.php @@ -95,12 +95,11 @@ class zahost extends control if(!empty($changes)) $this->action->logHistory($actionID, $changes); } - if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); - + if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); } - $this->view->title = $this->lang->zahost->edit; + $this->view->title = $this->lang->zahost->editAction; $this->view->host = $this->zahost->getById($hostID); $this->display(); } diff --git a/module/zahost/css/create.css b/module/zahost/css/create.css index 00c8e21f88..662cc09295 100644 --- a/module/zahost/css/create.css +++ b/module/zahost/css/create.css @@ -1,3 +1,3 @@ #unit {padding: 0px !important; width:0px; border-left: 0px;} -.input-group-addon {border: 0px;} +.input-group-addon {border: 0px; width: 100px;} #unit_chosen a {border-left: 0px; border-radius: 0 2px;} diff --git a/module/zahost/css/edit.css b/module/zahost/css/edit.css index d065a54e29..5c73ea1c78 100644 --- a/module/zahost/css/edit.css +++ b/module/zahost/css/edit.css @@ -1,4 +1,4 @@ #unit {padding: 0px !important; width:0px; border-left: 0px;} -.input-group-addon {border: 0px;} +.input-group-addon {border: 0px; width: 100px;} #unit_chosen a {border-left: 0px; border-radius: 0 2px;} html[lang='en'] .table-form > tbody > tr > th {width: 120px;} diff --git a/module/zahost/view/create.html.php b/module/zahost/view/create.html.php index 08c8661d7f..861a17515a 100644 --- a/module/zahost/view/create.html.php +++ b/module/zahost/view/create.html.php @@ -11,65 +11,69 @@ */ ?> getModuleRoot() . 'common/view/header.html.php';?> -
-
-

zahost->create;?>

+
+
+
+
+

zahost->create;?>

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
zahost->zaHostType;?>zahost->zaHostTypeList, 'virtual', "class='form-control chosen'");?>
zahost->name;?>
zahost->IP;?>
zahost->cpuCores;?>
zahost->memory;?> +
+ + zahost->unitList['GB'];?> +
+
zahost->diskSize;?> +
+ + + zahost->unitList, 'GB', "class='form-control chosen w-50px'");?> + +
+
zahost->virtualSoftware;?>zahost->softwareList, '', "class='form-control chosen'");?>
zahost->instanceNum?>
+ + + +
+
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
zahost->name;?>
zahost->zaHostType;?>zahost->zaHostTypeList, 'virtual', "class='form-control chosen'");?>
zahost->IP;?>
zahost->cpuCores;?>
zahost->memory;?> -
- - zahost->unitList['GB'];?> -
-
zahost->diskSize;?> -
- - - zahost->unitList, 'GB', "class='form-control chosen w-50px'");?> - -
-
zahost->virtualSoftware;?>zahost->softwareList, '', "class='form-control chosen'");?>
zahost->instanceNum?>
- - - -
-
getModuleRoot() . 'common/view/footer.html.php';?> diff --git a/module/zahost/view/edit.html.php b/module/zahost/view/edit.html.php index 25736ef87f..b73712b481 100644 --- a/module/zahost/view/edit.html.php +++ b/module/zahost/view/edit.html.php @@ -11,64 +11,68 @@ */ ?> getModuleRoot() . 'common/view/header.html.php';?> -
-
-

zahost->editAction;?>

+
+
+
+
+

zahost->editAction;?>

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
zahost->zaHostType;?>zahost->zaHostTypeList, $host->hostType, "class='form-control chosen'");?>
zahost->name;?>name, "class='form-control'");?>
zahost->IP;?>publicIP, "class='form-control' disabled");?>
zahost->cpuCores;?>cpuCores, "class='form-control'");?>
zahost->memory;?> +
+ memory, "class='form-control'");?> + zahost->unitList['GB'];?> +
+
zahost->diskSize;?> +
+ diskSize, "class='form-control'");?> + + zahost->unitList, $host->unit, "class='form-control chosen w-50px'");?> + +
+
zahost->virtualSoftware;?>zahost->softwareList, $host->virtualSoftware, "class='form-control chosen'");?>
zahost->instanceNum?>instanceNum, "class='form-control'");?>
+ + +
+
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
zahost->name;?>name, "class='form-control'");?>
zahost->zaHostType;?>zahost->zaHostTypeList, $host->hostType, "class='form-control chosen'");?>
zahost->IP;?>publicIP, "class='form-control' disabled");?>
zahost->cpuCores;?>cpuCores, "class='form-control'");?>
zahost->memory;?> -
- memory, "class='form-control'");?> - zahost->unitList['GB'];?> -
-
zahost->diskSize;?> -
- diskSize, "class='form-control'");?> - - zahost->unitList, $host->unit, "class='form-control chosen w-50px'");?> - -
-
zahost->virtualSoftware;?>zahost->softwareList, $host->virtualSoftware, "class='form-control chosen'");?>
zahost->instanceNum?>instanceNum, "class='form-control'");?>
- - -
-
getModuleRoot() . 'common/view/footer.html.php';?>