diff --git a/module/zahost/css/init.css b/module/zahost/css/init.css index adb9649d82..354f2c7e14 100644 --- a/module/zahost/css/init.css +++ b/module/zahost/css/init.css @@ -14,3 +14,6 @@ margin-left: 20px; min-width: 100px; } +.zahost-init-desc{ + display: inline-block; +} \ No newline at end of file diff --git a/module/zahost/lang/de.php b/module/zahost/lang/de.php index ed905d6b09..d03409472f 100644 --- a/module/zahost/lang/de.php +++ b/module/zahost/lang/de.php @@ -61,7 +61,7 @@ $lang->zahost->init->serviceStatus = [ ]; $lang->zahost->init->title = "Initialize Host"; $lang->zahost->init->descTitle = "Follow these steps to complete the initialization on the host:"; -$lang->zahost->init->initDesc = "Execute the init script on the host: bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k "; +$lang->zahost->init->initDesc = "Execute the init script on the host: bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k %s
- Click check service status button."; $lang->zahost->init->statusTitle = "Service Status"; $lang->zahost->image = new stdclass; diff --git a/module/zahost/lang/en.php b/module/zahost/lang/en.php index ed905d6b09..d03409472f 100644 --- a/module/zahost/lang/en.php +++ b/module/zahost/lang/en.php @@ -61,7 +61,7 @@ $lang->zahost->init->serviceStatus = [ ]; $lang->zahost->init->title = "Initialize Host"; $lang->zahost->init->descTitle = "Follow these steps to complete the initialization on the host:"; -$lang->zahost->init->initDesc = "Execute the init script on the host: bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k "; +$lang->zahost->init->initDesc = "Execute the init script on the host: bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k %s
- Click check service status button."; $lang->zahost->init->statusTitle = "Service Status"; $lang->zahost->image = new stdclass; diff --git a/module/zahost/lang/fr.php b/module/zahost/lang/fr.php index fdba9f2d53..e8c069ca22 100644 --- a/module/zahost/lang/fr.php +++ b/module/zahost/lang/fr.php @@ -61,7 +61,7 @@ $lang->zahost->init->serviceStatus = [ ]; $lang->zahost->init->title = "Initialize Host"; $lang->zahost->init->descTitle = "Follow these steps to complete the initialization on the host:"; -$lang->zahost->init->initDesc = "Execute the init script on the host: bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k "; +$lang->zahost->init->initDesc = "Execute the init script on the host: bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k %s
- Click check service status button."; $lang->zahost->init->statusTitle = "Service Status"; $lang->zahost->image = new stdclass; diff --git a/module/zahost/lang/vi.php b/module/zahost/lang/vi.php index c947fbbfbd..dc9e2ab69e 100644 --- a/module/zahost/lang/vi.php +++ b/module/zahost/lang/vi.php @@ -53,7 +53,7 @@ $lang->zahost->init->ready = "Ready"; $lang->zahost->init->next = "Next"; $lang->zahost->init->initSuccessNotice = "The initialization was successful, click Next to complete the next steps."; -$lang->zahost->init->initFailNoticeTitle = "Initialization failed, check the init script execution log and try the following two solutions:"; +$lang->zahost->init->initDesc = "Execute the init script on the host: bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k %s
- Click check service status button."; $lang->zahost->init->initFailNoticeDesc = "1. Re-execute the script
2. Review the initialization FAQ"; $lang->zahost->init->serviceStatus = [ diff --git a/module/zahost/lang/zh-cn.php b/module/zahost/lang/zh-cn.php index e4361fef79..75fa49327c 100644 --- a/module/zahost/lang/zh-cn.php +++ b/module/zahost/lang/zh-cn.php @@ -61,7 +61,7 @@ $lang->zahost->init->serviceStatus = [ ]; $lang->zahost->init->title = "初始化宿主机"; $lang->zahost->init->descTitle = "请根据引导完成宿主机上的初始化: "; -$lang->zahost->init->initDesc = "1. 在宿主机上执行:bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k "; +$lang->zahost->init->initDesc = "- 在宿主机上执行命令:bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k %s
- 点击检测服务状态。"; $lang->zahost->init->statusTitle = "服务状态"; $lang->zahost->image = new stdclass; diff --git a/module/zahost/model.php b/module/zahost/model.php index e6519fdcf8..005a45c103 100644 --- a/module/zahost/model.php +++ b/module/zahost/model.php @@ -33,6 +33,7 @@ class zahostModel extends model { $hostInfo = fixer::input('post') ->setDefault('cpuNumber,cpuCores,diskSize,memory', 0) + ->trim('extranet') ->get(); $this->dao->table = 'zahost'; diff --git a/module/zahost/view/browse.html.php b/module/zahost/view/browse.html.php index 1aef95664b..e974f9d4c8 100644 --- a/module/zahost/view/browse.html.php +++ b/module/zahost/view/browse.html.php @@ -74,7 +74,7 @@ hostID}", $host, 'list');?> createLink('zahost', 'delete', "hostID={$host->id}"), '', 'hiddenwin', "title='$title' class='btn $disabled'");;?> hostID}", $host, 'list', 'file', '', 'iframe', true, "data-width='60%'", $lang->zahost->image->list);?> - hostID}", $host, 'list', 'info', '', ' init', false, "data-placement='bottom'", $lang->zahost->init->title);?> + hostID}", $host, 'list', 'refresh', '', ' init', false, "data-placement='bottom'", $lang->zahost->init->title);?> diff --git a/module/zahost/view/browseimage.html.php b/module/zahost/view/browseimage.html.php index 9c38331201..dffb83fdbc 100755 --- a/module/zahost/view/browseimage.html.php +++ b/module/zahost/view/browseimage.html.php @@ -49,7 +49,7 @@ status == 'completed' ? '100%' : '';?> createLink('zahost', 'downloadImage', "hostID={$hostID}&imageName={$image->name}&imageID={$image->id}"), '', 'hiddenwin', zget($image, 'downloadMisc', ''));?> - createLink('zahost', 'cancelDownload', "id={$image->id}"), '', 'hiddenwin', zget($image, 'cancelMisc', ''));?> + createLink('zahost', 'cancelDownload', "id={$image->id}"), '', 'hiddenwin', zget($image, 'cancelMisc', ''));?> diff --git a/module/zahost/view/init.html.php b/module/zahost/view/init.html.php index 7d2118afff..5486f15237 100644 --- a/module/zahost/view/init.html.php +++ b/module/zahost/view/init.html.php @@ -25,8 +25,8 @@

