Skip to content

Commit 30259df

Browse files
author
Kristan Kenney
committed
Merge branch 'winterfell-task-viewer' into webui-refresh-winterfell
2 parents c1da4b9 + d86c105 commit 30259df

File tree

5 files changed

+48
-24
lines changed

5 files changed

+48
-24
lines changed

‎web/css/styles.min.css‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,9 @@ input[type="checkbox"] {
893893
color: #f7f7f7;
894894
position: relative;
895895
line-height: 38px;
896-
padding: 12px 24px;
896+
padding: 12px 18px;
897+
border-left: 1px solid transparent;
898+
border-right: 1px solid transparent;
897899
}
898900

899901
.l-menu__item a:hover {
@@ -904,6 +906,8 @@ input[type="checkbox"] {
904906
box-shadow: inset 0px 0px 1px #fff,
905907
inset 0px 0px 6px rgba(255,255,255,0.6) !important;
906908
transition: 0.2s;
909+
border-left: 1px solid rgba(0,0,0,0.1);
910+
border-right: 1px solid rgba(0,0,0,0.1);
907911
}
908912
.l-menu__item a:active {
909913
border: 0;
@@ -913,6 +917,8 @@ input[type="checkbox"] {
913917
box-shadow: inset 0px 0px 1px #fff,
914918
inset -1px -1px 4px rgba(220,220,220,0.4) !important;
915919
transition: 0.2s;
920+
border-left: 1px solid rgba(0,0,0,0.15);
921+
border-right: 1px solid rgba(0,0,0,0.15);
916922
}
917923

918924
.l-menu.active .l-menu__item.focus a {
@@ -1398,14 +1404,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
13981404
float: left;
13991405
width: 32px;
14001406
height: 28px;
1401-
border: 1px solid rgba(41,90,152,0.15);
1407+
border: 1px solid #ddd;
14021408
background-color: rgba(255,255,255,0.90);
14031409
text-shadow: 0px 1px rgba(255,255,255,0.95);
14041410
border-radius: 4px;
14051411
border-bottom-left-radius: 0px;
14061412
border-top-left-radius: 0px;
14071413
border-left: 0px;
1408-
box-shadow: inset 0px 0px 1px rgba(41,90,152,0.1), inset 0 0px 2px rgba(255,255,255,1), 0px 0px 2px rgba(41,90,152,0.15);
1414+
box-shadow: inset 0px 0px 1px rgba(41,90,152,0.1), inset 0 0px 2px rgba(255,255,255,1);
14091415
text-shadow: 1px 1px rgba(255,255,255,0.9);
14101416
color: #006699;
14111417
padding: 0;
@@ -3402,6 +3408,19 @@ form#vstobjects.suspended {
34023408
background-color: #54a6e5;
34033409
}
34043410

3411+
.status-icon-yellow, .status-icon-maroon:hover {
3412+
color: #f3e72c;
3413+
}
3414+
.status-icon-teal, .status-icon-teal:hover {
3415+
color: #33cccc;
3416+
}
3417+
.status-icon-purple, .status-icon-purple:hover {
3418+
color: #8e2fca;
3419+
}
3420+
3421+
.status-icon-maroon, .status-icon-maroon:hover {
3422+
color: #cc3366;
3423+
}
34053424

34063425
.status-icon-red, .status-icon-red:hover {
34073426
color: #ff3333;
@@ -3412,7 +3431,7 @@ form#vstobjects.suspended {
34123431
}
34133432

34143433
.status-icon-orange, .status-icon-orange:hover {
3415-
color: #faab00;
3434+
color: #f6a800;
34163435
}
34173436

34183437
.status-icon-lightblue, .status-icon-lightblue:hover {

‎web/inc/i18n/en.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
$LANG['en'] = array(
88
'Packages' => 'Packages',
99
'IP' => 'Network',
10-
'Graphs' => 'Graphs',
10+
'Graphs' => 'Task Monitor',
1111
'Statistics' => 'Statistics',
1212
'Log' => 'Logs',
1313
'Server' => 'Server',
@@ -29,7 +29,7 @@
2929
'RESET PASSWORD' => 'RESET PASSWORD',
3030
'SEARCH' => 'SEARCH',
3131
'PACKAGE' => 'PACKAGE',
32-
'RRD' => 'RRD',
32+
'RRD' => 'TASK MONITOR',
3333
'STATS' => 'STATS',
3434
'LOG' => 'LOGS',
3535
'UPDATES' => 'UPDATES',
@@ -583,7 +583,7 @@
583583
'Template Manager' => 'Template Manager',
584584
'Backup Migration Manager' => 'Backup Migration Manager',
585585
'FileManager' => 'File Manager',
586-
'show: CPU / MEM / NET / DISK' => 'Usage Details',
586+
'show: CPU / MEM / NET / DISK' => 'View Advanced Details',
587587

588588
'sort by' => 'sort by',
589589
'Date' => 'Date',

‎web/templates/admin/list_rrd.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
44
<a class="ui-button cancel" href="/list/server/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
5+
<a href="/list/server/?cpu" class="ui-button cancel" title="<?=__('show: CPU / MEM / NET / DISK');?>"><i class="fas fa-chart-pie status-icon-green"></i> <?=__('show: CPU / MEM / NET / DISK');?></a>
56
</div>
67
<div class="l-sort-toolbar clearfix">
78
<table>

‎web/templates/admin/list_server_info.html‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
<head>
44
<meta charset="utf-8">
55
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
6-
<title>Hestia - <?=__($TAB)?></title>
7-
<link rel="stylesheet" href="/css/styles.min.css">
8-
9-
<link type="text/css" href="/css/jquery-custom-dialogs.css" rel="stylesheet" />
6+
<title>Hestia Task Viewer - <?=__($TAB)?></title>
7+
<link rel="stylesheet" href="/css/styles.min.css?1446554103">
8+
<link type="text/css" href="/css/animate.css?1446554103" rel="stylesheet" />
9+
<link type="text/css" href="/css/jquery-custom-dialogs.css?1446554103" rel="stylesheet" />
10+
<link type="text/css" href="/css/all.min.css?1446554103" rel="stylesheet" />
11+
<script src="/inc/jquery/jquery-3.3.1.min.js"></script>
1012
<script type="text/javascript" src="/js/jquery-1.7.2.min.js"></script>
1113
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
1214
<script type="text/javascript" src="/js/jquery-ui-1.8.20.custom.min.js"></script>
@@ -18,22 +20,25 @@
1820
</a>
1921
<div class="l-header">
2022
<div class="l-center">
21-
<a href="/list/user/" class="l-logo"></a>
23+
<a href="/list/web/" class="l-logo"></a>
2224
<!-- /.l-logo -->
2325
<div class="l-menu clearfix">
24-
<div class="l-menu__item <?php if(isset($_GET['cpu'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?cpu"><?=__('CPU')?></a></div>
25-
<div class="l-menu__item <?php if(isset($_GET['mem'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mem"><?=__('MEMORY')?></a></div>
26-
<div class="l-menu__item <?php if(isset($_GET['disk'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?disk"><?=__('DISK')?></a></div>
27-
<div class="l-menu__item <?php if(isset($_GET['net'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?net"><?=__('NETWORK')?></a></div>
28-
<div class="l-menu__item <?php if(isset($_GET['web'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?web"><?=__('WEB')?></a></div>
29-
<div class="l-menu__item <?php if(isset($_GET['dns'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?dns"><?=__('DNS')?></a></div>
30-
<div class="l-menu__item <?php if(isset($_GET['mail'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mail"><?=__('MAIL')?></a></div>
31-
<div class="l-menu__item <?php if(isset($_GET['db'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?db"><?=__('DB')?></a></div>
26+
<div class="l-menu__item"><a href="/list/rrd/"><i class="fas fa-arrow-alt-circle-left"></i>&nbsp;&nbsp;&nbsp;<?=__('Back')?></a></div>
27+
<div class="l-menu__item <?php if(isset($_GET['cpu'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?cpu"><i class="fas fa-microchip"></i>&nbsp;&nbsp;&nbsp;<?=__('CPU')?></a></div>
28+
<div class="l-menu__item <?php if(isset($_GET['mem'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mem"><i class="fas fa-memory"></i>&nbsp;&nbsp;&nbsp;<?=__('RAM')?></a></div>
29+
<div class="l-menu__item <?php if(isset($_GET['disk'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?disk"><i class="fas fa-hdd"></i>&nbsp;&nbsp;&nbsp;<?=__('Disk')?></a></div>
30+
<div class="l-menu__item <?php if(isset($_GET['net'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?net"><i class="fas fa-ethernet"></i>&nbsp;&nbsp;&nbsp;<?=__('Network')?></a></div>
31+
<div class="l-menu__item <?php if(isset($_GET['web'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?web"><i class="fas fa-globe-europe"></i>&nbsp;&nbsp;&nbsp;<?=__('Web')?></a></div>
32+
<div class="l-menu__item <?php if(isset($_GET['dns'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?dns"><i class="fas fa-at"></i>&nbsp;&nbsp;&nbsp;<?=__('DNS')?></a></div>
33+
<div class="l-menu__item <?php if(isset($_GET['mail'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mail"><i class="fas fa-mail-bulk"></i>&nbsp;&nbsp;&nbsp;<?=__('Mail')?></a></div>
34+
<div class="l-menu__item <?php if(isset($_GET['db'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?db"><i class="fas fa-database"></i>&nbsp;&nbsp;&nbsp;<?=__('DB')?></a></div>
35+
3236
</div>
3337
<!-- /.l-menu -->
3438
<div class="l-profile">
39+
<div class="l-menu__item"><a href="javascript:location.reload();"><i class="fas fa-redo"></i></a></div>
3540
<a class="l-profile__username" href="/edit/user/?user=<?php echo $user; ?>"><?=$user?></a>
36-
<a class="l-profile__logout" href="/logout/"> <?=__('Log out')?> </a>
41+
<a class="l-profile__logout" href="/logout/"> <?=__('Log out')?> <i class="fas fa-sign-out-alt"></i></a>
3742
</div>
3843
<!-- /.l-profile -->
3944
</div>

‎web/templates/admin/list_services.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="/edit/server/" class="ui-button cancel" title="<?=__('Configure')?>"><i class="fas fa-cog status-icon-lightblue"></i> <?=__('Configure')?></a>
4+
<a href="/edit/server/" class="ui-button cancel" title="<?=__('Configure')?>"><i class="fas fa-cog status-icon-maroon"></i> <?=__('Configure')?></a>
5+
<a href="/list/rrd/" class="ui-button cancel" title="<?=__('Graphs')?>"><i class="fas fa-chart-area status-icon-green"></i> <?=__('Graphs')?></a>
56
<a href="/list/package/" class="ui-button cancel" title="<?=__('Packages')?>"><i class="fas fa-box-open status-icon-orange"></i> <?=__('Packages')?></a>
67
<a href="/list/ip/" class="ui-button cancel" title="<?=__('IP')?>"><i class="fas fa-ethernet status-icon-blue"></i> <?=__('IP')?></a>
78
<?php if ((isset($_SESSION['FIREWALL_SYSTEM'])) && (!empty($_SESSION['FIREWALL_SYSTEM']))) {?><a href="/list/firewall/" class="ui-button cancel" title="<?=__('Firewall')?>"><i class="fas fa-shield-alt status-icon-red"></i> <?=__('Firewall')?></a><?php }?>
8-
<a href="/list/rrd/" class="ui-button cancel" title="<?=__('Graphs')?>"><i class="fas fa-chart-area status-icon-orange"></i> <?=__('Graphs')?></a>
99
<a href="/list/updates/" class="ui-button cancel" title="<?=__('Updates')?>"><i class="fas fa-sync status-icon-green"></i> <?=__('Updates')?></a>
10-
<a href="/list/server/?cpu" class="ui-button cancel" title="<?=__('show: CPU / MEM / NET / DISK');?>"><i class="fas fa-search status-icon-blue"></i> <?=__('show: CPU / MEM / NET / DISK');?></a>
1110
</div>
1211
<div class="l-sort-toolbar clearfix">
1312
<table>

0 commit comments

Comments
 (0)