Skip to content

Commit 5490d17

Browse files
author
Kristan Kenney
committed
Fixes to front end pages
1 parent c0569d1 commit 5490d17

14 files changed

+84
-145
lines changed

‎web/css/styles.min.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
15561556
color: #707070;
15571557
padding: 0 0 0 14px;
15581558
overflow: hidden;
1559-
font-size: 0.85rem;
1559+
font-size: 0.8rem;
15601560
border-radius: 0;
15611561
}
15621562

@@ -1872,7 +1872,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
18721872
border-left: 1px solid transparent;
18731873
}
18741874
.l-unit__stat-col--left.super-compact {
1875-
width: 40px;
1875+
width: 50px;
18761876
}
18771877
.l-unit__stat-col--left.compact {
18781878
width: 60px;
@@ -1908,7 +1908,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
19081908
width: 330px;
19091909
}
19101910
.l-unit__stat-col--left.wide-6 {
1911-
width: 370px;
1911+
width: 440px;
19121912
}
19131913

19141914
.l-unit__stat-col--left.small-2 {

‎web/templates/admin/list_backup.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,13 @@
4141

4242
<div class="l-center units animated fadeIn">
4343
<div class="l-unit header table-header">
44-
<div class="l-unit__col l-unit__col--left clearfix">
45-
<div class="text-center jump-small-top"></div>
46-
</div>
47-
4844
<div class="l-unit__col l-unit__col--right step-top">
4945
<div>
46+
<div class="clearfix l-unit__stat-col--left super-compact">
47+
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
48+
</div>
5049
<div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('File Name');?></b></div>
51-
<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
50+
<div class="clearfix l-unit__stat-col--left compact-3 text-right"><b>&nbsp;</b></div>
5251
<div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('Date');?></b></div>
5352
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Size');?></b></div>
5453
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Type');?></b></div>
@@ -82,12 +81,12 @@
8281

8382
<div class="l-unit__col l-unit__col--right">
8483
<div>
85-
<div class="clearfix l-unit__stat-col--left">
84+
<div class="clearfix l-unit__stat-col--left super-compact">
8685
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="backup[]" value="<?php echo $key ?>">
8786

8887
</div>
8988
<div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$key?></a></b></div>
90-
<div class="clearfix l-unit__stat-col--left compact text-right"><b>
89+
<div class="clearfix l-unit__stat-col--left compact-3 text-right"><b>
9190
<!-- START QUICK ACTION TOOLBAR AREA -->
9291

9392
<!-- l-unit-toolbar__col -->

‎web/templates/admin/list_cron.html‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,17 @@
5959

6060
<div class="l-center units animated fadeIn">
6161
<div class="l-unit header table-header">
62-
<div class="l-unit__col l-unit__col--left clearfix">
63-
<div class="text-center jump-small-top"></div>
64-
</div>
65-
6662
<div class="l-unit__col l-unit__col--right step-top">
67-
<div>
63+
<div class="clearfix l-unit__stat-col--left super-compact">
64+
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
65+
</div>
6866
<div class="clearfix l-unit__stat-col--left wide-6"><b><?php print __('Cron Job');?></b></div>
6967
<div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>&nbsp;</b></div>
70-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Min')?></b></div>
71-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Hour')?></b></div>
72-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Day')?></b></div>
73-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Month')?></b></div>
74-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><b><?=__('Day of week')?></b></div>
75-
</div>
68+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Min')?></b></div>
69+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Hour')?></b></div>
70+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day')?></b></div>
71+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Month')?></b></div>
72+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day of week')?></b></div>
7673
</div>
7774
</div>
7875
<?
@@ -97,7 +94,7 @@
9794
<!-- /.l-unit-toolbar -->
9895
<div class="l-unit__col l-unit__col--right">
9996
<div>
100-
<div class="clearfix l-unit__stat-col--left">
97+
<div class="clearfix l-unit__stat-col--left super-compact">
10198
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
10299
</div>
103100
<div class="clearfix l-unit__stat-col--left wide-6"><b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b></div>
@@ -132,11 +129,11 @@
132129
</div>
133130
<!-- END QUICK ACTION TOOLBAR AREA -->
134131
</b></div>
135-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['MIN']?></div>
136-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['HOUR']?></div>
137-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['DAY']?></div>
138-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['MONTH']?></div>
139-
<div class="clearfix l-unit__stat-col--left compact-2 text-center"><?=$data[$key]['WDAY']?></div>
132+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['MIN']?></div>
133+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['HOUR']?></div>
134+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['DAY']?></div>
135+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['MONTH']?></div>
136+
<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['WDAY']?></div>
140137
</div>
141138
</div>
142139
<!-- /.l-unit__col -->

‎web/templates/admin/list_db.html‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@
5050
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
5151
</form>
5252
</td>
53-
<td class="toggle-all">
54-
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
55-
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
56-
</td>
5753
<td>
5854
<form action="/bulk/db/" method="post" id="objects">
5955
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -82,20 +78,17 @@
8278
<!-- /.l-separator -->
8379
<div class="l-center units animated fadeIn">
8480
<div class="l-unit header table-header">
85-
<div class="l-unit__col l-unit__col--left clearfix">
86-
<div class="text-center jump-small-top"></div>
87-
</div>
88-
8981
<div class="l-unit__col l-unit__col--right step-top">
90-
<div>
91-
<div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Database');?></b></div>
82+
<div class="clearfix l-unit__stat-col--left super-compact">
83+
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
84+
</div>
85+
<div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Database');?></b></div>
9286
<div class="clearfix l-unit__stat-col--left text-right compact-2"><b>&nbsp;</b></div>
9387
<div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Type');?></b></div>
9488
<div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('Username');?></b></div>
9589
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Hostname');?></b></div>
9690
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Disk');?></b></div>
9791
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Charset');?></b></div>
98-
</div>
9992
</div>
10093
</div>
10194

@@ -130,11 +123,11 @@
130123
<!-- /.l-unit-toolbar -->
131124
<div class="l-unit__col l-unit__col--right">
132125
<div>
133-
<div class="clearfix l-unit__stat-col--left">
126+
<div class="clearfix l-unit__stat-col--left super-compact">
134127
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
135128

136129
</div>
137-
<div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/db/?database=<?=$key?>"><?=$key?></a></b></div>
130+
<div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/edit/db/?database=<?=$key?>"><?=$key?></a></b></div>
138131

139132
<div class="clearfix l-unit__stat-col--left text-right compact-2"><b>
140133
<!-- START QUICK ACTION TOOLBAR AREA -->

‎web/templates/admin/list_dns.html‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
2222
</form>
2323
</td>
24-
<td class="toggle-all">
25-
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
26-
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
27-
</td>
2824
<td>
2925
<form action="/bulk/dns/" method="post" id="objects">
3026
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -54,20 +50,17 @@
5450

5551
<div class="l-center units animated fadeIn">
5652
<div class="l-unit header table-header">
57-
<div class="l-unit__col l-unit__col--left clearfix">
58-
<div class="text-center jump-small-top"></div>
59-
</div>
60-
6153
<div class="l-unit__col l-unit__col--right step-top">
62-
<div>
63-
<div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Domain');?></b></div>
54+
<div class="clearfix l-unit__stat-col--left super-compact">
55+
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
56+
</div>
57+
<div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Domain');?></b></div>
6458
<div class="clearfix l-unit__stat-col--left text-right"><b>&nbsp;</b></div>
6559
<div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Records');?></b></div>
6660
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Template');?></b></div>
6761
<div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('TTL');?></b></div>
6862
<div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('SOA');?></b></div>
6963
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Expiration Date');?></b></div>
70-
</div>
7164
</div>
7265
</div>
7366

@@ -94,11 +87,11 @@
9487
<!-- /.l-unit-toolbar -->
9588
<div class="l-unit__col l-unit__col--right">
9689
<div>
97-
<div class="clearfix l-unit__stat-col--left">
90+
<div class="clearfix l-unit__stat-col--left super-compact">
9891
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
9992

10093
</div>
101-
<div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/list/dns/?domain=<?=$key?>"><?=$key?></a></b></div>
94+
<div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/list/dns/?domain=<?=$key?>"><?=$key?></a></b></div>
10295

10396
<div class="clearfix l-unit__stat-col--left text-right"><b>
10497
<!-- START QUICK ACTION TOOLBAR AREA -->

‎web/templates/admin/list_dns_rec.html‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
1515
</form>
1616
</td>
17-
<td class="toggle-all">
18-
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
19-
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
20-
</td>
2117
<td>
2218
<form action="/bulk/dns/" method="post" id="objects">
2319
<input type="hidden" name="domain" value="<?=htmlentities($_GET['domain'])?>" />

‎web/templates/admin/list_firewall.html‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<div class="l-sort-toolbar clearfix">
1919
<table>
2020
<tr>
21-
<td class="toggle-all">
22-
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
23-
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
24-
</td>
2521
<td class="sort-by">
2622
<?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
2723
</td>
@@ -47,18 +43,17 @@
4743
<!-- /.l-separator -->
4844

4945
<div class="l-center units compact animated fadeIn">
50-
<div class="l-unit header table-header">
51-
<div class="l-unit__col l-unit__col--left clearfix">
52-
<div class="text-center jump-small-top"></div>
53-
</div>
54-
46+
<div class="l-unit header table-header">
5547
<div class="l-unit__col l-unit__col--right step-top">
5648
<div>
57-
<div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Action');?></b></div>
49+
<div class="clearfix l-unit__stat-col--left super-compact">
50+
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
51+
</div>
52+
<div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Action');?></b></div>
5853
<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
5954
<div class="clearfix l-unit__stat-col--left wide-1 text-center"><b><?php print __('Comment');?></b></div>
6055
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Protocol');?></b></div>
61-
<div class="clearfix l-unit__stat-col--left wide-2 text-center"><b><?php print __('Port');?></b></div>
56+
<div class="clearfix l-unit__stat-col--left wide-5 text-center"><b><?php print __('Port');?></b></div>
6257
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('IP address');?></b></div>
6358
</div>
6459
</div>
@@ -88,11 +83,10 @@
8883
<!-- /.l-unit__col -->
8984
<div class="l-unit__col l-unit__col--right">
9085
<div class="l-unit__stats">
91-
<div class="clearfix l-unit__stat-col--left">
86+
<div class="clearfix l-unit__stat-col--left super-compact">
9287
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="rule[]" value="<?php echo $key ?>">
93-
9488
</div>
95-
<div class="clearfix l-unit__stat-col--left wide"><b><a href="/edit/firewall/?rule=<?=$key?>">
89+
<div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/firewall/?rule=<?=$key?>">
9690
<? if($data[$key]['SUSPENDED'] == 'no'){ ?>
9791
<? if ($data[$key]['ACTION'] == 'DROP') { ?>
9892
<i class="fas fa-minus-circle status-icon-red icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
@@ -144,7 +138,7 @@
144138
</b></div>
145139
<div class="clearfix l-unit__stat-col--left wide-1 text-center"><b><? if(!empty($data[$key]['COMMENT'])) echo '' . $data[$key]['COMMENT']; else echo "&nbsp;"; ?></b></div>
146140
<div class="clearfix l-unit__stat-col--left text-center"><b><?=__($data[$key]['PROTOCOL'])?></b></div>
147-
<div class="clearfix l-unit__stat-col--left wide-2 text-center"><b><?=$data[$key]['PORT']?></b></div>
141+
<div class="clearfix l-unit__stat-col--left wide-5 text-center"><b><?=$data[$key]['PORT']?></b></div>
148142
<div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['IP']?></div>
149143
</div>
150144
<!-- /.l-unit__stats -->

‎web/templates/admin/list_firewall_banlist.html‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
<div class="l-sort-toolbar clearfix">
88
<table>
99
<tr>
10-
<td class="toggle-all">
11-
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
12-
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
13-
</td>
1410
<td>
1511
<form action="/bulk/firewall/banlist/" method="post" id="objects">
1612
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,13 +30,11 @@
3430

3531

3632
<div class="l-center units animated fadeIn">
37-
<div class="l-unit header table-header">
38-
<div class="l-unit__col l-unit__col--left clearfix">
39-
<div class="text-center jump-small-top"></div>
40-
</div>
41-
4233
<div class="l-unit__col l-unit__col--right step-top">
4334
<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>
4438
<div class="clearfix l-unit__stat-col--left wide"><b><?php print __('IP address');?></b></div>
4539
<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
4640
<div class="clearfix l-unit__stat-col--left compact-4 text-center"><b><?php print __('Comment');?></b></div>
@@ -59,7 +53,7 @@
5953

6054
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
6155
<div class="l-unit-toolbar clearfix">
62-
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">
56+
<div class="l-unit-toolbar__col l-unit-toolbar__col--left super-compact">
6357
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $value['CHAIN'] ?>">
6458

6559
</div>

0 commit comments

Comments
 (0)