zahost->init->descTitle; ?>

- - zahost->init->initDesc . ' ' . $host->secret . ' -z ' . getWebRoot(true); ?> + + zahost->init->initDesc, $host->secret . ' -z ' . getWebRoot(true)); ?>
diff --git a/module/zanode/css/init.css b/module/zanode/css/init.css index adb9649d82..354f2c7e14 100644 --- a/module/zanode/css/init.css +++ b/module/zanode/css/init.css @@ -14,3 +14,6 @@ margin-left: 20px; min-width: 100px; } +.zahost-init-desc{ + display: inline-block; +} \ No newline at end of file diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php index 2b4c988f58..4f31710bde 100644 --- a/module/zanode/lang/zh-cn.php +++ b/module/zanode/lang/zh-cn.php @@ -100,5 +100,4 @@ $lang->zanode->init->serviceStatus = [ ]; $lang->zanode->init->title = "初始化执行节点"; $lang->zanode->init->descTitle = "请根据引导完成执行节点上的初始化: "; -$lang->zanode->init->initDesc = "1. 在执行节点上执行:bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -s zvm -k "; -$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 = "Service Status"; \ No newline at end of file diff --git a/module/zanode/view/browse.html.php b/module/zanode/view/browse.html.php index 5c977765a1..972d8d57ff 100644 --- a/module/zanode/view/browse.html.php +++ b/module/zanode/view/browse.html.php @@ -95,7 +95,7 @@ if(common::hasPriv('zahost', 'createImage')) common::printLink('zanode', 'createImage', "zanodeID={$node->id}", " ", '', "class='btn iframe' title='{$lang->zanode->createImage}' data-width='50%'", '', true); if(common::hasPriv('zahost', 'edit')) common::printIcon('zanode', 'edit', "id={$node->id}", $node, 'list'); if(common::hasPriv('zahost', 'delete')) common::printLink('zanode', 'delete', "zanodeID={$node->id}", " ", '', "title='{$lang->zanode->destroy}' class='btn btn-primary' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmDelete}\")==false) return false;'"); - if(common::hasPriv('zahost', 'init')) common::printIcon('zanode', 'init', "hostID={$node->id}", $node, 'list', 'info', '', ' init', false, "data-placement='bottom'", $lang->zanode->init->title); + if(common::hasPriv('zahost', 'init')) common::printIcon('zanode', 'init', "hostID={$node->id}", $node, 'list', 'refresh', '', ' init', false, "data-placement='bottom'", $lang->zanode->init->title); ?> diff --git a/module/zanode/view/init.html.php b/module/zanode/view/init.html.php index 8cc20d042b..8c6d32a194 100644 --- a/module/zanode/view/init.html.php +++ b/module/zanode/view/init.html.php @@ -25,8 +25,8 @@

zanode->init->descTitle; ?>

- - zanode->init->initDesc . ' ' . $node->secret . ' -z ' . getWebRoot(true); ?> + + zanode->init->initDesc, $node->secret . ' -z ' . getWebRoot(true)); ?>
@@ -35,7 +35,7 @@
- ' . $lang->goback, "data-app='{$app->tab}'", 'btn'); ?> + goback, "data-app='{$app->tab}'", 'btn'); ?>