Merge branch 'fix/ui-sort-order' into feature/user-roles

bin/v-add-user

@@ -237,6 +237,7 @@ U_BACKUPS='0'
 LANGUAGE=''
 THEME=''
 NOTIFICATIONS='no'
+PREF_UI_SORT='name'
 TIME='$time'
 DATE='$date'" > $USER_DATA/user.conf
 chmod 660 $USER_DATA/user.conf

bin/v-change-user-sort-order

@@ -0,0 +1,59 @@
+#!/bin/bash
+# info: updates user role
+# options: USER SORT_ORDER
+# labels: hestia
+#
+# example: v-change-user-sort-order user date
+#
+# Changes web UI display sort order for specified user.
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument definition
+user=$1
+sort_order=$2
+
+
+# Includes
+# shellcheck source=/usr/local/hestia/func/main.sh
+source $HESTIA/func/main.sh
+# shellcheck source=/usr/local/hestia/conf/hestia.conf
+source $HESTIA/conf/hestia.conf
+# Unset THEME variable from $HESTIA/conf/hestia.conf
+unset THEME
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+# Reading user values
+source $USER_DATA/user.conf
+
+is_format_valid 'user' 'theme'
+is_object_valid 'user' 'USER' "$user"
+
+is_object_unsuspended 'user' 'USER' "$user"
+
+# Perform verification if read-only mode is enabled
+check_hestia_demo_mode
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Set theme value
+check_ckey=$(grep "PREF_UI_SORT" $USER_DATA/user.conf)
+if [ -z "$check_ckey" ]; then
+    # Rebuild user configuration to repair missing value
+    $BIN/v-rebuild-user $user
+fi
+update_user_value "$user" '$PREF_UI_SORT' "$sort_order"
+
+#----------------------------------------------------------#
+#                       Hestia                             #
+#----------------------------------------------------------#
+
+exit

bin/v-list-user

