Skip to content

Commit 0b6b0cd

Browse files
author
Kristan Kenney
committed
Update sort order functionality
1 parent f83b057 commit 0b6b0cd

24 files changed

+128
-103
lines changed

‎web/css/src/themes/default.css‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,11 +1333,13 @@ div.l-content > div.l-separator:nth-of-type(4) {
13331333
inset -1px -1px 4px rgba(220,220,220,0.4);
13341334
}
13351335

1336-
.context-menu.sort-order span.name i.fas.fa-sort-amount-down {
1336+
.context-menu.sort-order span.name i.fas.fa-sort-amount-down,
1337+
.context-menu.sort-order span.name i.fas.fa-sort-alpha-down {
13371338
float: right;
13381339
margin-top: 2px;
13391340
}
13401341

1342+
13411343
.context-menu.sort-order li:last-child {
13421344
border-bottom: none;
13431345
}

‎web/css/themes/default.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/js/init.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ $(document).ready(function(){
120120
VE.tmp.sort_direction = $(this).hasClass('up')*1 || -1;
121121

122122
$('.l-sort .sort-by span b').html($(this).parent('li').find('.name').html());
123-
$('.l-sort .sort-by i').removeClass('fa-sort-amount-up fa-sort-amount-down');
124-
$(this).hasClass('up') ? $('.l-sort .sort-by i').addClass('fa-sort-amount-up') : $('.l-sort .sort-by i').addClass('fa-sort-amount-down');
123+
$('.l-sort .sort-by i').removeClass('fa-sort-alpha-up fa-sort-alpha-down');
124+
$(this).hasClass('up') ? $('.l-sort .sort-by i').addClass('fa-sort-alpha-up') : $('.l-sort .sort-by i').addClass('fa-sort-alpha-down');
125125
$('.units .l-unit').sort(function (a, b) {
126126
if(VE.tmp.sort_as_int)
127127
return parseInt($(a).attr(VE.tmp.sort_par)) >= parseInt($(b).attr(VE.tmp.sort_par)) ? VE.tmp.sort_direction : VE.tmp.sort_direction * -1;

‎web/templates/admin/list_cron.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<? } ?>
1414
</div>
1515
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
16-
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
17-
<li entity="sort-name"><span class="name"><?=_('Command')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
16+
<li entity="sort-name"><span class="name" id="default-sort"><?=_('Cron Job')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
17+
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
1818
</ul>
1919
<div class="l-sort-toolbar clearfix">
2020
<table>
2121
<tr>
2222
<td class="sort-by" title="<?=_('Sort items');?>">
23-
<?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
23+
<?=_('sort by');?>: <span><b><?=_('Command')?> <i class="fas fa-sort-alpha-down"></i></b></span>
2424
</td>
2525
<td class="l-sort-toolbar__search-box">
2626
<form action="/search/" method="get">

‎web/templates/admin/list_db.html‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,18 @@
2727
<? } ?>
2828
</div>
2929
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
30-
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
31-
<li entity="sort-name"><span class="name"><?=_('Database')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
32-
<li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
33-
<li entity="sort-user"><span class="name"><?=_('Username')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
34-
<li entity="sort-server"><span class="name"><?=_('Host')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
30+
<li entity="sort-charset"><span class="name"><?=_('Charset')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
31+
<li entity="sort-name"><span class="name" id="default-sort"><?=_('Database')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
32+
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
33+
<li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
34+
<li entity="sort-server"><span class="name"><?=_('Host')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
35+
<li entity="sort-user"><span class="name"><?=_('Username')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
3536
</ul>
3637
<div class="l-sort-toolbar clearfix">
3738
<table>
3839
<tr>
3940
<td class="sort-by" title="<?=_('Sort items');?>">
40-
<?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
41+
<?=_('sort by');?>: <span><b><?=_('Database')?> <i class="fas fa-sort-alpha-down"></i></b></span>
4142
</td>
4243
<td class="l-sort-toolbar__search-box">
4344
<form action="/search/" method="get">
@@ -82,9 +83,9 @@
8283
<div class="clearfix l-unit__stat-col--left wide-3"><b><?php print _('Database');?></b></div>
8384
<div class="clearfix l-unit__stat-col--left text-right compact-3"><b>&nbsp;</b></div>
8485
<div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print _('Type');?></b></div>
86+
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Disk');?></b></div>
8587
<div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print _('Username');?></b></div>
8688
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Hostname');?></b></div>
87-
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Disk');?></b></div>
8889
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Charset');?></b></div>
8990
</div>
9091
</div>
@@ -116,7 +117,7 @@
116117

117118
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['DB'][$key] == 1) echo ' l-unit--starred'; ?> animated fadeIn" v_unit_id="<?=$key?>" v_section="db"
118119
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
119-
sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" sort-star="<? if($_SESSION['favourites']['DB'][$key] == 1) echo '1'; else echo '0'; ?>">
120+
sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" sort-charset="<?=$data[$key]['CHARSET']?>" sort-star="<? if($_SESSION['favourites']['DB'][$key] == 1) echo '1'; else echo '0'; ?>">
120121
<div class="l-unit__col l-unit__col--right">
121122
<div>
122123
<div class="clearfix l-unit__stat-col--left super-compact">
@@ -167,9 +168,9 @@
167168
</div>
168169
<!-- END QUICK ACTION TOOLBAR AREA -->
169170
<div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['TYPE']?></div>
171+
<div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span></div>
170172
<div class="clearfix l-unit__stat-col--left text-center wide"><b><?=$data[$key]['DBUSER']?></b></div>
171173
<div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['HOST']?></b></div>
172-
<div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span></div>
173174
<div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['CHARSET']?></div>
174175
</div>
175176
</div>

‎web/templates/admin/list_dns.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
<a href="/add/dns/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add DNS Domain')?></a>
88
<? } ?>
99
</div>
10-
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
11-
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
12-
<li entity="sort-expire" sort_as_int="1"><span class="name"><?=_('Expire')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
13-
<li entity="sort-name"><span class="name"><?=_('Domain')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
14-
<li entity="sort-ip"><span class="name"><?=_('IP address')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
15-
<li entity="sort-records"><span class="name"><?=_('Records')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
10+
<ul class="context-menu sort-order animated fadeIn" style="display: none;">
11+
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
12+
<li entity="sort-name"><span class="name" id="default-sort"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
13+
<li entity="sort-expire" sort_as_int="1"><span class="name"><?=_('Expire')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
14+
<li entity="sort-ip"><span class="name"><?=_('IP address')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
15+
<li entity="sort-records"><span class="name"><?=_('Records')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
1616
</ul>
1717
<div class="l-sort-toolbar clearfix">
1818
<table>
1919
<tr>
2020
<td class="sort-by" title="<?=_('Sort items');?>">
21-
<?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
21+
<?=_('sort by');?>: <span><b><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></b></span>
2222
</td>
2323
<td class="l-sort-toolbar__search-box">
2424
<form action="/search/" method="get">

‎web/templates/admin/list_dns_rec.html‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,19 @@
99
<a href="/edit/dns/?domain=<?=htmlentities($_GET['domain'])?>" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-pencil-alt status-icon blue"></i> <?=_('Editing DNS Domain')?></a>
1010
<? } ?>
1111
</div>
12+
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
13+
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
14+
<li entity="sort-value"><span class="name"><?=_('IP or Value')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
15+
<li entity="sort-record"><span class="name" id="default-sort"><?=_('Record')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
16+
<li entity="sort-ttl" sort_as_int="1"><span class="name"><?=_('TTL')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
17+
<li entity="sort-type"><span class="name"><?=_('Type')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
18+
</ul>
1219
<div class="l-sort-toolbar clearfix">
1320
<table>
1421
<tr>
22+
<td class="sort-by" title="<?=_('Sort items');?>">
23+
<?=_('sort by');?>: <span><b><?=_('Record')?> <i class="fas fa-sort-alpha-down"></i></b></span>
24+
</td>
1525
<td class="l-sort-toolbar__search-box">
1626
<form action="/search/" method="get">
1727
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -68,7 +78,7 @@
6878
?>
6979

