Skip to content

Commit cad6814

Browse files
author
Kristan Kenney
committed
Move sort options in toolbar
1 parent 32e7c83 commit cad6814

File tree

11 files changed

+31
-38
lines changed

11 files changed

+31
-38
lines changed

web/css/styles.min.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,10 +1383,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
13831383
padding-left: 96px;
13841384
}
13851385

1386-
.l-sort-toolbar td:first-of-type {
1387-
padding-left: 10px;
1388-
}
1389-
13901386
.l-sort-toolbar td.step-right:first-of-type {
13911387
padding-right: 20px;
13921388
}
@@ -3150,6 +3146,7 @@ form#vstobjects.suspended {
31503146

31513147
.l-sort-toolbar table td {
31523148
float: left;
3149+
margin-left: 10px;
31533150
}
31543151
.l-sort-toolbar__search-box {
31553152
float: right !important;

web/templates/admin/list_cron.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<div class="l-sort-toolbar clearfix">
1919
<table>
2020
<tr>
21+
<td class="sort-by">
22+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
23+
</td>
2124
<td class="l-sort-toolbar__search-box">
2225
<form action="/search/" method="get">
2326
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -40,9 +43,6 @@
4043
</div>
4144
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
4245
</td>
43-
<td class="sort-by">
44-
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
45-
</td>
4646
</tr>
4747
</table>
4848
</div>

web/templates/admin/list_db.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<div class="l-sort-toolbar clearfix">
4444
<table>
4545
<tr>
46+
<td class="sort-by">
47+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
48+
</td>
4649
<td class="l-sort-toolbar__search-box">
4750
<form action="/search/" method="get">
4851
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -63,9 +66,6 @@
6366
</div>
6467
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
6568
</td>
66-
<td class="sort-by">
67-
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
68-
</td>
6969
</tr>
7070
</table>
7171
<!-- -->

web/templates/admin/list_dns.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<div class="l-sort-toolbar clearfix">
1515
<table>
1616
<tr>
17+
<td class="sort-by">
18+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
19+
</td>
1720
<td class="l-sort-toolbar__search-box">
1821
<form action="/search/" method="get">
1922
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,9 +37,6 @@
3437
</div>
3538
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
3639
</td>
37-
<td class="sort-by">
38-
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
39-
</td>
4040
</tr>
4141
</table>
4242
</div>

web/templates/admin/list_firewall.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<tr>
2121
<td class="sort-by">
2222
<?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
23-
</td>
23+
</td>
2424
<td>
2525
<form action="/bulk/firewall/" method="post" id="objects">
2626
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />

web/templates/admin/list_mail.html

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313
<div class="l-sort-toolbar clearfix">
1414
<table>
1515
<tr>
16-
<td class="">
17-
<?
18-
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
19-
$webmail = "http://".$http_host."/webmail/";
20-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
21-
?>
16+
<td class="sort-by">
17+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
2218
</td>
2319
<td class="l-sort-toolbar__search-box">
2420
<form action="/search/" method="get">
@@ -40,9 +36,7 @@
4036
</div>
4137
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
4238
</td>
43-
<td class="sort-by">
44-
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
45-
</td>
39+
4640
</tr>
4741
</table>
4842
<!-- -->

web/templates/admin/list_mail_acc.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
2121
?>
2222
</td>
23+
<td class="sort-by">
24+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
25+
</td>
2326
<td class="l-sort-toolbar__search-box">
2427
<form action="/search/" method="get">
2528
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -40,9 +43,6 @@
4043
</div>
4144
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
4245
</td>
43-
<td class="sort-by">
44-
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
45-
</td>
4646
</tr>
4747
</table>
4848
<!-- -->

web/templates/admin/list_packages.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<div class="l-sort-toolbar clearfix">
1313
<table>
1414
<tr>
15+
<td class="sort-by">
16+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
17+
</td>
1518
<td class="l-sort-toolbar__search-box">
1619
<form action="/search/" method="get">
1720
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,9 +37,7 @@
3437
</div>
3538
<input type="submit" class="l-sort-toolbar__filter-apply" value="" />
3639
</td>
37-
<td class="sort-by">
38-
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
39-
</td>
40+
4041
</tr>
4142
</table>
4243
</div>

web/templates/admin/list_web.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<div class="l-sort-toolbar clearfix">
1515
<table>
1616
<tr>
17+
<td class="sort-by">
18+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
19+
</td>
1720
<td class="l-sort-toolbar__search-box">
1821
<form action="/search/" method="get">
1922
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,9 +37,6 @@
3437
</div>
3538
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
3639
</td>
37-
<td class="sort-by">
38-
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
39-
</td>
4040
</tr>
4141
</table>
4242
<!-- -->

web/templates/user/list_dns.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<div class="l-sort-toolbar clearfix">
1313
<table>
1414
<tr>
15+
<td class="sort-by">
16+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
17+
</td>
1518
<td class="l-sort-toolbar__search-box">
1619
<form action="/search/" method="get">
1720
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,9 +37,7 @@
3437
</div>
3538
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
3639
</td>
37-
<td class="sort-by">
38-
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
39-
</td>
40+
4041
</tr>
4142
</table>
4243
</div>

0 commit comments

Comments
 (0)