Skip to content

Commit c85737c

Browse files
author
Kristan Kenney
committed
Front end page fixes
1 parent 3e66d10 commit c85737c

File tree

4 files changed

+50
-57
lines changed

4 files changed

+50
-57
lines changed

‎web/css/styles.min.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3450,8 +3450,9 @@ form#vstobjects.suspended {
34503450
}
34513451

34523452
.server-info {
3453-
padding-left: 110px;
3453+
34543454
}
3455+
34553456
.server-info-data {
34563457
margin-left: 100px;
34573458
margin-top: -20px;

‎web/templates/admin/list_firewall_banlist.html‎

Lines changed: 38 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,19 @@
2828
<div class="l-separator"></div>
2929
<!-- /.l-separator -->
3030

31-
3231
<div class="l-center units animated fadeIn">
33-
<div class="l-unit__col l-unit__col--right step-top">
34-
<div>
35-
<div class="clearfix l-unit__stat-col--left super-compact">
36-
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
37-
</div>
38-
<div class="clearfix l-unit__stat-col--left wide"><b><?php print __('IP address');?></b></div>
39-
<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
40-
<div class="clearfix l-unit__stat-col--left compact-4 text-center"><b><?php print __('Comment');?></b></div>
41-
<div class="clearfix l-unit__stat-col--left"><b><?php print __('Date');?></b></div>
42-
<div class="clearfix l-unit__stat-col--left"><b><?php print __('Time');?></b></div>
43-
</div>
32+
<div class="l-unit header table-header">
33+
<div class="l-unit__col l-unit__col--right step-top">
34+
<div class="clearfix l-unit__stat-col--left super-compact">
35+
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
36+
</div>
37+
<div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('IP address');?></b></div>
38+
<div class="clearfix l-unit__stat-col--left compact-4"><b>&nbsp;</b></div>
39+
<div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?php print __('Date');?></b></div>
40+
<div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?php print __('Time');?></b></div>
41+
<div class="clearfix l-unit__stat-col--left wide text-center"><b><?php print __('Comment');?></b></div>
42+
</div>
4443
</div>
45-
</div>
4644

4745
<?php
4846
foreach ($data as $key => $value) {
@@ -52,44 +50,38 @@
5250
?>
5351

5452
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
55-
<div class="l-unit-toolbar clearfix">
56-
<div class="l-unit-toolbar__col l-unit-toolbar__col--left super-compact">
57-
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $value['CHAIN'] ?>">
58-
59-
</div>
60-
</div>
61-
<!-- /.l-unit-toolbar -->
62-
63-
<div class="l-unit__col l-unit__col--left clearfix"></div>
6453
<!-- /.l-unit__col -->
6554
<div class="l-unit__col l-unit__col--right">
6655
<div class="l-unit__stats">
67-
<div class="clearfix l-unit__stat-col--left compact-4 text-center"><?=$ip?></div>
68-
<div class="clearfix l-unit__stat-col--left compact text-right"><b>
69-
<!-- START QUICK ACTION TOOLBAR AREA -->
70-
71-
<!-- l-unit-toolbar__col -->
72-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
73-
<div class="actions-panel clearfix">
74-
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
75-
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
76-
<i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
77-
<input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>" />
78-
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
79-
<p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>
80-
</div>
81-
</a>
56+
<div class="clearfix l-unit__stat-col--left super-compact">
57+
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $value['CHAIN'] ?>">
58+
</div>
59+
<div class="clearfix l-unit__stat-col--left wide-5"><b><?=$ip?></b></div>
60+
<div class="clearfix l-unit__stat-col--left compact-4"><b>
61+
<!-- START QUICK ACTION TOOLBAR AREA -->
62+
63+
<!-- l-unit-toolbar__col -->
64+
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
65+
<div class="actions-panel clearfix">
66+
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
67+
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
68+
<i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
69+
<input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>" />
70+
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
71+
<p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>
72+
</div>
73+
</a>
74+
</div>
75+
8276
</div>
83-
77+
<!-- /.actiona-panel -->
8478
</div>
85-
<!-- /.actiona-panel -->
86-
</div>
87-
88-
<!-- END QUICK ACTION TOOLBAR AREA -->
89-
</b></div>
90-
<div class="clearfix l-unit__stat-col--left wide text-center"><b><?=__($value['CHAIN'])?></b></div>
91-
<div class="clearfix l-unit__stat-col--left"><b><?=__($data[$key]['DATE'])?></b></div>
92-
<div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['TIME']?></b></div>
79+
80+
<!-- END QUICK ACTION TOOLBAR AREA -->
81+
</b></div>
82+
<div class="clearfix l-unit__stat-col--left text-center compact-5"><?=__($data[$key]['DATE'])?></div>
83+
<div class="clearfix l-unit__stat-col--left text-center compact-5"><?=$data[$key]['TIME']?></div>
84+
<div class="clearfix l-unit__stat-col--left text-center wide"><b><?=__($value['CHAIN'])?></b></div>
9385
</div>
9486
<!-- /.l-unit__stats -->
9587
</div>

‎web/templates/admin/list_services.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@
8888
<!-- /.l-unit -->
8989
<div class="l-unit table-header">
9090
<div class="l-unit__col l-unit__col--right">
91-
<div class="clearfix l-unit__stat-col--left">
91+
<div class="clearfix l-unit__stat-col--left super-compact">
9292
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
9393
</div>
9494

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>
95+
<div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Service');?></b></div>
96+
<div class="clearfix l-unit__stat-col--left text-right compact-2">&nbsp;</div>
97+
<div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Description');?></b></div>
9898
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Uptime');?></b></div>
9999
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('CPU');?></b></div>
100100
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Memory');?></b></div>
@@ -121,19 +121,19 @@
121121
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
122122

123123
<div class="l-unit__col l-unit__col--right">
124-
<div class="clearfix l-unit__stat-col--left">
124+
<div class="clearfix l-unit__stat-col--left super-compact">
125125
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="service[]" value="<?php echo $key ?>">
126126
</div>
127127

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">
128+
<div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/server/<? echo $key ?>/"><?=$key?></a></b></div>
129+
<div class="clearfix l-unit__stat-col--left text-center compact-2">
130130
<b>
131131
<a href="/edit/server/<? echo $key ?>/"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim icon-large"></i></a>
132132
<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>
133133
<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>
134134
</b>
135135
</div>
136-
<div class="clearfix l-unit__stat-col--left wide-3"><?=__($data[$key]['SYSTEM'])?></div>
136+
<div class="clearfix l-unit__stat-col--left wide-5"><?=__($data[$key]['SYSTEM'])?></div>
137137
<div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_time($data[$key]['RTIME'])?></b></div>
138138
<div class="clearfix l-unit__stat-col--left text-center"><b><?=$cpu?></b></div>
139139
<div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['MEM']?> <?=__('mb')?></b></div>

‎web/templates/admin/list_updates.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
4646
</div>
4747
<div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Package');?></b></div>
48-
<div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Description');?></b></div>
48+
<div class="clearfix l-unit__stat-col--left wide-6"><b><?php print __('Description');?></b></div>
4949
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Version');?></b></div>
5050
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Release');?></b></div>
5151
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Status');?></b></div>
@@ -88,7 +88,7 @@
8888

8989
</div>
9090
<div class="clearfix l-unit__stat-col--left wide"><b><?=$key?></b></div>
91-
<div class="clearfix l-unit__stat-col--left wide-5"><b><?=__($data[$key]['DESCR'])?></b></div>
91+
<div class="clearfix l-unit__stat-col--left wide-6"><b><?=__($data[$key]['DESCR'])?></b></div>
9292
<div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['VERSION'] ?> (<?=$data[$key]['ARCH']?>)</div>
9393
<div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['RELEASE']?></div>
9494
<div class="clearfix l-unit__stat-col--left text-center"><b>

0 commit comments

Comments
 (0)