7080
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS_REC'][$key] == 1) echo ' l-unit--starred';?> animated fadeIn"
71-
v_unit_id="<?=$key?>" v_section="dns_rec">
81+
v_unit_id="<?=$key?>" v_section="dns_rec" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-record="<?=$data[$key]['RECORD']?>" sort-type="<?=$data[$key]['TYPE']?>" sort-ttl="<?=$data[$key]['TTL']?>" sort-value="<?=$data[$key]['VALUE']?>">
7282
<div class="l-unit__col l-unit__col--right">
7383
<div class="clearfix l-unit__stat-col--left super-compact">
7484
<input id="check<?=$data[$key]['ID']?>" class="ch-toggle" type="checkbox" title="<?=_('Select')?>" name="record[]" value="<?=$data[$key]['ID']?>" <?=$display_mode;?>>

‎web/templates/admin/list_firewall.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
<?php endif; ?>
1010
</div>
1111
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
12-
<li entity="sort-action"><span class="name"><?=_('Action')?> <i class="fas fa-sort-amount-down"></i></span><span class="up active"><i class="fas fa-sort-amount-up"></i></span></li>
13-
<li entity="sort-protocol"><span class="name"><?=_('Protocol')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
14-
<li entity="sort-port"><span class="name"><?=_('Port')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
15-
<li entity="sort-ip" sort_as_int="1"><span class="name"><?=_('IP address')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
16-
<li entity="sort-comment"><span class="name"><?=_('Comment')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
12+
<li entity="sort-action"><span class="name"><?=_('Action')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up active"><i class="fas fa-sort-alpha-up"></i></span></li>
13+
<li entity="sort-protocol"><span class="name"><?=_('Protocol')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
14+
<li entity="sort-port"><span class="name"><?=_('Port')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
15+
<li entity="sort-ip" sort_as_int="1"><span class="name"><?=_('IP address')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
16+
<li entity="sort-comment"><span class="name"><?=_('Comment')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
1717
</ul>
1818
<div class="l-sort-toolbar clearfix">
1919
<table>
2020
<tr>
2121
<td class="sort-by" title="<?=_('Sort items');?>">
22-
<?=_('sort by');?>: <span><b><?=_('Action')?> <i class="fas fa-sort-amount-up"></i></b></span>
22+
<?=_('sort by');?>: <span><b><?=_('Action')?> <i class="fas fa-sort-alpha-up"></i></b></span>
2323
</td>
2424
<td>
2525
<form action="/bulk/firewall/" method="post" id="objects">