@@ -80,6 +80,7 @@ json_list() {
         "LANGUAGE": "'$LANGUAGE'",
         "THEME": "'$THEME'",
         "NOTIFICATIONS": "'$NOTIFICATIONS'",
+        "PREF_UI_SORT": "'$PREF_UI_SORT'",
         "PHPCLI": "'$PHPCLI'",
         "TIME": "'$TIME'",
         "DATE": "'$DATE'"

func/rebuild.sh

@@ -39,6 +39,9 @@ rebuild_user_conf() {
     if [ -z "${THEME+x}" ]; then 
         sed -i "/LANGUAGE/a THEME=''" $USER_DATA/user.conf 
     fi
+    if [ -z "${PREF_UI_SORT+x}" ]; then 
+        sed -i "/NOTIFICATIONS/a PREF_UI_SORT='name'" $USER_DATA/user.conf 
+    fi
     # Run template trigger
     if [ -x "$HESTIA/data/packages/$PACKAGE.sh" ]; then
         $HESTIA/data/packages/$PACKAGE.sh "$user" "$CONTACT" "$NAME"

func/syshealth.sh

@@ -95,7 +95,7 @@ function syshealth_update_user_config_format() {
     # USER CONFIGURATION
     # Create array of known keys in configuration file
     system="user"
-    known_keys=(NAME PACKAGE CONTACT CRON_REPORTS MD5 RKEY TWOFA QRCODE PHPCLI ROLE SUSPENDED SUSPENDED_USERS SUSPENDED_WEB SUSPENDED_DNS SUSPENDED_MAIL SUSPENDED_DB SUSPENDED_CRON IP_AVAIL IP_OWNED U_USERS U_DISK U_DISK_DIRS U_DISK_WEB U_DISK_MAIL U_DISK_DB U_BANDWIDTH U_WEB_DOMAINS U_WEB_SSL U_WEB_ALIASES U_DNS_DOMAINS U_DNS_RECORDS U_MAIL_DKIM U_MAIL_DKIM U_MAIL_ACCOUNTS U_MAIL_DOMAINS U_MAIL_SSL U_DATABASES U_CRON_JOBS U_BACKUPS LANGUAGE THEME NOTIFICATIONS TIME DATE)
+    known_keys=(NAME PACKAGE CONTACT CRON_REPORTS MD5 RKEY TWOFA QRCODE PHPCLI ROLE SUSPENDED SUSPENDED_USERS SUSPENDED_WEB SUSPENDED_DNS SUSPENDED_MAIL SUSPENDED_DB SUSPENDED_CRON IP_AVAIL IP_OWNED U_USERS U_DISK U_DISK_DIRS U_DISK_WEB U_DISK_MAIL U_DISK_DB U_BANDWIDTH U_WEB_DOMAINS U_WEB_SSL U_WEB_ALIASES U_DNS_DOMAINS U_DNS_RECORDS U_MAIL_DKIM U_MAIL_DKIM U_MAIL_ACCOUNTS U_MAIL_DOMAINS U_MAIL_SSL U_DATABASES U_CRON_JOBS U_BACKUPS LANGUAGE THEME NOTIFICATIONS PREF_UI_SORT TIME DATE)
     write_kv_config_file
     unset system
     unset known_keys

web/css/src/themes/default.css

@@ -1333,11 +1333,13 @@ div.l-content > div.l-separator:nth-of-type(4) {
               inset -1px -1px 4px rgba(220,220,220,0.4);
 }
 
-.context-menu.sort-order span.name i.fas.fa-sort-amount-down {
+.context-menu.sort-order span.name i.fas.fa-sort-amount-down,
+.context-menu.sort-order span.name i.fas.fa-sort-alpha-down {
   float: right;
   margin-top: 2px;
 }
 
+
 .context-menu.sort-order li:last-child {
   border-bottom: none;
 }

web/edit/user/index.php

@@ -46,6 +46,7 @@ $v_email = $data[$v_username]['CONTACT'];
 $v_package = $data[$v_username]['PACKAGE'];
 $v_language = $data[$v_username]['LANGUAGE'];
 $v_user_theme = $data[$v_username]['THEME'];
+$v_sort_order = $data[$v_username]['PREF_UI_SORT'];
 $v_name = $data[$v_username]['NAME'];
 $v_shell = $data[$v_username]['SHELL'];
 $v_twofa = $data[$v_username]['TWOFA'];
@@ -165,6 +166,15 @@ if (!empty($_POST['save'])) {
         $v_qrcode = '';
     }
 
+    // Change default sort order
+    if (($v_sort_order != $_POST['v_sort_order']) && (empty($_SESSION['error_msg']))) {
+        $v_sort_order = escapeshellarg($_POST['v_sort_order']);
+        exec (HESTIA_CMD."v-change-user-sort-order ".escapeshellarg($v_username)." ".$v_sort_order, $output, $return_var);
+        check_return_code($return_var,$output);
+        unset($output);
+    }
+
+
     // Change package (admin only)
     if (($v_package != $_POST['v_package']) && ($_SESSION['userContext'] === 'admin') && (empty($_SESSION['error_msg']))) {
         $v_package = escapeshellarg($_POST['v_package']);

web/js/init.js

@@ -120,8 +120,8 @@ $(document).ready(function(){
               VE.tmp.sort_direction = $(this).hasClass('up')*1 || -1; 
 
               $('.l-sort .sort-by span b').html($(this).parent('li').find('.name').html());
-              $('.l-sort .sort-by i').removeClass('fa-sort-amount-up fa-sort-amount-down');
-              $(this).hasClass('up') ? $('.l-sort .sort-by i').addClass('fa-sort-amount-up') : $('.l-sort .sort-by i').addClass('fa-sort-amount-down');
+              $('.l-sort .sort-by i').removeClass('fa-sort-alpha-up fa-sort-alpha-down');
+              $(this).hasClass('up') ? $('.l-sort .sort-by i').addClass('fa-sort-alpha-up') : $('.l-sort .sort-by i').addClass('fa-sort-alpha-down');
               $('.units .l-unit').sort(function (a, b) {
                 if(VE.tmp.sort_as_int)
                   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/edit_user.html

@@ -199,6 +199,9 @@
                                                 if ((!empty($_SESSION['userTheme'])) && ( $value == $v_user_theme )) {
                                                     echo ' selected' ;
                                                 }
+                                                if ((empty($v_user_theme) && (!empty($_SESSION['THEME']))) && ( $value == $_SESSION['THEME'] )) {
+                                                    echo ' selected' ;
+                                                }
                                                 if ((!empty($_SESSION['userTheme'])) && ( $value == $_POST['v_user_theme'])){
                                                     echo ' selected' ;
                                                 }
@@ -209,6 +212,19 @@
                                 </td>
                             </tr>
                             <?}?>
+                            <tr>
+                                <td class="vst-text input-label">
+                                    <?php print _('Default sort order');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_sort_order">
+                                        <option value='date' <?php if($data[$user]['PREF_UI_SORT'] === '') echo 'selected' ?>><?php print _('Date'); ?></option>
+                                        <option value='name' <?php if($data[$user]['PREF_UI_SORT'] === 'name') echo 'selected' ?>><?php print _('Name'); ?></option>
+                                    </select>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print _('Package');?>

web/templates/admin/list_cron.html

@@ -13,14 +13,19 @@
           <? } ?> 
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Command')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Command'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/admin/list_db.html

@@ -27,17 +27,23 @@
           <? } ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
-          <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>
-          <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>
-          <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>
+          <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>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo '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>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
+          <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>
+          <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>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Database'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
@@ -82,9 +88,9 @@
                   <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print _('Database');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-right compact-3"><b>&nbsp;</b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print _('Type');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Disk');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print _('Username');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Hostname');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Disk');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Charset');?></b></div>
              </div>
           </div>
@@ -116,7 +122,7 @@
 
       <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"
 sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
-sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" sort-star="<? if($_SESSION['favourites']['DB'][$key] == 1) echo '1'; else echo '0'; ?>">
+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'; ?>">
             <div class="l-unit__col l-unit__col--right">
               <div>
                 <div class="clearfix l-unit__stat-col--left super-compact">
@@ -167,9 +173,9 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                   </div>
                   <!-- END QUICK ACTION TOOLBAR AREA -->
                   <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['TYPE']?></div>
+                  <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>
                   <div class="clearfix l-unit__stat-col--left text-center wide"><b><?=$data[$key]['DBUSER']?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['HOST']?></b></div>
-                  <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>
                   <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['CHARSET']?></div>
                </div>
             </div>

web/templates/admin/list_dns.html

@@ -7,18 +7,23 @@
             <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>
           <? } ?>
         </div>
-        <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
-          <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>
-          <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>
-          <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>
+        <ul class="context-menu sort-order animated fadeIn" style="display: none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo '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>
+          <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>
+          <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>
+          <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>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-		            <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Domain'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/admin/list_dns_rec.html

@@ -9,9 +9,24 @@
             <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>
           <? } ?>
         </div>
+        <ul class="context-menu sort-order animated fadeIn" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
+          <li entity="sort-record"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo '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>
+          <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>
+          <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>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
+              <td class="sort-by" title="<?=_('Sort items');?>">
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Record'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
+              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -68,7 +83,7 @@
       ?>
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS_REC'][$key] == 1) echo ' l-unit--starred';?> animated fadeIn"
-v_unit_id="<?=$key?>" v_section="dns_rec">
+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']?>">
         <div class="l-unit__col l-unit__col--right">
             <div class="clearfix l-unit__stat-col--left super-compact">
               <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

@@ -9,17 +9,17 @@
           <?php endif; ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
-          <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>
-          <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>
-          <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>
+          <li entity="sort-action"><span class="name" id="default-sort"><?=_('Action')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up active"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
+          <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>
+          <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>
+          <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>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                  <?=_('sort by');?>: <span><b><?=_('Action')?> <i class="fas fa-sort-amount-up"></i></b></span>
+                  <?=_('sort by');?>: <span><b><?=_('Action')?> <i class="fas fa-sort-alpha-up"></i></b></span>
               </td>
               <td>
                 <form action="/bulk/firewall/" method="post" id="objects">

web/templates/admin/list_ip.html

@@ -8,18 +8,18 @@
           <?php }?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
-          <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>
-          <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>
-          <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>
-          <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> 
+          <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>
+          <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>
+          <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>
+          <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>
+          <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>
+          <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> 
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                  <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                  <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
                 </td>
               <td>
                 <form action="/bulk/ip/" method="post" id="objects">

web/templates/admin/list_mail.html

@@ -8,16 +8,21 @@
           <? } ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
-          <li entity="sort-accounts" sort_as_int="1"><span class="name"><?=_('Accounts')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
-          <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>
+          <li entity="sort-accounts" sort_as_int="1"><span class="name"><?=_('Accounts')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo '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>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                    <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Domain'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/admin/list_mail_acc.html

@@ -14,15 +14,21 @@
           <? } ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <li entity="sort-name"><span class="name"><?=_('Account')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
-          <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>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Account')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-quota" sort_as_int="1"><span class="name"><?=_('Quota')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                  <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Account'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
@@ -94,7 +100,7 @@
 
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo ' l-unit--starred'; ?> animated fadeIn"
  v_unit_id="<?=$key."@".$_GET['domain']?>" v_section="mail_acc" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
-sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo '1'; else echo '0'; ?>">
+ sort-quota="<?=$data[$key]['QUOTA']?>" sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo '1'; else echo '0'; ?>">
             <div class="l-unit__col l-unit__col--right">
               <div class="clearfix l-unit__stat-col--left super-compact">
                 <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select')?>" name="account[]" value="<?php echo $key ?>" <?=$display_mode;?>>

web/templates/admin/list_packages.html

@@ -5,14 +5,14 @@
         <a href="/add/package/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Package')?></a>
     </div>
       <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-        <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>
-        <li entity="sort-name"><span class="name"><?=_('Package Name')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+        <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>
+        <li entity="sort-name"><span class="name" id="default-sort"><?=_('Package')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
       </ul>
       <div class="l-sort-toolbar clearfix">
         <table>
           <tr>
             <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span><b><?=_('Package')?> <i class="fas fa-sort-alpha-down"></i></b></span>
             </td>
             <td>
               <form action="/bulk/package/" method="post" id="objects">

web/templates/admin/list_search.html

@@ -5,14 +5,14 @@
         <a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-sync status-icon green"></i> <?=_('Refresh')?></a>
       </div>
       <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-        <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>
-        <li entity="sort-name"><span class="name"><?=_('Name')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+        <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>
+        <li entity="sort-name"><span class="name"><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
       </ul>
       <div class="l-sort-toolbar clearfix">
         <table>
           <tr>
             <td class="sort-by" title="<?=_('Sort items');?>">
-              <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+              <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
             </td>
             <td class="l-sort-toolbar__search-box">
               <form action="/search/" method="get">

web/templates/admin/list_services.html

@@ -18,9 +18,16 @@
               </a>
           </div>
         </div>
+        <ul class="context-menu sort-order animated fadeIn" style="display:none;">
+          <li entity="sort-memory" sort_as_int="1"><span class="name"><?=_('Memory')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="default-sort"><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
+              <td class="sort-by" title="<?=_('Sort items');?>">
+                <?=_('sort by');?>: <span><b><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></b></span>
+              </td>
               <td>
                 <form action="/bulk/service/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -121,7 +128,8 @@
           if ($cpu == '0.0')  $cpu = 0;
       ?>
 
-        <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?> animated fadeIn">
+        <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?> animated fadeIn"  sort-name="<?=strtolower($key)?>"
+          sort-memory="<?=$data[$key]['MEM']?>" sort-cpu="<?=$cpu;?>" sort-uptime="<?=$data[$key]['RTIME']?>">
           <div class="l-unit__col l-unit__col--right">
           <div class="clearfix l-unit__stat-col--left super-compact">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select')?>" name="service[]" value="<?php echo $key ?>">

web/templates/admin/list_user.html

@@ -11,16 +11,21 @@
         ?>
       </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <li entity="sort-name"><span class="name" id="default-sort"><?=_('Username')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
-          <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>
-          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                  <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Domain'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                   <form action="/search/" method="get">

web/templates/admin/list_web.html

@@ -8,17 +8,22 @@
           <? } ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
