Skip to content

Commit b60c259

Browse files
author
Kristan Kenney
committed
Update server page
1 parent 01063d7 commit b60c259

File tree

2 files changed

+89
-96
lines changed

2 files changed

+89
-96
lines changed

‎web/css/styles.min.css‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
17021702
background-color: #d1eddc;
17031703
}
17041704
.l-unit-toolbar{
1705-
height: 15px;
1705+
display: none;
17061706
}
17071707

17081708
.l-unit label {
@@ -1714,7 +1714,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
17141714
}
17151715
.l-unit__col {
17161716
display: table-cell;
1717-
padding-top: 1px;
1717+
padding-top: 15px;
17181718
vertical-align: top;
17191719
padding-bottom: 15px;
17201720
}
@@ -1938,6 +1938,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
19381938
padding-top: 15px;
19391939
width: 30px;
19401940
cursor: pointer;
1941+
display: none;
19411942
}
19421943

19431944
.l-unit-toolbar__col--right {
@@ -2735,6 +2736,29 @@ a.button.cancel {
27352736
}
27362737
*/
27372738

2739+
/*
2740+
.ui-button.danger, .button.danger {
2741+
background: linear-gradient(to bottom, #fbf1ef 0%,#f7c5bf 50%,#f5ada5 51%,#fde2df 100%) !important;
2742+
color: #F4301A !important;
2743+
text-shadow: 0px 1px rgba(255,255,255,0.5) !important;
2744+
border: 1px solid #F4968B !important;
2745+
}
2746+
*/
2747+
2748+
.ui-button.danger:hover, .button.danger:hover {
2749+
background: linear-gradient(to bottom, #fbf2f1 0%,#f7cac5 50%,#f6b4ac 51%,#fde6e3 100%) !important;
2750+
color: #F4301A !important;
2751+
text-shadow: 0px 1px rgba(255,255,255,0.5) !important;
2752+
border: 1px solid #F27E71 !important;
2753+
}
2754+
2755+
.ui-button.danger:active, .button.danger:active, .ui-button.danger:focus, .button.danger:focus {
2756+
background: linear-gradient(to bottom, #f9e3df 0%,#f5a69d 50%,#f48578 51%,#fcd0ca 100%) !important;
2757+
color: #fff !important;
2758+
text-shadow: 0px -1px 1px rgba(0,0,0,0.3) !important;
2759+
border: 1px solid #F4301A !important;
2760+
}
2761+
27382762
.ui-button span {
27392763
color: #fff;
27402764
}
@@ -3424,6 +3448,22 @@ form#vstobjects.suspended {
34243448
filter: none;
34253449
}
34263450

3451+
.server-info {
3452+
padding-left: 110px;
3453+
}
3454+
.server-info-data {
3455+
margin-left: 100px;
3456+
margin-top: -20px;
3457+
}
3458+
.server-info-name {
3459+
margin-top: 10px;
3460+
}
3461+
.icon-server-info {
3462+
font-size: 5.2em;
3463+
float: left;
3464+
margin-right: 32px;
3465+
}
3466+
34273467
@media screen and (max-width: 950px) {
34283468
.helper-container {
34293469
display: none;

‎web/templates/admin/list_services.html‎

Lines changed: 47 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77
<a href="/list/ip/" class="ui-button cancel" title="<?=__('IP')?>"><i class="fas fa-ethernet status-icon-blue"></i> <?=__('IP')?></a>
88
<?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 }?>
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="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>" class="ui-button danger cancel" title="<?=__('Restart')?>"><i class="fas fa-undo status-icon-red"></i> <?=__('Restart')?></a>
1011
</div>
1112
<div class="l-sort-toolbar clearfix">
1213
<table>
1314
<tr>
14-
<td class="toggle-all">
15-
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
16-
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
17-
</td>
1815
<td>
1916
<form action="/bulk/service/" method="post" id="objects">
2017
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -40,39 +37,24 @@
4037

4138

4239
<div class="l-center units animated fadeIn">
40+
41+
42+
<div class="l-separator"></div>
43+
<!-- /.l-separator -->
44+
45+
<div class="l-center units animated fadeIn">
46+
4347
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
4448
<div class="l-unit-toolbar clearfix">
45-
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">
46-
<input id="check0" class="ch-toggle" type="checkbox" name="srv[]" value="<?php echo $sys['sysinfo']['HOSTNAME'] ?>">
47-
<label for="check0" class="check-label"></label>
48-
</div>
49-
<!-- l-unit-toolbar__col -->
50-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
51-
<div class="actions-panel clearfix">
52-
<div class="actions-panel__col actions-panel__configure shortcut-enter" key-action="href"><a href="/edit/server/"><?=__('configure')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
53-
<div class="actions-panel__col actions-panel__restart shortcut-r" key-action="href"><a href="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>"><?=__('restart')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
54-
</div>
55-
<!-- /.actions-panel -->
56-
</div>
57-
<!-- l-unit-toolbar__col -->
58-
</div>
49+
</div>
5950
<!-- /.l-unit-toolbar -->
6051

61-
<div class="l-unit__col l-unit__col--left clearfix">
62-
<div class="l-unit__suspended"><?__('suspended')?></div>
63-
<!-- div class="l-unit__date">
64-
</div-->
65-
</div>
6652
<!-- /.l-unit__col -->
67-
<div class="l-unit__col l-unit__col--right">
68-
<div class="l-unit__name separate">
69-
<?=$sys['sysinfo']['HOSTNAME']?>
70-
</div>
71-
72-
73-
<div class="l-unit__stats">
53+
<div class="l-unit__col l-unit__col--right server-info">
54+
<div class="icon-server-info"><i class="fas fa-server"></i></div>
55+
<div class="l-unit__name separate server-info-name"><?=$sys['sysinfo']['HOSTNAME']?></div>
56+
<div class="l-unit__stats server-info-data">
7457
<table>
75-
7658
<tr>
7759
<td>
7860
<div class="l-unit__stat-cols clearfix">
@@ -97,15 +79,27 @@
9779
</td>
9880
</tr>
9981

100-
</table>
101-
</div>
82+
</table>
83+
</div>
10284
<!-- /.l-unit__stats -->
103-
</div>
85+
</div>
10486
<!-- /.l-unit__col -->
10587
</div>
10688
<!-- /.l-unit -->
107-
108-
89+
<div class="l-unit table-header">
90+
<div class="l-unit__col l-unit__col--right">
91+
<div class="clearfix l-unit__stat-col--left">
92+
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
93+
</div>
94+
95+
<div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Service');?></b></div>
96+
<div class="clearfix l-unit__stat-col--left text-right compact">&nbsp;</div>
97+
<div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Description');?></b></div>
98+
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Uptime');?></b></div>
99+
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('CPU');?></b></div>
100+
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Memory');?></b></div>
101+
</div>
102+
</div>
109103

110104
<?php
111105
foreach ($data as $key => $value) {
@@ -125,74 +119,33 @@
125119

126120

127121
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
128-
<div class="l-unit-toolbar clearfix">
129-
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">
130-
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="service[]" value="<?php echo $key ?>">
131-
132-
</div>
133-
<!-- l-unit-toolbar__col -->
134-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
135-
<div class="actions-panel clearfix">
136-
<div class="actions-panel__col actions-panel__configure shortcut-enter" key-action="href"><a href="/edit/server/<? echo $key ?>/"><?=__('configure')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
137-
<div class="actions-panel__col actions-panel__<?=$action?> shortcut-s" key-action="href"><a href="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__($action)?> <i></i></a><span class="shortcut">&nbsp;S</span></div>
138-
<div class="actions-panel__col actions-panel__restart shortcut-r" key-action="href"><a href="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('restart')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
139-
</div>
140-
<!-- /.actions-panel -->
141-
</div>
142-
<!-- l-unit-toolbar__col -->
143-
</div>
144-
<!-- /.l-unit-toolbar -->
145122

146-
<div class="l-unit__col l-unit__col--left clearfix step-left">
147-
<!-- div class="l-unit__date">
148-
</div-->
149-
</div>
150-
<!-- /.l-unit__col -->
151123
<div class="l-unit__col l-unit__col--right">
152-
<div class="l-unit__name small-2">
153-
<?=$key?>
154-
</div>
155-
156-
157-
<div class="l-unit__stats">
158-
<table>
124+
<div class="clearfix l-unit__stat-col--left">
125+
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="service[]" value="<?php echo $key ?>">
126+
</div>
159127

160-
<tr>
161-
<td>
162-
<div class="l-unit__stat-cols clearfix">
163-
<div class="l-unit__stat-col l-unit__stat-col--left"><b><?=__($data[$key]['SYSTEM'])?></b></div>
164-
<div class="l-unit__stat-col l-unit__stat-col--right"></div>
165-
</div>
166-
</td>
167-
<td>
168-
<div class="l-unit__stat-cols clearfix">
169-
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('CPU')?>: <b><?=$cpu?></b></div>
170-
<div class="l-unit__stat-col l-unit__stat-col--right"><?=__('Memory')?>: <b><?=$data[$key]['MEM']?> <?=__('mb')?></b></div>
171-
</div>
172-
</td>
173-
<td>
174-
<div class="l-unit__stat-cols clearfix last">
175-
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Uptime')?>: <b><?=humanize_time($data[$key]['RTIME'])?></b></div>
176-
<div class="l-unit__stat-col l-unit__stat-col--right"></div>
177-
</div>
178-
</td>
179-
</tr>
128+
<div class="clearfix l-unit__stat-col--left wide"><b><a href="/edit/server/<? echo $key ?>/"><?=$key?></a></b></div>
129+
<div class="clearfix l-unit__stat-col--left text-center compact">
130+
<b>
131+
<a href="/edit/server/<? echo $key ?>/"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim icon-large"></i></a>
132+
<a href="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="data-controls fas fa-undo status-icon-highlight status-icon-dim icon-large"></i></a>
133+
<a href="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pause status-icon-red status-icon-dim icon-large"></i></a>
134+
</b>
135+
</div>
136+
<div class="clearfix l-unit__stat-col--left wide-3"><?=__($data[$key]['SYSTEM'])?></div>
137+
<div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_time($data[$key]['RTIME'])?></b></div>
138+
<div class="clearfix l-unit__stat-col--left text-center"><b><?=$cpu?></b></div>
139+
<div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['MEM']?> <?=__('mb')?></b></div>
180140

181-
</table>
141+
</div>
182142
</div>
183-
<!-- /.l-unit__stats -->
184-
</div>
185-
<!-- /.l-unit__col -->
186-
</div>
187-
<!-- /.l-unit -->
188-
<!-- div class="l-separator"></div -->
189-
<!-- /.l-separator -->
190143
<?}?>
191144

192145
</div>
193146

194147
<div id="vstobjects">
195-
<div class="l-separator"></div>
148+
<div class="l-separator visible"></div>
196149
<div class="l-center">
197150
<div class="l-unit-ft">
198151
<div class="l-unit__col l-unit__col--left clearfix"></div>

0 commit comments

Comments
 (0)