@@ -22,21 +25,33 @@ - + + - + + - + + - + +
testcase->product;?>testcase->product;?>
zanode->common;?>zanode->common;?> node) ? $automation->node : '', "class='form-control picker-select'");?>
zanode->scriptPath;?> + zanode->scriptPath;?> + scriptPath) ? $automation->scriptPath : '', "class='form-control'");?> + +
zanode->shell;?> + zanode->shell;?> + shell) ? $automation->shell : '', "rows='6' class='form-control'");?> + +
@@ -50,6 +65,8 @@ diff --git a/module/zahost/css/common.css b/module/zahost/css/common.css new file mode 100644 index 0000000000..1ef909a85b --- /dev/null +++ b/module/zahost/css/common.css @@ -0,0 +1 @@ +.icon-help{line-height: 34px;} diff --git a/module/zahost/js/common.js b/module/zahost/js/common.js index 65357a2674..b4e3efb24b 100755 --- a/module/zahost/js/common.js +++ b/module/zahost/js/common.js @@ -31,4 +31,6 @@ $(function() }); $('#osCategory').change(); + + $('[data-toggle="popover"]').popover(); }) diff --git a/module/zahost/lang/de.php b/module/zahost/lang/de.php index de18d2269f..6b9fd479ca 100644 --- a/module/zahost/lang/de.php +++ b/module/zahost/lang/de.php @@ -20,8 +20,8 @@ $lang->zahost->copied = 'Copy successful'; $lang->zahost->name = 'Name'; $lang->zahost->IP = 'Extranet Address'; $lang->zahost->extranet = 'Extranet Address'; -$lang->zahost->cpuCores = 'CPU'; $lang->zahost->memory = 'Memory Size'; +$lang->zahost->cpuCores = 'CPU'; $lang->zahost->diskSize = 'Disk Size'; $lang->zahost->desc = 'Description'; $lang->zahost->type = 'Type'; @@ -122,3 +122,5 @@ $lang->zahost->notice->ip = '『%s』incorrect format!'; $lang->zahost->notice->registerCommand = 'Register command: ./zagent-host -t host -s http://%s:%s -i %s -p 8086 -secret %s'; $lang->zahost->notice->loading = 'loading...'; $lang->zahost->notice->noImage = 'No available image'; + +$lang->zahost->tips = 'Host include physical host, k8s clusters, cloud servers, and cloud container instances. Host used to create VMS or container instances. The recommended host OS is ubuntu or CentOS LTS.'; diff --git a/module/zahost/lang/en.php b/module/zahost/lang/en.php index de18d2269f..6b9fd479ca 100644 --- a/module/zahost/lang/en.php +++ b/module/zahost/lang/en.php @@ -20,8 +20,8 @@ $lang->zahost->copied = 'Copy successful'; $lang->zahost->name = 'Name'; $lang->zahost->IP = 'Extranet Address'; $lang->zahost->extranet = 'Extranet Address'; -$lang->zahost->cpuCores = 'CPU'; $lang->zahost->memory = 'Memory Size'; +$lang->zahost->cpuCores = 'CPU'; $lang->zahost->diskSize = 'Disk Size'; $lang->zahost->desc = 'Description'; $lang->zahost->type = 'Type'; @@ -122,3 +122,5 @@ $lang->zahost->notice->ip = '『%s』incorrect format!'; $lang->zahost->notice->registerCommand = 'Register command: ./zagent-host -t host -s http://%s:%s -i %s -p 8086 -secret %s'; $lang->zahost->notice->loading = 'loading...'; $lang->zahost->notice->noImage = 'No available image'; + +$lang->zahost->tips = 'Host include physical host, k8s clusters, cloud servers, and cloud container instances. Host used to create VMS or container instances. The recommended host OS is ubuntu or CentOS LTS.'; diff --git a/module/zahost/lang/fr.php b/module/zahost/lang/fr.php index 4518f7627c..55acee78a9 100644 --- a/module/zahost/lang/fr.php +++ b/module/zahost/lang/fr.php @@ -20,8 +20,8 @@ $lang->zahost->copied = 'Copy successful'; $lang->zahost->name = 'Name'; $lang->zahost->IP = 'Extranet Address'; $lang->zahost->extranet = 'Extranet Address'; -$lang->zahost->cpuCores = 'CPU'; $lang->zahost->memory = 'Memory Size'; +$lang->zahost->cpuCores = 'CPU'; $lang->zahost->diskSize = 'diskSize Size'; $lang->zahost->desc = 'Description'; $lang->zahost->type = 'Type'; @@ -122,3 +122,5 @@ $lang->zahost->notice->ip = '『%s』incorrect format!'; $lang->zahost->notice->registerCommand = 'Register command: ./zagent-host -t host -s http://%s:%s -i %s -p 8086 -secret %s'; $lang->zahost->notice->loading = 'loading...'; $lang->zahost->notice->noImage = 'No available image'; + +$lang->zahost->tips = 'Host include physical host, k8s clusters, cloud servers, and cloud container instances. Host used to create VMS or container instances. The recommended host OS is ubuntu or CentOS LTS.'; diff --git a/module/zahost/lang/zh-cn.php b/module/zahost/lang/zh-cn.php index d3d39dbb0e..1cc873532c 100644 --- a/module/zahost/lang/zh-cn.php +++ b/module/zahost/lang/zh-cn.php @@ -122,3 +122,5 @@ $lang->zahost->notice->ip = '『%s』格式不正确！'; $lang->zahost->notice->registerCommand = '宿主机注册命令：./zagent-host -t host -s http://%s:%s -i %s -p 8086 -secret %s'; $lang->zahost->notice->loading = '加载中...'; $lang->zahost->notice->noImage = '无可用的镜像文件'; + +$lang->zahost->tips = '宿主机包括实体主机、k8s集群、云服务器以及云容器实例，主要用于创建虚拟机或容器实例。宿主机推荐安装的操作系统为ubuntu或CentOS的LTS版本。'; diff --git a/module/zahost/view/create.html.php b/module/zahost/view/create.html.php index b86d20a5fa..85e9f5e1c9 100644 --- a/module/zahost/view/create.html.php +++ b/module/zahost/view/create.html.php @@ -17,6 +17,7 @@

