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

* Adjust tabbar style of devops.

Browse Source
This commit is contained in:
zhaoke
2023-08-29 16:06:47 +08:00
parent 1996447337
commit a78194f9fd
8 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/account/css/common.ui.css
+2 -1
View File
@@ -1,7 +1,8 @@
#accountCreateForm .form-row {max-width: 500px;}
#mainNavbar>.container {padding-top: 8px}
#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
#mainNavbar .nav {justify-content: left; position: relative; left: 0px; top: -4px;}
@media (min-width: 1400px){#mainNavbar .nav {left: -12px;}}
#mainNavbar {background: none;}
#mainNavbar .nav-item>a {padding-right: 0.5rem}
#mainNavbar .nav-item>.active {color: unset; font-weight: 700;}
module/host/css/common.ui.css
+2 -1
View File
@@ -2,7 +2,8 @@
#hostCreateForm .form-row:last-child {width: 66%;}
#mainNavbar>.container {padding-top: 8px}
#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
#mainNavbar .nav {justify-content: left; position: relative; left: 0px; top: -4px;}
@media (min-width: 1400px){#mainNavbar .nav {left: -12px;}}
#mainNavbar {background: none;}
#mainNavbar .nav-item>a {padding-right: 0.5rem}
#mainNavbar .nav-item>.active {color: unset; font-weight: 700;}
module/instance/config.php
+1 -1
View File
@@ -45,7 +45,7 @@ $config->instance->actionList['visit']['icon'] = 'menu-my';
$config->instance->actionList['visit']['hint'] = $lang->instance->visit;
$config->instance->actionList['visit']['text'] = $lang->instance->visit;
$config->instance->actionList['visit']['target'] = '_blank';
$config->instance->actionList['visit']['url'] = array('module' => 'instance', 'method' => 'visit', 'params' => 'id={id}');
$config->instance->actionList['visit']['url'] = array('module' => 'instance', 'method' => 'visit', 'params' => 'id={id}&externalID={externalID}');
$config->instance->actionList['upgrade']['icon'] = 'refresh';
$config->instance->actionList['upgrade']['data-toggle'] = 'modal';
module/instance/control.php
+7 -1
View File
@@ -48,16 +48,22 @@ class instance extends control
$instance = $this->loadModel('gitea')->getByID($id);
$instance->status = '';
$instance->source = 'user';
$instance->type = 'external';
$instance->externalID = $instance->id;
$instance->runDuration = 0;
$instance->createdAt = $instance->createdDate;
$instanceMetric = new stdclass();
$instanceMetric->cpu = 0;
$instanceMetric->memory = 0;
$this->view->title = $instance->name;
$this->view->instance = $instance;
$this->view->cloudApp = array();
$this->view->seniorAppList = array();
$this->view->actions = $this->loadModel('action')->getList($instance->type, $id);
$this->view->defaultAccount = '';
$this->view->instanceMetric = '';
$this->view->instanceMetric = $instanceMetric;
$this->view->currentResource = '';
$this->view->customItems = array();
$this->view->backupList = array();
module/instance/model.php
+6 -20
View File
@@ -1710,13 +1710,13 @@ class InstanceModel extends model
*
* @param object $instance
* @param object $metrics
* @param string $type 'bar' is progress bar, 'pie' is progress pie.
* @static
* @access public
* @return mixed
*/
public static function printCpuUsage($instance, $metrics, $type = 'bar')
public static function printCpuUsage($instance, $metrics)
{
if($instance->source === 'user') return array('color' => '', 'tip' => '', 'rate' => '', 'usage' => '', 'limit' => '');
$rate = $instance->status == 'stopped' ? 0 : $metrics->rate;
$tip = "{$rate}% = {$metrics->usage} / {$metrics->limit}";
@@ -1726,14 +1726,7 @@ class InstanceModel extends model
if(empty($color) && $rate >= 0 && $rate < 90) $color = 'important';
if(empty($color) && $rate >= 80) $color = 'danger';
if($type == 'array') return array('color' => $color, 'tip' => $tip, 'rate' => $rate . '%', 'usage' => $metrics->usage, 'limit' => $metrics->limit);
if(strtolower($type) == 'pie') commonModel::printProgressPie($rate, '', $tip);
$valueType = 'percent';
if($instance->status == 'stopped') $valueType = '';
commonModel::printProgressBar($rate, '', $tip, $valueType);
return array('color' => $color, 'tip' => $tip, 'rate' => $rate . '%', 'usage' => $metrics->usage, 'limit' => $metrics->limit);
}
/**
@@ -1741,13 +1734,13 @@ class InstanceModel extends model
*
* @param object $instance
* @param object $metrics
* @param string $type 'bar' is progress bar, 'pie' is progress pie.
* @static
* @access public
* @return mixed
*/
public static function printMemUsage($instance, $metrics, $type = 'bar')
public static function printMemUsage($instance, $metrics)
{
if($instance->source === 'user') return array('color' => '', 'tip' => '', 'rate' => '', 'usage' => '', 'limit' => '');
$rate = $instance->status == 'stopped' ? 0 : $metrics->rate;
$tip = "{$rate}% = " . helper::formatKB($metrics->usage) . ' / ' . helper::formatKB($metrics->limit);
@@ -1757,14 +1750,7 @@ class InstanceModel extends model
if(empty($color) && $rate >= 0 && $rate < 90) $color = 'important';
if(empty($color) && $rate >= 80) $color = 'danger';
if($type == 'array') return array('color' => $color, 'tip' => $tip, 'rate' => $rate . '%', 'usage' => helper::formatKB($metrics->usage), 'limit' => helper::formatKB($metrics->limit));
if(strtolower($type) == 'pie') commonModel::printProgressPie($rate, '', $tip);
$valueType = 'tip';
if($instance->status == 'stopped') $valueType = '';
commonModel::printProgressBar($rate, '', $tip, $valueType);
return array('color' => $color, 'tip' => $tip, 'rate' => $rate . '%', 'usage' => helper::formatKB($metrics->usage), 'limit' => helper::formatKB($metrics->limit));
}
/*
module/ops/css/common.ui.css
+2 -1
View File
@@ -8,7 +8,8 @@
.ops-ml-0 {margin-left: 0!important;}
#mainNavbar>.container {padding-top: 8px}
#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
#mainNavbar .nav {justify-content: left; position: relative; left: 0px; top: -4px;}
@media (min-width: 1400px){#mainNavbar .nav {left: -12px;}}
#mainNavbar {background: none;}
#mainNavbar .nav-item>a {padding-right: 0.5rem}
#mainNavbar .nav-item>.active {color: unset; font-weight: 700;}
module/serverroom/css/common.ui.css
+2 -1
View File
@@ -1,7 +1,8 @@
#serverroomCreateForm .form-row {width: 600px;}
#mainNavbar>.container {padding-top: 8px}
#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
#mainNavbar .nav {justify-content: left; position: relative; left: 0px; top: -4px;}
@media (min-width: 1400px){#mainNavbar .nav {left: -12px;}}
#mainNavbar {background: none;}
#mainNavbar .nav-item>a {padding-right: 0.5rem}
#mainNavbar .nav-item>.active {color: unset; font-weight: 700;}
module/system/css/common.ui.css
+2 -1
View File
@@ -1,5 +1,6 @@
#mainNavbar>.container {padding-top: 8px}
#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
#mainNavbar .nav {justify-content: left; position: relative; left: 0px; top: -4px;}
@media (min-width: 1400px){#mainNavbar .nav {left: -12px;}}
#mainNavbar {background: none;}
#mainNavbar .nav-item>a {padding-right: 0.5rem}
#mainNavbar .nav-item>.active {color: unset; font-weight: 700;}