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

Merge branch 'zenops_46' into 'master'

Browse Source 
Merge branch 'zenops_46'  into master

See merge request easycorp/zentaopms!6678
This commit is contained in:
孙广明
2023-01-04 06:34:17 +00:00
parent aead5a6372 b56690bd77
commit 7a65ef1358
25 changed files with 347 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/de.php
+2 -1
View File
@@ -410,6 +410,7 @@ $lang->action->label->submitreview = 'submitted';
$lang->action->label->suspend = 'suspended';
$lang->action->label->resume = 'resumed';
$lang->action->label->reboot = 'reboot';
$lang->action->label->boot = 'boot';
$lang->action->label->destroy = 'destroyed';
$lang->action->label->getvnc = 'remote control';
$lang->action->label->synctwins = 'synchronized changes';
@@ -652,7 +653,7 @@ $lang->action->dynamicAction->zanode['created'] = 'Create Zagent Node';
$lang->action->dynamicAction->zanode['suspend'] = 'Suspend Zagent Node';
$lang->action->dynamicAction->zanode['resume'] = 'Resume Zagent Node';
$lang->action->dynamicAction->zanode['reboot'] = 'Reboot Zagent Node';
$lang->action->dynamicAction->zanode['boot'] = 'Start Zagent Node';
$lang->action->dynamicAction->zanode['boot'] = 'Boot Zagent Node';
$lang->action->dynamicAction->zanode['destroy'] = 'Destory Zagent Node';
$lang->action->dynamicAction->doclib['created'] = 'Create Doc Library';
module/action/lang/en.php
+2 -1
View File
@@ -410,6 +410,7 @@ $lang->action->label->submitreview = 'submitted';
$lang->action->label->suspend = 'suspended';
$lang->action->label->resume = 'resumed';
$lang->action->label->reboot = 'reboot';
$lang->action->label->boot = 'boot';
$lang->action->label->destroy = 'destroyed';
$lang->action->label->getvnc = 'remote control';
$lang->action->label->synctwins = 'synchronized changes';
@@ -652,7 +653,7 @@ $lang->action->dynamicAction->zanode['created'] = 'Create Zagent Node';
$lang->action->dynamicAction->zanode['suspend'] = 'Suspend Zagent Node';
$lang->action->dynamicAction->zanode['resume'] = 'Resume Zagent Node';
$lang->action->dynamicAction->zanode['reboot'] = 'Reboot Zagent Node';
$lang->action->dynamicAction->zanode['boot'] = 'Start Zagent Node';
$lang->action->dynamicAction->zanode['boot'] = 'Boot Zagent Node';
$lang->action->dynamicAction->zanode['destroy'] = 'Destory Zagent Node';
$lang->action->dynamicAction->doclib['created'] = 'Create Doc Library';
module/action/lang/fr.php
+2 -1
View File
@@ -410,6 +410,7 @@ $lang->action->label->submitreview = 'submitted';
$lang->action->label->suspend = 'suspended';
$lang->action->label->resume = 'resumed';
$lang->action->label->reboot = 'reboot';
$lang->action->label->boot = 'boot';
$lang->action->label->destroy = 'destroyed';
$lang->action->label->getvnc = 'remote control';
$lang->action->label->synctwins = 'synchronized changes';
@@ -652,7 +653,7 @@ $lang->action->dynamicAction->zanode['created'] = 'Create Zagent Node';
$lang->action->dynamicAction->zanode['suspend'] = 'Suspend Zagent Node';
$lang->action->dynamicAction->zanode['resume'] = 'Resume Zagent Node';
$lang->action->dynamicAction->zanode['reboot'] = 'Reboot Zagent Node';
$lang->action->dynamicAction->zanode['boot'] = 'Start Zagent Node';
$lang->action->dynamicAction->zanode['boot'] = 'Boot Zagent Node';
$lang->action->dynamicAction->zanode['destroy'] = 'Destory Zagent Node';
$lang->action->dynamicAction->doclib['created'] = 'Créer Doc Library';
module/action/lang/vi.php
+3
View File
@@ -191,6 +191,7 @@ $lang->action->desc->suspend = '$date, the ZenAgent Node is suspended by
$lang->action->desc->resume = '$date, the ZenAgent Node is resumed by <strong>$actor</strong> .' . "\n";
$lang->action->desc->reboot = '$date, the ZenAgent Node is reboot by <strong>$actor</strong> .' . "\n";
$lang->action->desc->destroy = '$date, the ZenAgent Node is destroyed by <strong>$actor</strong> .' . "\n";
$lang->action->desc->boot = '$date, the ZenAgent Node is boot by <strong>$actor</strong> .' . "\n";
/* Used to describe the history of operations related to parent-child tasks. */
$lang->action->desc->createchildren = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
@@ -318,6 +319,7 @@ $lang->action->label->submitreview = 'submitted';
$lang->action->label->suspend = 'suspended';
$lang->action->label->resume = 'resumed';
$lang->action->label->reboot = 'reboot';
$lang->action->label->boot = 'boot';
$lang->action->label->destroy = 'destroyed';
$lang->action->label->synctwins = 'synchronized changes';
$lang->action->label->linkedrepo = 'Linked Code Repo';
@@ -501,6 +503,7 @@ $lang->action->dynamicAction->zanode['created'] = 'Create Zagent Node';
$lang->action->dynamicAction->zanode['suspend'] = 'Suspend Zagent Node';
$lang->action->dynamicAction->zanode['resume'] = 'Resume Zagent Node';
$lang->action->dynamicAction->zanode['reboot'] = 'Reboot Zagent Node';
$lang->action->dynamicAction->zanode['boot'] = 'Boot Zagent Node';
$lang->action->dynamicAction->zanode['destroy'] = 'Destory Zagent Node';
$lang->action->dynamicAction->doclib['created'] = 'Tạo Doc thư viện';
module/action/lang/zh-cn.php
+1
View File
@@ -410,6 +410,7 @@ $lang->action->label->submitreview = '提交了评审';
$lang->action->label->suspend = '休眠了';
$lang->action->label->resume = '恢复了';
$lang->action->label->reboot = '重启了';
$lang->action->label->boot = '启动了';
$lang->action->label->destroy = '关闭了';
$lang->action->label->getvnc = '远程操控';
$lang->action->label->synctwins = '同步修改了';
module/testcase/view/browse.html.php
+1 -1
View File
@@ -78,7 +78,7 @@ js::set('cancelURL', $this->createLink('testtask', 'batchRun', "productID=$
<nav class="btn-toolbar pull-right setting"></nav>
</div>
<?php
$vars = $projectParam . "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
$vars = $projectParam . "productID=$productID&branch=$branch&browseType=$browseType&param=$param&caseType=$caseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
if($useDatatable) include '../../common/view/datatable.html.php';
else include '../../common/view/tablesorter.html.php';
module/testcase/view/caseheader.html.php
+1 -1
View File
@@ -69,7 +69,7 @@
}
else
{
echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&caseType=$type"), $typeName);
echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=all&param=$param&caseType=$type"), $typeName);
}
echo "</li>";
}
module/zahost/config.php
+3 -3
View File
@@ -18,11 +18,11 @@ global $lang;
$config->zahost->search['module'] = 'zahost';
$config->zahost->search['fields']['name'] = $lang->zahost->name;
$config->zahost->search['fields']['id'] = $lang->zahost->id;
$config->zahost->search['fields']['type'] = $lang->zahost->type;
$config->zahost->search['fields']['extranet'] = $lang->zahost->IP;
$config->zahost->search['fields']['cpuCores'] = $lang->zahost->cpuCores;
$config->zahost->search['fields']['memory'] = $lang->zahost->memory;
$config->zahost->search['fields']['diskSize'] = $lang->zahost->diskSize;
$config->zahost->search['fields']['hostType'] = $lang->zahost->type;
$config->zahost->search['fields']['vsoft'] = $lang->zahost->vsoft;
$config->zahost->search['fields']['status'] = $lang->zahost->status;
$config->zahost->search['fields']['createdBy'] = $lang->zahost->createdBy;
@@ -33,12 +33,12 @@ $config->zahost->search['fields']['editedDate'] = $lang->zahost->editedDate
$config->zahost->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->zahost->search['params']['id'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->zahost->search['params']['type'] = array('operator' => '=', 'control' => 'input', 'values' => $lang->zahost->zaHostType);
$config->zahost->search['params']['extranet'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->zahost->search['params']['cpuCores'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->zahost->search['params']['memory'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->zahost->search['params']['diskSize'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->zahost->search['params']['vsoft'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->zahost->search['params']['hostType'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->zahost->zaHostTypeList);
$config->zahost->search['params']['vsoft'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->zahost->softwareList);
$config->zahost->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->zahost->statusList);
$config->zahost->search['params']['instanceNum'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->zahost->search['params']['createdBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
module/zahost/css/view.css
+5 -2
View File
@@ -13,7 +13,10 @@
.fail{color:red;}
.dot-symbol{padding-right:10px;}
#statusContainer{margin:0px 0px 10px 0px;}
#checkServiceStatus{background-color: #ffffff;}
#checkServiceStatus:hover{background-color: #f0fdfb;}
#serviceContent{overflow: hidden;}
.service-check{margin-top: 0px;}
.checkStatus{color: #313c52;}
.btn-info {background-color: unset;}
.icon-refresh {font-size: 15px;}
.load-indicator:after {top: 33%;}
.c-number {width: 120px;}
module/zahost/lang/de.php
+2 -2
View File
@@ -128,7 +128,7 @@ $lang->zahost->notice->registerCommand = 'Register command: ./zagent-host -t hos
$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.';
$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.';
$lang->zahost->automation = new stdclass();
$lang->zahost->automation->title = 'Test Automation Solutions';
@@ -138,7 +138,7 @@ $lang->zahost->automation->framework = 'Framework';
$lang->zahost->automation->frameworkSpec = 'The solution architecture based on the KVM virtualization software:';
$lang->zahost->automation->feature1 = '1、Core concepts';
$lang->zahost->automation->feature1Spec = "Hosts include physical hosts, k8s clusters, cloud servers, and cloud container instances, which are mainly used to create virtual machines or container instances. The recommended operating system for the host is ubuntu or the LTS version of CentOS.<br/> An execution node is a virtual machine or container instance created by the host and is a test environment where test tasks are executed.";
$lang->zahost->automation->feature1Spec = "Hosts include physical hosts, K8s clusters, cloud servers, and cloud container instances, which are mainly used to create virtual machines or container instances. The recommended operating system for the host is Ubuntu or the LTS version of CentOS.<br/> An execution node is a virtual machine or container instance created by the host and is a test environment where test tasks are executed.";
$lang->zahost->automation->feature2 = '2、Application introduction';
$lang->zahost->automation->feature2ZenAgent = 'ZenAgent is an open source software test automation and scheduling platform, which provides users with a distributed and centrally managed test environment with the help of virtualization technology.';
$lang->zahost->automation->feature2ZTF = 'ZTF is an open source automated test management framework of Zen Tao, which helps users to manage test scripts in a unified way. ZTF is deeply integrated with Zen Tao, each script can be associated with a use case in the test management system, and the step information in the script and the use case information in the management system can be synchronized with each other.';
module/zahost/lang/en.php
+2 -2
View File
@@ -128,7 +128,7 @@ $lang->zahost->notice->registerCommand = 'Register command: ./zagent-host -t hos
$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.';
$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.';
$lang->zahost->automation = new stdclass();
$lang->zahost->automation->title = 'Test Automation Solutions';
@@ -138,7 +138,7 @@ $lang->zahost->automation->framework = 'Framework';
$lang->zahost->automation->frameworkSpec = 'The solution architecture based on the KVM virtualization software:';
$lang->zahost->automation->feature1 = '1、Core concepts';
$lang->zahost->automation->feature1Spec = "Hosts include physical hosts, k8s clusters, cloud servers, and cloud container instances, which are mainly used to create virtual machines or container instances. The recommended operating system for the host is ubuntu or the LTS version of CentOS.<br/> An execution node is a virtual machine or container instance created by the host and is a test environment where test tasks are executed.";
$lang->zahost->automation->feature1Spec = "Hosts include physical hosts, K8s clusters, cloud servers, and cloud container instances, which are mainly used to create virtual machines or container instances. The recommended operating system for the host is Ubuntu or the LTS version of CentOS.<br/> An execution node is a virtual machine or container instance created by the host and is a test environment where test tasks are executed.";
$lang->zahost->automation->feature2 = '2、Application introduction';
$lang->zahost->automation->feature2ZenAgent = 'ZenAgent is an open source software test automation and scheduling platform, which provides users with a distributed and centrally managed test environment with the help of virtualization technology.';
$lang->zahost->automation->feature2ZTF = 'ZTF is an open source automated test management framework of Zen Tao, which helps users to manage test scripts in a unified way. ZTF is deeply integrated with Zen Tao, each script can be associated with a use case in the test management system, and the step information in the script and the use case information in the management system can be synchronized with each other.';
module/zahost/lang/fr.php
+2 -2
View File
@@ -128,7 +128,7 @@ $lang->zahost->notice->registerCommand = 'Register command: ./zagent-host -t hos
$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.';
$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.';
$lang->zahost->automation = new stdclass();
$lang->zahost->automation->title = 'Test Automation Solutions';
@@ -138,7 +138,7 @@ $lang->zahost->automation->framework = 'Framework';
$lang->zahost->automation->frameworkSpec = 'The solution architecture based on the KVM virtualization software:';
$lang->zahost->automation->feature1 = '1、Core concepts';
$lang->zahost->automation->feature1Spec = "Hosts include physical hosts, k8s clusters, cloud servers, and cloud container instances, which are mainly used to create virtual machines or container instances. The recommended operating system for the host is ubuntu or the LTS version of CentOS.<br/> An execution node is a virtual machine or container instance created by the host and is a test environment where test tasks are executed.";
$lang->zahost->automation->feature1Spec = "Hosts include physical hosts, K8s clusters, cloud servers, and cloud container instances, which are mainly used to create virtual machines or container instances. The recommended operating system for the host is Ubuntu or the LTS version of CentOS.<br/> An execution node is a virtual machine or container instance created by the host and is a test environment where test tasks are executed.";
$lang->zahost->automation->feature2 = '2、Application introduction';
$lang->zahost->automation->feature2ZenAgent = 'ZenAgent is an open source software test automation and scheduling platform, which provides users with a distributed and centrally managed test environment with the help of virtualization technology.';
$lang->zahost->automation->feature2ZTF = 'ZTF is an open source automated test management framework of Zen Tao, which helps users to manage test scripts in a unified way. ZTF is deeply integrated with Zen Tao, each script can be associated with a use case in the test management system, and the step information in the script and the use case information in the management system can be synchronized with each other.';
module/zahost/lang/zh-cn.php
+2 -2
View File
@@ -128,7 +128,7 @@ $lang->zahost->notice->registerCommand = '宿主机注册命令：./zagent-host
$lang->zahost->notice->loading = '加载中...';
$lang->zahost->notice->noImage = '无可用的镜像文件';
$lang->zahost->tips = '宿主机包括实体主机、k8s集群、云服务器以及云容器实例，主要用于创建虚拟机或容器实例。宿主机推荐安装的操作系统为ubuntu或CentOS的LTS版本。';
$lang->zahost->tips = '宿主机包括实体主机、K8s集群、云服务器以及云容器实例，主要用于创建虚拟机或容器实例。宿主机推荐安装的操作系统为Ubuntu或CentOS的LTS版本。';
$lang->zahost->automation = new stdclass();
$lang->zahost->automation->title = '自动化测试解决方案';
@@ -138,7 +138,7 @@ $lang->zahost->automation->framework = '架构';
$lang->zahost->automation->frameworkSpec = '基于KVM虚拟化软件的解决方案架构：';
$lang->zahost->automation->feature1 = '1、核心概念';
$lang->zahost->automation->feature1Spec = "宿主机包括实体主机、k8s集群、云服务器以及云容器实例，主要用于创建虚拟机或容器实例。宿主机推荐安装的操作系统为ubuntu或CentOS的LTS版本。<br/> 执行节点是由宿主机创建的虚拟机或容器实例，是执行测试任务的测试环境。";
$lang->zahost->automation->feature1Spec = "宿主机包括实体主机、K8s集群、云服务器以及云容器实例，主要用于创建虚拟机或容器实例。宿主机推荐安装的操作系统为Ubuntu或CentOS的LTS版本。<br/> 执行节点是由宿主机创建的虚拟机或容器实例，是执行测试任务的测试环境。";
$lang->zahost->automation->feature2 = '2、应用介绍';
$lang->zahost->automation->feature2ZenAgent = 'ZenAgent是禅道开源的软件自动化测试调度平台，它借助虚拟化技术，为用户提供了一个分布式、集中管理的的测试环境。';
$lang->zahost->automation->feature2ZTF = 'ZTF是禅道开源的自动化测试管理框架，它帮助用户将测试脚本统一管理。ZTF与禅道深度集成，每一个脚本都可以和测试管理系统里面的一个用例进行关联，脚本里面的步骤信息和管理系统里面的用例信息可以互相同步。';
module/zahost/model.php
+7 -3
View File
@@ -20,7 +20,7 @@ class zahostModel extends model
public function __construct()
{
parent::__construct();
$this->app->lang->host = $this->lang->zahost;
$this->app->lang->host = $this->lang->zahost;
}
/**
@@ -540,14 +540,18 @@ class zahostModel extends model
public function buildOperateViewMenu($host)
{
if($host->deleted) return '';
$nodeList = $this->loadModel('zanode')->getListByHost($host->id);
$disabled = '';
$title = !empty($nodeList) ? $this->lang->zahost->undeletedNotice : $this->lang->zahost->delete;
if($nodeList) $disabled = 'disabled';
$menu = '';
$params = "hostID=$host->id";
$menu .= $this->buildMenu('zahost', 'browseImage', $params, $host, 'view', 'snap-house', '', 'iframe', true, '', $this->lang->zahost->image->browseImage);
$menu .= $this->buildMenu('zahost', 'browseImage', $params, $host, 'view', 'mirror', '', 'iframe', true, '', $this->lang->zahost->image->browseImage);
$menu .= "<div class='divider'></div>";
$menu .= $this->buildMenu('zahost', 'edit', $params, $host, 'view');
$menu .= $this->buildMenu('zahost', 'delete', $params, $host, 'view', 'trash', 'hiddenwin');
$menu .= $this->buildMenu('zahost', 'delete', $params, $host, 'view', 'trash', 'hiddenwin', $disabled, true, '', $title);
return $menu;
}
module/zahost/view/browse.html.php
+3 -3
View File
@@ -52,8 +52,8 @@
<th class='c-memory'> <?php common::printOrderLink('memory', $orderBy, $vars, $lang->zahost->memory);?></th>
<th class='c-diskSize'> <?php common::printOrderLink('diskSize', $orderBy, $vars, $lang->zahost->diskSize);?></th>
<th class='c-software'> <?php common::printOrderLink('vsoft', $orderBy, $vars, $lang->zahost->vsoft);?></th>
<th class='c-status'> <?php common::printOrderLink('t2.status', $orderBy, $vars, $lang->zahost->status);?></th>
<th class='c-datetime'> <?php common::printOrderLink('registerDate', $orderBy, $vars, $lang->zahost->registerDate);?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->zahost->status);?></th>
<th class='c-datetime'> <?php common::printOrderLink('heartbeat', $orderBy, $vars, $lang->zahost->registerDate);?></th>
<th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
@@ -73,7 +73,7 @@
<td class='c-actions'>
<?php $disabled = ($host->status == 'wait') ? 'disabled' : '';?>
<?php $title = ($host->status == 'wait') ? $lang->zahost->uninitNotice: $lang->zahost->image->browseImage;?>
<?php common::printIcon('zahost', 'browseImage', "hostID={$host->hostID}", $host, 'list', 'snap-house', '', "iframe $disabled", true, "data-width='60%'", $title);?>
<?php common::printIcon('zahost', 'browseImage', "hostID={$host->hostID}", $host, 'list', 'mirror', '', "iframe $disabled", true, "data-width='60%'", $title);?>
<?php $disabled = !empty($nodeList[$host->hostID]) ? 'disabled' : '';?>
<?php $title = !empty($nodeList[$host->hostID]) ? $lang->zahost->undeletedNotice : $lang->zahost->delete;?>
<?php common::printIcon('zahost', 'edit', "hostID={$host->hostID}", $host, 'list');?>
module/zanode/control.php
-1
View File
@@ -68,7 +68,6 @@ class zanode extends control
*/
public function create($hostID = 0)
{
$this->loadModel('zahost');
if(!empty($_POST))
{
$nodeID = $this->zanode->create();
module/zanode/css/view.css
+1 -2
View File
@@ -12,7 +12,6 @@
.service-status{margin-top: 10px;}
.vnc-detail{height: 60vh;min-height: 550px;}
.vnc-mask{width: 100%;height:100%;background-color: rgba(0,0,0,0);position: absolute;z-index: 1;}
#checkServiceStatus{background-color: #ffffff;}
#checkServiceStatus:hover{background-color: #f0fdfb;}
.checkStatus{color: #313c52;}
.node-not-wrap{white-space: nowrap;}
.btn-info {background-color: unset;}
module/zanode/model.php
+11
View File
@@ -28,6 +28,17 @@ class zanodemodel extends model
const KVM_EXPORT_PATH = '/api/v1/kvm/exportVm';
const KVM_STATUS_PATH = '/api/v1/task/getStatus';
/**
* Set lang;
*
* @access public
* @return void
*/
public function __construct()
{
parent::__construct();
$this->app->lang->host = $this->lang->zanode;
}
/**
* Create an Node.
module/zanode/view/browse.html.php
+4 -4
View File
@@ -85,19 +85,19 @@
$rebootAttr = "title='{$lang->zanode->reboot}' target='hiddenwin'";
$rebootAttr .= $node->status == 'shutoff' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmReboot}\")==false) return false;'";
common::printLink('zanode', 'getVNC', "id={$node->id}", "<i class='icon icon-desktop'></i> ", '_blank', "title='{$lang->zanode->getVNC}' class='btn desktop " . (in_array($node->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", '');
common::printLink('zanode', 'getVNC', "id={$node->id}", "<i class='icon icon-remote'></i> ", '_blank', "title='{$lang->zanode->getVNC}' class='btn desktop " . (in_array($node->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", '');
if($node->status == "suspend")
{
common::printLink('zanode', 'resume', "zanodeID={$node->id}", "<i class='icon icon-back'></i> ", '', $resumeAttr);
common::printLink('zanode', 'resume', "zanodeID={$node->id}", "<i class='icon icon-spinner-indicator'></i> ", '', $resumeAttr);
}
else
{
common::printLink('zanode', 'suspend', "zanodeID={$node->id}", "<i class='icon icon-pause'></i> ", '', $suspendAttr);
common::printLink('zanode', 'suspend', "zanodeID={$node->id}", "<i class='icon icon-moon'></i> ", '', $suspendAttr);
}
if($node->status == "shutoff")
{
common::printLink('zanode', 'start', "zanodeID={$node->id}", "<i class='icon icon-magic'></i> ", '', "class='btn ' title='{$lang->zanode->boot}'");
common::printLink('zanode', 'start', "zanodeID={$node->id}", "<i class='icon icon-play'></i> ", '', "class='btn ' title='{$lang->zanode->boot}'");
}
else
{
module/zanode/view/view.html.php
+6 -6
View File
@@ -57,7 +57,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
<div class="col-3 text-right"><?php echo $lang->zanode->sshAddress; ?>:</div>
<div class="col-8 node-not-wrap">ssh <?php echo $account . '@' . $zanode->ip . ' -p ' . $zanode->ssh; ?> &nbsp; <?php echo "<button type='button' class='btn btn-info btn-mini btn-ssh-copy'><i class='icon-common-copy icon-copy' title='" . $lang->zanode->copy . "'></i></button>"; ?></div>
</div>
<textarea style="display:none;" id="ssh-copy"><?php echo $account . '@' . $zanode->ip . ' -p ' . $zanode->ssh; ?></textarea>
<textarea style="display:none;" id="ssh-copy">ssh <?php echo $account . '@' . $zanode->ip . ' -p ' . $zanode->ssh; ?></textarea>
</div>
<div class="col-4">
<div class="main-row">
@@ -133,7 +133,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
<span class='dot-symbol dot-ztf text-danger'>●</span>
<span>&nbsp;&nbsp;ZTF &nbsp;
<span class="ztf-status"><?php echo $lang->zanode->initializing; ?></span>&nbsp;
<a class='node-init-install hide' target='hiddenwin' herf='javascript:;' data-href='<?php echo $this->createLink('zanode', 'ajaxInstallService', 'nodeID=' . $zanode->id . '&service=ztf');?>'><i class="icon icon-download icon-sm"></i><span class="ztf-install"><?php echo $lang->zanode->install ?></span></a>
<a class='node-init-install hide' target='hiddenwin' href='javascript:;' data-href='<?php echo $this->createLink('zanode', 'ajaxInstallService', 'nodeID=' . $zanode->id . '&service=ztf');?>'><i class="icon icon-download icon-sm"></i><span class="ztf-install"><?php echo $lang->zanode->install ?></span></a>
</span>
</div>
<div class="status-notice">
@@ -164,20 +164,20 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
$rebootAttr = "title='{$lang->zanode->reboot}' target='hiddenwin'";
$rebootAttr .= $zanode->status == 'shutoff' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmReboot}\")==false) return false;'";
common::printLink('zanode', 'getVNC', "id={$zanode->id}", "<i class='icon icon-desktop'></i> " . $lang->zanode->getVNC, '_blank', "title='{$lang->zanode->getVNC}' class='btn desktop " . (in_array($zanode->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", '');
common::printLink('zanode', 'getVNC', "id={$zanode->id}", "<i class='icon icon-remote'></i> " . $lang->zanode->getVNC, in_array($zanode->status ,array('running', 'launch', 'wait')) ? '_blank' : '', "title='{$lang->zanode->getVNC}' class='btn desktop " . (in_array($zanode->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", '');
if($zanode->status == "suspend")
{
common::printLink('zanode', 'resume', "zanodeID={$zanode->id}", "<i class='icon icon-back'></i> " . $lang->zanode->resumeNode, '', $resumeAttr);
common::printLink('zanode', 'resume', "zanodeID={$zanode->id}", "<i class='icon icon-spinner-indicator'></i> " . $lang->zanode->resumeNode, '', $resumeAttr);
}
else
{
common::printLink('zanode', 'suspend', "zanodeID={$zanode->id}", "<i class='icon icon-pause'></i> " . $lang->zanode->suspendNode, '', $suspendAttr);
common::printLink('zanode', 'suspend', "zanodeID={$zanode->id}", "<i class='icon icon-moon'></i> " . $lang->zanode->suspendNode, '', $suspendAttr);
}
if($zanode->status == "shutoff")
{
common::printLink('zanode', 'start', "zanodeID={$zanode->id}", "<i class='icon icon-magic'></i> " . $lang->zanode->bootNode, '', "title='{$lang->zanode->boot}' class='btn '");
common::printLink('zanode', 'start', "zanodeID={$zanode->id}", "<i class='icon icon-play'></i> " . $lang->zanode->bootNode, '', "title='{$lang->zanode->boot}' class='btn '");
}
else
{
www/theme/zui/css/min.css
+3 -3
View File
File diff suppressed because one or more lines are too long
www/theme/zui/fonts/ZentaoIcon.eot
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.svg
+284 -281
View File
File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 262 KiB

After

Width:  |  Height:  |  Size: 264 KiB

www/theme/zui/fonts/ZentaoIcon.ttf
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.woff
BIN
View File
Binary file not shown.