zahost->create;?>

+
diff --git a/module/zahost/view/edit.html.php b/module/zahost/view/edit.html.php index 82f389f2dd..57c6c3126a 100644 --- a/module/zahost/view/edit.html.php +++ b/module/zahost/view/edit.html.php @@ -17,6 +17,7 @@

zahost->editAction;?>

+
diff --git a/module/zanode/css/common.css b/module/zanode/css/common.css index e69de29bb2..1ef909a85b 100644 --- a/module/zanode/css/common.css +++ b/module/zanode/css/common.css @@ -0,0 +1 @@ +.icon-help{line-height: 34px;} diff --git a/module/zanode/js/common.js b/module/zanode/js/common.js index 75e971af4d..471e22070d 100644 --- a/module/zanode/js/common.js +++ b/module/zanode/js/common.js @@ -1,5 +1,7 @@ $(function() { + $('[data-toggle="popover"]').popover(); + if(config.currentMethod == 'create') $('#parent').change(); $('#parent').change(function() diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php index 4c1c50b82b..54b522642c 100644 --- a/module/zanode/lang/de.php +++ b/module/zanode/lang/de.php @@ -110,3 +110,8 @@ $lang->zanode->init->serviceStatus = [ $lang->zanode->init->title = "Initialize Node"; $lang->zanode->init->descTitle = "Follow these steps to complete the initialization on the node:"; $lang->zanode->init->initDesc = "Execute the init script on the node: %s %s
- Click check service status button."; + +$lang->zanode->tips = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases."; +$lang->zanode->scriptTips = 'Write the directory where the script is located on the execution node.'; +$lang->zanode->shellTips = 'Before running the automated test script on the execution node, you can execute a custom shell command.'; +$lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.'; diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php index bcddd9ba17..0244b4e243 100644 --- a/module/zanode/lang/en.php +++ b/module/zanode/lang/en.php @@ -110,3 +110,8 @@ $lang->zanode->init->serviceStatus = [ $lang->zanode->init->title = "Initialize Node"; $lang->zanode->init->descTitle = "Follow these steps to complete the initialization on the node:"; $lang->zanode->init->initDesc = "Execute the init script on the node: %s %s
- Click check service status button."; + +$lang->zanode->tips = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases."; +$lang->zanode->scriptTips = 'Write the directory where the script is located on the execution node.'; +$lang->zanode->shellTips = 'Before running the automated test script on the execution node, you can execute a custom shell command.'; +$lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.'; diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php index 40532a49b7..0bf60d004c 100644 --- a/module/zanode/lang/fr.php +++ b/module/zanode/lang/fr.php @@ -110,3 +110,8 @@ $lang->zanode->init->serviceStatus = [ $lang->zanode->init->title = "Initialize Node"; $lang->zanode->init->descTitle = "Follow these steps to complete the initialization on the node:"; $lang->zanode->init->initDesc = "Execute the init script on the node: %s %s
- Click check service status button."; + +$lang->zanode->tips = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases."; +$lang->zanode->scriptTips = 'Write the directory where the script is located on the execution node.'; +$lang->zanode->shellTips = 'Before running the automated test script on the execution node, you can execute a custom shell command.'; +$lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.'; diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php index 5278744765..472a24766d 100644 --- a/module/zanode/lang/zh-cn.php +++ b/module/zanode/lang/zh-cn.php @@ -110,3 +110,8 @@ $lang->zanode->init->serviceStatus = [ $lang->zanode->init->title = "初始化执行节点"; $lang->zanode->init->descTitle = "请根据引导完成执行节点上的初始化: "; $lang->zanode->init->initDesc = "- 在执行节点上执行命令：%s %s
- 点击检测服务状态。";$lang->zanode->init->statusTitle = "服务状态"; + +$lang->zanode->tips = '执行节点是由宿主机创建的虚拟机或容器实例，是执行测试任务的测试环境，在执行节点配置自动化测试环境后可以自动执行脚本，结果可以在禅道对应用例执行结果中查看。'; +$lang->zanode->scriptTips = '填写执行节点上自动化测试脚本所在的目录。'; +$lang->zanode->shellTips = '在执行节点上运行自动化测试脚本前，可以执行自定义的shell命令。'; +$lang->zanode->automationTips = '在执行节点上执行测试任务前，需要设置产品对应的执行节点，自动化测试脚本的目录以及需要执行的自定义Shell命令。'; diff --git a/module/zanode/view/create.html.php b/module/zanode/view/create.html.php index 2823b062bd..65d7386b63 100644 --- a/module/zanode/view/create.html.php +++ b/module/zanode/view/create.html.php @@ -17,6 +17,7 @@

zanode->create;?>

+
diff --git a/module/zanode/view/edit.html.php b/module/zanode/view/edit.html.php index 400b41a099..bec7aaf7db 100644 --- a/module/zanode/view/edit.html.php +++ b/module/zanode/view/edit.html.php @@ -17,6 +17,7 @@

zanode->editAction;?>

+