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

Merge branch 'zenops_46_tanghucheng' into zenops_46

Browse Source
This commit is contained in:
tanghucheng
2022-12-23 11:11:47 +08:00
parent 0b0215784b fde26c3abf
commit ba606b1dab
12 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/view/caseheader.html.php
+31
View File
@@ -41,6 +41,37 @@
?>
<?php if($this->app->rawMethod == 'browseunits'):?>
<?php
$caseType = 'unit';
$lang->testcase->typeList[''] = $lang->testcase->allType;
$currentTypeName = zget($lang->testcase->typeList, $caseType, '');
$currentLable = empty($currentTypeName) ? $lang->testcase->allType : $currentTypeName;
if(!isset($param)) $param = 0;
echo "<div id='byTypeTab' class='btn-group'>";
echo html::a('javascript:;', "<span class='text'>{$currentLable}</span>" . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto; width:130px;'>";
foreach($lang->testcase->typeList as $type => $typeName)
{
echo '<li' . ($type == 'unit' ? " class='active'" : '') . '>';
if($hasUnitPriv and $type == 'unit')
{
echo html::a($this->createLink('testtask', 'browseUnits', "productID=$productID&browseType=newest&orderBy=id_desc&recTotal=0&recPerPage=20&pageID=1&projectID=$projectID"), "{$lang->testcase->browseUnits}", '', " data-app='{$this->app->tab}'");
}
elseif(isset($groupBy))
{
echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story&projectID=$projectID&caseType=$type"), $typeName);
}
else
{
echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&caseType=$type"), $typeName);
}
echo "</li>";
}
echo '</ul></div>';
?>
<?php foreach($lang->testtask->unitTag as $key => $label):?>
<?php echo html::a(inlink('browseUnits', "productID=$productID&browseType=$key&orderBy=$orderBy"), "<span class='text'>$label</span>", '', "id='{$key}UnitTab' class='btn btn-link' data-app='{$this->app->tab}'");?>
<?php endforeach;?>
module/zahost/lang/de.php
+1 -1
View File
@@ -20,7 +20,7 @@ $lang->zahost->copied = 'Copy successful';
$lang->zahost->name = 'Name';
$lang->zahost->IP = 'Extranet Address';
$lang->zahost->extranet = 'Extranet Address';
$lang->zahost->cpuCores = 'CPU Cores';
$lang->zahost->cpuCores = 'CPU';
$lang->zahost->memory = 'Memory Size';
$lang->zahost->diskSize = 'Disk Size';
$lang->zahost->desc = 'Description';
module/zahost/lang/en.php
+1 -1
View File
@@ -20,7 +20,7 @@ $lang->zahost->copied = 'Copy successful';
$lang->zahost->name = 'Name';
$lang->zahost->IP = 'Extranet Address';
$lang->zahost->extranet = 'Extranet Address';
$lang->zahost->cpuCores = 'CPU Cores';
$lang->zahost->cpuCores = 'CPU';
$lang->zahost->memory = 'Memory Size';
$lang->zahost->diskSize = 'Disk Size';
$lang->zahost->desc = 'Description';
module/zahost/lang/fr.php
+1 -1
View File
@@ -20,7 +20,7 @@ $lang->zahost->copied = 'Copy successful';
$lang->zahost->name = 'Name';
$lang->zahost->IP = 'Extranet Address';
$lang->zahost->extranet = 'Extranet Address';
$lang->zahost->cpuCores = 'CPU Cores';
$lang->zahost->cpuCores = 'CPU';
$lang->zahost->memory = 'Memory Size';
$lang->zahost->diskSize = 'diskSize Size';
$lang->zahost->desc = 'Description';
module/zahost/lang/zh-cn.php
+1 -1
View File
@@ -21,7 +21,7 @@ $lang->zahost->name = '名称';
$lang->zahost->IP = 'IP/域名';
$lang->zahost->extranet = 'IP/域名';
$lang->zahost->memory = '内存';
$lang->zahost->cpuCores = 'CPU核心数';
$lang->zahost->cpuCores = 'CPU';
$lang->zahost->diskSize = '硬盘容量';
$lang->zahost->desc = '描述';
$lang->zahost->type = '类型';
module/zahost/view/browse.html.php
+1 -1
View File
@@ -65,7 +65,7 @@
<td><?php echo $host->cpuCores;?></td>
<td><?php echo $host->memory . $lang->zahost->unitList['GB'];?></td>
<td><?php echo $host->diskSize . $lang->zahost->unitList['GB'];?></td>
<td><?php echo $host->vsoft;?></td>
<td><?php echo zget($lang->zahost->softwareList, $host->vsoft);?></td>
<td class="status-<?php echo $host->status;?>"><?php echo zget($lang->host->statusList, $host->status);?></td>
<td><?php echo helper::isZeroDate($host->heartbeat) ? '' : $host->heartbeat;?></td>
<td class='c-actions'>
module/zanode/css/browse.css
+1 -2
View File
@@ -4,5 +4,4 @@
.c-cpu, .c-host {width: 100px;}
.c-ip{width: 150px;}
.c-os {width: 120px;}
.c-actions-7{width: 205px;}
.createImage{margin-right: 4px;margin-left: 0px!important;}
.desktop, .createImage{margin-right: 4px;}
module/zanode/lang/de.php
+1 -1
View File
@@ -23,7 +23,7 @@ $lang->zanode->hostName = 'Host Name';
$lang->zanode->host = $lang->zanode->hostName;
$lang->zanode->extranet = 'IP/Domain';
$lang->zanode->osArch = 'Arch';
$lang->zanode->cpuCores = 'CPU Cores';
$lang->zanode->cpuCores = 'CPU';
$lang->zanode->memory = 'Memory Size';
$lang->zanode->desc = 'Description';
$lang->zanode->diskSize = 'Disk Size';
module/zanode/lang/en.php
+1 -1
View File
@@ -23,7 +23,7 @@ $lang->zanode->hostName = 'Host Name';
$lang->zanode->host = $lang->zanode->hostName;
$lang->zanode->extranet = 'IP/Domain';
$lang->zanode->osArch = 'Arch';
$lang->zanode->cpuCores = 'CPU Cores';
$lang->zanode->cpuCores = 'CPU';
$lang->zanode->memory = 'Memory Size';
$lang->zanode->desc = 'Description';
$lang->zanode->diskSize = 'Disk Size';
module/zanode/lang/fr.php
+1 -1
View File
@@ -23,7 +23,7 @@ $lang->zanode->hostName = 'Host Name';
$lang->zanode->host = $lang->zanode->hostName;
$lang->zanode->extranet = 'IP/Domain';
$lang->zanode->osArch = 'Arch';
$lang->zanode->cpuCores = 'CPU Cores';
$lang->zanode->cpuCores = 'CPU';
$lang->zanode->memory = 'Memory Size';
$lang->zanode->desc = 'Description';
$lang->zanode->diskSize = 'Disk Size';
module/zanode/lang/zh-cn.php
+1 -1
View File
@@ -23,7 +23,7 @@ $lang->zanode->hostName = '所属宿主机';
$lang->zanode->host = $lang->zanode->hostName;
$lang->zanode->extranet = 'IP/域名';
$lang->zanode->osArch = '架构';
$lang->zanode->cpuCores = 'CPU核心数';
$lang->zanode->cpuCores = 'CPU';
$lang->zanode->memory = '内存';
$lang->zanode->diskSize = '硬盘';
$lang->zanode->desc = '描述';
module/zanode/view/browse.html.php
+12 -5
View File
@@ -57,7 +57,7 @@
<th class='c-os'><?php common::printOrderLink('t1.osName', $orderBy, $vars, $lang->zanode->osName); ?></th>
<th class='c-status'><?php common::printOrderLink('t1.status', $orderBy, $vars, $lang->zanode->status); ?></th>
<th class='c-host'><?php common::printOrderLink('t2.name', $orderBy, $vars, $lang->zanode->hostName); ?>
<th class='c-actions-7 text-center'><?php echo $lang->actions ?></th>
<th class='c-actions-5 text-center'><?php echo $lang->actions ?></th>
</tr>
</thead>
<tbody>
@@ -83,6 +83,7 @@
$rebootAttr = "title='{$lang->zanode->reboot}' target='hiddenwin'";
$rebootAttr .= $node->status != 'running' ? ' 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')) ? '':'disabled') . "'", '');
if($node->status == "suspend")
{
common::printLink('zanode', 'resume', "zanodeID={$node->id}", "<i class='icon icon-back'></i> ", '', $resumeAttr);
@@ -91,12 +92,18 @@
{
common::printLink('zanode', 'suspend', "zanodeID={$node->id}", "<i class='icon icon-pause'></i> ", '', $suspendAttr);
}
common::printLink('zanode', 'reboot', "zanodeID={$node->id}", "<i class='icon icon-restart'></i> ", '', $rebootAttr);
common::printLink('zanode', 'getVNC', "id={$node->id}", "<i class='icon icon-desktop'></i> ", '_blank', "title='{$lang->zanode->getVNC}' class='btn " . (in_array($node->status ,array('running', 'launch')) ? '':'disabled') . "'", '');
common::printLink('zanode', 'createImage', "zanodeID={$node->id}", "<i class='icon icon-export'></i> ", '', "class='btn iframe createImage' title='{$lang->zanode->createImage}' data-width='50%'", '', true);
common::printIcon('zanode', 'edit', "id={$node->id}", $node, 'list');
common::printLink('zanode', 'delete', "zanodeID={$node->id}", "<i class='icon icon-trash'></i> ", '', "title='{$lang->zanode->destroy}' class='btn btn-primary' target='hiddenwin'");
common::printIcon('zanode', 'init', "hostID={$node->id}", $node, 'list', 'refresh', '', ' init', false, "data-placement='bottom'", $lang->zanode->init->title);
echo "<div class='btn-group'>";
echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-ellipsis-v'></i></button>";
echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
common::printLink('zanode', 'createImage', "zanodeID={$node->id}", "<i class='icon icon-export'></i> ", '', "class='btn btn-action iframe createImage' title='{$lang->zanode->createImage}' data-width='50%'", '', true);
common::printIcon('zanode', 'init', "hostID={$node->id}", $node, 'list', 'refresh', '', 'btn btn-action init', false, "data-placement='bottom'", $lang->zanode->init->title);
common::printLink('zanode', 'delete', "zanodeID={$node->id}", "<i class='icon icon-trash'></i> ", '', "title='{$lang->zanode->destroy}' class='btn btn-action' target='hiddenwin'");
echo "</ul>";
echo "</div>";
?>
</td>
</tr>