‎web/templates/admin/list_ip.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
<?php }?>
99
</div>
1010
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
11-
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
12-
<li entity="sort-ip"><span class="name"><?=_('ip')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
13-
<li entity="sort-netmask"><span class="name"><?=_('Netmask')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
14-
<li entity="sort-interface"><span class="name"><?=_('Interface')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
15-
<li entity="sort-domains" sort_as_int="1"><span class="name"><?=_('Domains')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
16-
<li entity="sort-owner"><span class="name"><?=_('Owner')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
11+
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
12+
<li entity="sort-ip"><span class="name"><?=_('ip')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
13+
<li entity="sort-netmask"><span class="name"><?=_('Netmask')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
14+
<li entity="sort-interface"><span class="name"><?=_('Interface')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
15+
<li entity="sort-domains" sort_as_int="1"><span class="name"><?=_('Domains')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
16+
<li entity="sort-owner"><span class="name"><?=_('Owner')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
1717
</ul>
1818
<div class="l-sort-toolbar clearfix">
1919
<table>
2020
<tr>
2121
<td class="sort-by" title="<?=_('Sort items');?>">
22-
<?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
22+
<?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
2323
</td>
2424
<td>
2525
<form action="/bulk/ip/" method="post" id="objects">

0 commit comments

Comments
 (0)