-          <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>
-          <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>
-          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo '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>
+          <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>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Domain'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/user/list_cron.html

@@ -9,14 +9,14 @@
           <? } ?> 
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
+          <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>
+          <li entity="sort-name"><span class="name"><?=_('Command')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/user/list_db.html

@@ -23,17 +23,17 @@
           <? } ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
-          <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>
-          <li entity="sort-user"><span class="name"><?=_('User')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
-          <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>
+          <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>
+          <li entity="sort-name"><span class="name"><?=_('Database')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
+          <li entity="sort-user"><span class="name"><?=_('User')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/user/list_dns.html

@@ -4,17 +4,17 @@
           <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>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
-          <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>
-          <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>
-          <li entity="sort-records"><span class="name"><?=_('Records_DNS')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+          <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>
+          <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>
+          <li entity="sort-name"><span class="name"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
+          <li entity="sort-records"><span class="name"><?=_('Records_DNS')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-		            <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+		            <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/user/list_mail.html

@@ -4,16 +4,16 @@
       <a href="/add/mail/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Mail Domain')?></a>
     </div>
     <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-      <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>
-      <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>
-      <li entity="sort-accounts" sort_as_int="1"><span class="name"><?=_('Accounts')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
-      <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>
+      <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>
+      <li entity="sort-name"><span class="name"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+      <li entity="sort-accounts" sort_as_int="1"><span class="name"><?=_('Accounts')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+      <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>
     </ul>
     <div class="l-sort-toolbar clearfix">
       <table>
         <tr>
           <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
           </td>
           <td class="l-sort-toolbar__search-box">
             <form action="/search/" method="get">

