Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix issue.

Browse Source
This commit is contained in:
zhaoke
2022-12-09 02:18:28 +00:00
parent 30bcd588b7
commit 4511932689
14 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zahost/css/init.css
+3
View File
@@ -14,3 +14,6 @@
margin-left: 20px;
min-width: 100px;
}
.zahost-init-desc{
display: inline-block;
}
module/zahost/lang/de.php
+1 -1
View File
@@ -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<br>- Click check service status button.";
$lang->zahost->init->statusTitle = "Service Status";
$lang->zahost->image = new stdclass;
module/zahost/lang/en.php
+1 -1
View File
@@ -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<br>- Click check service status button.";
$lang->zahost->init->statusTitle = "Service Status";
$lang->zahost->image = new stdclass;
module/zahost/lang/fr.php
+1 -1
View File
@@ -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<br>- Click check service status button.";
$lang->zahost->init->statusTitle = "Service Status";
$lang->zahost->image = new stdclass;
module/zahost/lang/vi.php
+1 -1
View File
@@ -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<br>- Click check service status button.";
$lang->zahost->init->initFailNoticeDesc = "1. Re-execute the script <br/>2. Review the initialization FAQ";
$lang->zahost->init->serviceStatus = [
module/zahost/lang/zh-cn.php
+1 -1
View File
@@ -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<br>- 点击检测服务状态。";
$lang->zahost->init->statusTitle = "服务状态";
$lang->zahost->image = new stdclass;
module/zahost/model.php
+1
View File
@@ -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';
module/zahost/view/browse.html.php
+1 -1
View File
@@ -74,7 +74,7 @@
<?php if(common::hasPriv('zahost', 'edit')) common::printIcon('zahost', 'edit', "hostID={$host->hostID}", $host, 'list');?>
<?php if(common::hasPriv('zahost', 'delete')) echo html::a($this->createLink('zahost', 'delete', "hostID={$host->id}"), '<i class="icon-trash"></i>', 'hiddenwin', "title='$title' class='btn $disabled'");;?>
<?php if(common::hasPriv('zahost', 'browseImage')) common::printIcon('zahost', 'browseImage', "hostID={$host->hostID}", $host, 'list', 'file', '', 'iframe', true, "data-width='60%'", $lang->zahost->image->list);?>
<?php if(common::hasPriv('zahost', 'init')) common::printIcon('zahost', 'init', "hostID={$host->hostID}", $host, 'list', 'info', '', ' init', false, "data-placement='bottom'", $lang->zahost->init->title);?>
<?php if(common::hasPriv('zahost', 'init')) common::printIcon('zahost', 'init', "hostID={$host->hostID}", $host, 'list', 'refresh', '', ' init', false, "data-placement='bottom'", $lang->zahost->init->title);?>
</td>
</tr>
<?php endforeach;?>
module/zahost/view/browseimage.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
<td class="image-progress-<?php echo zget($image, 'id', 0);?>"><?php echo $image->status == 'completed' ? '100%' : '';?></td>
<td class='c-actions'>
<?php if(common::hasPriv('zahost', 'downloadImage')) echo html::a($this->createLink('zahost', 'downloadImage', "hostID={$hostID}&imageName={$image->name}&imageID={$image->id}"), '<i class="icon-download"></i>', 'hiddenwin', zget($image, 'downloadMisc', ''));?>
<?php if(common::hasPriv('zahost', 'cancelDownload')) echo html::a($this->createLink('zahost', 'cancelDownload', "id={$image->id}"), '<i class="icon-undo"></i>', 'hiddenwin', zget($image, 'cancelMisc', ''));?>
<?php if(common::hasPriv('zahost', 'cancelDownload')) echo html::a($this->createLink('zahost', 'cancelDownload', "id={$image->id}"), '<i class="icon-close"></i>', 'hiddenwin', zget($image, 'cancelMisc', ''));?>
</td>
</tr>
<?php endforeach;?>
module/zahost/view/init.html.php
+2 -2
View File
@@ -25,8 +25,8 @@
<h4><?php echo $lang->zahost->init->descTitle; ?></h4>
<div>
<span class='dot-symbol'></span>
<span>
<?php echo $lang->zahost->init->initDesc . ' ' . $host->secret . ' -z ' . getWebRoot(true); ?>
<span class='zahost-init-desc'>
<?php echo sprintf($lang->zahost->init->initDesc, $host->secret . ' -z ' . getWebRoot(true)); ?>
</span>
</div>
<div id="statusContainer">
module/zanode/css/init.css
+3
View File
@@ -14,3 +14,6 @@
margin-left: 20px;
min-width: 100px;
}
.zahost-init-desc{
display: inline-block;
}
module/zanode/lang/zh-cn.php
+1 -2
View File
@@ -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";
$lang->zanode->init->initDesc = "- 在执行节点上执行命令：bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -s zvm -k %s<br>- 点击检测服务状态。";$lang->zanode->init->statusTitle = "Service Status";
module/zanode/view/browse.html.php
+1 -1
View File
@@ -95,7 +95,7 @@
if(common::hasPriv('zahost', 'createImage')) common::printLink('zanode', 'createImage', "zanodeID={$node->id}", "<i class='icon icon-plus'></i> ", '', "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}", "<i class='icon icon-trash'></i> ", '', "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);
?>
</td>
</tr>
module/zanode/view/init.html.php
+3 -3
View File
@@ -25,8 +25,8 @@
<h4><?php echo $lang->zanode->init->descTitle; ?></h4>
<div>
<span class='dot-symbol'></span>
<span>
<?php echo $lang->zanode->init->initDesc . ' ' . $node->secret . ' -z ' . getWebRoot(true); ?>
<span class='zahost-init-desc'>
<?php echo sprintf($lang->zanode->init->initDesc, $node->secret . ' -z ' . getWebRoot(true)); ?>
</span>
</div>
<div id="statusContainer">
@@ -35,7 +35,7 @@
<div class="text-center host-action">
<button type='button' id='checkServiceStatus' class='btn btn-info margin-top-18'><?php echo $lang->zanode->init->checkStatus; ?></button>
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, "data-app='{$app->tab}'", 'btn'); ?>
<?php echo html::backButton('' . $lang->goback, "data-app='{$app->tab}'", 'btn'); ?>
</div>
</div>
</div>