web/templates/user/list_mail_acc.html

@@ -10,15 +10,15 @@
           <a href="/edit/mail/?domain=<?=htmlentities($_GET['domain'])?>" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-pencil-alt status-icon blue"></i><?=_('Editing Mail Domain')?></a>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <li entity="sort-name"><span class="name"><?=_('Account')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
-          <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>
+          <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>
+          <li entity="sort-name"><span class="name"><?=_('Account')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                  <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                  <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/user/list_search.html

@@ -5,14 +5,14 @@
         <a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-sync status-icon green"></i><?=_('Refresh')?></a>
       </div>
       <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-        <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>
-        <li entity="sort-name"><span class="name"><?=_('Name')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+        <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>
+        <li entity="sort-name"><span class="name"><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
       </ul>
       <div class="l-sort-toolbar clearfix">
         <table>
           <tr>
             <td class="sort-by" title="<?=_('Sort items');?>">
-              <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+              <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
             </td>
             <td class="l-sort-toolbar__search-box">
               <form action="/search/" method="get">

web/templates/user/list_user.html

@@ -15,16 +15,16 @@
         ?>
       </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <li entity="sort-name"><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>
-          <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>
-          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+          <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>
+          <li entity="sort-name"><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>
+          <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>
+          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                  <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                  <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
               </td>
               <td class="l-sort-toolbar__search-box">
                   <form action="/search/" method="get">

web/templates/user/list_web.html

@@ -10,17 +10,17 @@
             ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <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>
-          <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>
-          <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>
-          <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>
-          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+          <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>
+          <li entity="sort-name"><span class="name"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <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>
+          <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>
+          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">