Update packages page, status icons CSS, and backend CLI scripts

web/copy/package/index.php

@@ -0,0 +1,41 @@
+<?php
+// Init
+error_reporting(NULL);
+ob_start();
+session_start();
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+// Check token
+if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
+    header('location: /login/');
+    exit();
+}
+
+// Check user
+if ($_SESSION['user'] != 'admin') {
+    header("Location: /list/user");
+    exit;
+}
+
+// Check package argument
+if (empty($_GET['package'])) {
+    header("Location: /list/package/");
+    exit;
+}
+
+if ($_SESSION['user'] == 'admin') {
+    if (!empty($_GET['package'])) {
+        $v_package = escapeshellarg($_GET['package']);
+        exec (HESTIA_CMD."v-copy-user-package ".$v_package." ".$v_package."-copy", $output, $return_var);
+    }
+
+    if ($return_var != 0) {
+        $error = implode('<br>', $output);
+        if (empty($error)) $error = 'Error: unable to copy package.';
+            $_SESSION['error_msg'] = $error;
+    }
+    unset($output);
+}
+
+header("Location: /list/package/");
+exit;

web/css/styles.min.css

@@ -3176,49 +3176,63 @@ form#vstobjects.suspended {
   color: #fff;
 }
 
-.status-icon-yellow, .status-icon-maroon:hover {
+.status-icon.large {
+  font-size: 1rem;
+}
+
+.status-icon.yellow, .status-icon.yellow:hover {
   color: #f3e72c;
 }
-.status-icon-teal, .status-icon-teal:hover {
+.status-icon.teal, .status-icon.teal:hover {
   color: #33cccc;
 }
-.status-icon-purple, .status-icon-purple:hover {
+.status-icon.purple, .status-icon.purple:hover {
   color: #8e2fca;
 }
 
-.status-icon-maroon, .status-icon-maroon:hover {
+.status-icon.maroon, .status-icon.maroon:hover {
   color: #cc3366;
 }
 
-.status-icon-red, .status-icon-red:hover {
+.status-icon.red, .status-icon.red:hover {
   color: #ff3333;
 }
 
-.status-icon-green, .status-icon-green:hover {
+.status-icon.green, .status-icon.green:hover {
   color: #53ba55;
 }
 
-.status-icon-orange, .status-icon-orange:hover {
+.status-icon.orange, .status-icon.orange:hover {
   color: #ffc043;
 }
 
-.status-icon-lightblue, .status-icon-lightblue:hover {
+.status-icon.lightblue, .status-icon.lightblue:hover {
   color: #6eb6f0;
 }
 
-.status-icon-highlight, .status-icon-highlight:hover {
+.status-icon.highlight, .status-icon.highlight:hover {
   color: #323232;
 }
 
-.status-icon-blue, .status-icon-blue:hover {
+.status-icon.blue, .status-icon.blue:hover {
   color: #326b9b;
 }
 
-.status-icon-dim {
+.status-icon.dim {
+  color: #ddd;
+  text-shadow: 1px 1px rgba(255,255,255,0.3);
+}
+
+.status-icon.dim {
   color: #ddd;
   text-shadow: 1px 1px rgba(255,255,255,0.3);
 }
 
+.l-unit--suspended .status-icon.dim {
+  color: #c0c0c0 !important;
+  text-shadow: 0px !important;
+}
+
 .noselect {
   -webkit-touch-callout: none;
   -webkit-user-select: none;

web/inc/i18n/en.php

@@ -410,7 +410,7 @@ $LANG['en'] = array(
     'cron' => 'Cron',
     'user dir' => 'User Directory',
 
-    'unlimited'  => 'Unlimited',
+    'unlimited'  => '∞',
     '1 account'  => '1 account',
     '%s accounts'  => '%s accounts',
     '1 domain'  => '1 domain',
@@ -760,4 +760,5 @@ $LANG['en'] = array(
     'Enable 2FA' => 'Enable two-factor authentication',
     'Please scan the code below in your 2FA application:' => 'To finish setting up two-factor authentication, scan the QR code below<br />using an authentication app (such as <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google Authenticator</a>):',
     '2FA Reset Code:' => 'Account Recovery Code:',
+
 );

web/templates/admin/list_backup.html

@@ -1,8 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a href="/schedule/backup/" class="ui-button cancel" title="<?=__('Create Backup')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Create Backup')?></a>
-          <a href="/list/backup/exclusions/" class="ui-button cancel" title="<?=__('backup exclusions')?>"><i class="fas fa-folder-minus status-icon-orange"></i> <?=__('backup exclusions')?></a>
+          <a href="/schedule/backup/" class="ui-button cancel" title="<?=__('Create Backup')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Create Backup')?></a>
+          <a href="/list/backup/exclusions/" class="ui-button cancel" title="<?=__('backup exclusions')?>"><i class="fas fa-folder-minus status-icon orange"></i> <?=__('backup exclusions')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>
@@ -79,11 +79,11 @@
                   <div class="clearfix l-unit__stat-col--left compact-4 text-right">
                     <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                       <div class="actions-panel clearfix">
-                        <div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-file-download status-icon-lightblue status-icon-dim"></i></a></div>
-                        <div class="actions-panel__col actions-panel__list shortcut-d" key-action="href"><a href="/list/backup/?backup=<?=$key?>"><i class="fas fa-undo status-icon-green status-icon-dim"></i></a></div>
+                        <div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-file-download status-icon lightblue status-icon dim"></i></a></div>
+                        <div class="actions-panel__col actions-panel__list shortcut-d" key-action="href"><a href="/list/backup/?backup=<?=$key?>"><i class="fas fa-undo status-icon green status-icon dim"></i></a></div>
                         <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                           <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                            <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                            <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                             <input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" />
                             <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                               <p class="confirmation"><?=__('DELETE_BACKUP_CONFIRMATION',$key)?></p>

web/templates/admin/list_backup_detail.html

@@ -1,8 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/backup/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
-          <a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="ui-button cancel" title="<?=__('Restore All')?>"><i class="fas fa-undo status-icon-green"></i> <?=__('Restore All')?></a>
+          <a class="ui-button cancel" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+          <a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="ui-button cancel" title="<?=__('Restore All')?>"><i class="fas fa-undo status-icon green"></i> <?=__('Restore All')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>

web/templates/admin/list_backup_exclusions.html

@@ -1,8 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/backup/"><i class="fas fa-arrow-left status-icon-blue"></i><?=__('Back')?></a>
-          <a href="/edit/backup/exclusions/" class="ui-button cancel" title="<?=__('Edit Backup Exclusions')?>"><i class="fas fa-pencil-alt status-icon-orange"></i> <?=__('Edit Backup Exclusions')?></a>
+          <a class="ui-button cancel" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?=__('Back')?></a>
+          <a href="/edit/backup/exclusions/" class="ui-button cancel" title="<?=__('Edit Backup Exclusions')?>"><i class="fas fa-pencil-alt status-icon orange"></i> <?=__('Edit Backup Exclusions')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>

web/templates/admin/list_cron.html

@@ -1,12 +1,12 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a href="/add/cron/" class="ui-button cancel" title="<?=__('Add Cron Job')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Cron Job')?></a>
+          <a href="/add/cron/" class="ui-button cancel" title="<?=__('Add Cron Job')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Cron Job')?></a>
           <?
             if($panel[$user]['CRON_REPORTS'] == 'yes') {
-              echo '<a class="ui-button cancel" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell status-icon-orange"></i> '.__('turn off notifications').'</a>';
+              echo '<a class="ui-button cancel" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell status-icon orange"></i> '.__('turn off notifications').'</a>';
             } else {
-              echo '<a class="ui-button cancel" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell-slash status-icon-orange"></i> '.__('turn on notifications').'</a>';
+              echo '<a class="ui-button cancel" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell-slash status-icon orange"></i> '.__('turn on notifications').'</a>';
             }
           ?>
         </div>
@@ -92,10 +92,10 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
         <div class="clearfix l-unit__stat-col--left compact-2 text-right">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
-              <div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+              <div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
                 <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
                   <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                    <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                    <i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                     <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
                     <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                       <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -104,7 +104,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
                 </div>
                 <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                   <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                    <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                    <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                     <input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
                     <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                       <p class="confirmation"><?=__('DELETE_CRON_CONFIRMATION',$key)?></p>

web/templates/admin/list_db.html

@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a href="/add/db/" class="ui-button cancel" title="<?=__('Add Database')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Database')?></a>
+          <a href="/add/db/" class="ui-button cancel" title="<?=__('Add Database')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Database')?></a>
           <?
             $mysql = 0;
             $pgsql = 0;
@@ -25,10 +25,10 @@
               }
             }
             if($mysql){
-              echo '<a class="ui-button cancel" href="'.$db_myadmin_link.'" target="_blank"><i class="fas fa-database status-icon-orange"></i> Database Editor</a>';
+              echo '<a class="ui-button cancel" href="'.$db_myadmin_link.'" target="_blank"><i class="fas fa-database status-icon orange"></i> Database Editor</a>';
             }
             if($pgsql){
-              echo '<a class="ui-button cancel" href="'.$db_pgadmin_link.'" target="_blank"><i class="fas fa-database status-icon-orange"></i> Database Editor</a>';
+              echo '<a class="ui-button cancel" href="'.$db_pgadmin_link.'" target="_blank"><i class="fas fa-database status-icon orange"></i> Database Editor</a>';
             }
           ?>
         </div>
@@ -126,10 +126,10 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                 <div class="clearfix l-unit__stat-col--left text-right compact-2">
                       <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                           <div class="actions-panel clearfix">
-                            <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/db/?database=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+                            <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/db/?database=<?=$key?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
                             <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
                               <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                                <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                                <i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                                 <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                                   <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -138,7 +138,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                             </div>
                             <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                               <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                                <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                                <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                                 <input type="hidden" name="delete_url" value="/delete/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                                   <p class="confirmation"><?=__('DELETE_DATABASE_CONFIRMATION',$key)?></p>

web/templates/admin/list_dns.html

@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a href="/add/dns/" class="ui-button cancel" title="<?=__('Add DNS Domain')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add DNS Domain')?></a>
+          <a href="/add/dns/" class="ui-button cancel" title="<?=__('Add DNS Domain')?>"><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>
@@ -88,13 +88,13 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
                   <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                   <div class="actions-panel clearfix">
 
-                    <div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=$key?>"><i class="fas fa-plus-circle status-icon-green status-icon-dim"></i></a></div>
-                    <div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=$key?>"><i class="fas fa-list status-icon-lightblue status-icon-dim"></i></div>
-                    <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+                    <div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=$key?>"><i class="fas fa-plus-circle status-icon green status-icon dim"></i></a></div>
+                    <div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=$key?>"><i class="fas fa-list status-icon lightblue status-icon dim"></i></div>
+                    <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
 
                     <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
                       <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                        <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                        <i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                         <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                         <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                           <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -103,7 +103,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
                     </div>
                     <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                       <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                        <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                        <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                           <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                             <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                               <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>

web/templates/admin/list_dns_rec.html

@@ -1,8 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/dns/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
-          <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" class="ui-button cancel" title="<?=__('Add DNS Record')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Record')?></a>
+          <a class="ui-button cancel" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+          <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" class="ui-button cancel" title="<?=__('Add DNS Record')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Record')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>
@@ -76,10 +76,10 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
             <div class="clearfix l-unit__stat-col--left compact text-right">
               <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                 <div class="actions-panel clearfix">
-                  <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+                  <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
                   <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                     <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                      <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                      <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                       <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" />
                       <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                         <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>

web/templates/admin/list_firewall.html

@@ -1,10 +1,10 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/server/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
-          <a href="/add/firewall/" class="ui-button cancel" title="<?=__('Add Rule')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Rule')?></a>
+          <a class="ui-button cancel" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+          <a href="/add/firewall/" class="ui-button cancel" title="<?=__('Add Rule')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Rule')?></a>
           <? if(!empty($_SESSION['FIREWALL_EXTENSION'])) {
-            echo '<a class="ui-button cancel" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon-red"></i> '.__('list fail2ban').'</a>';
+            echo '<a class="ui-button cancel" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon red"></i> '.__('list fail2ban').'</a>';
           } ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
@@ -82,9 +82,9 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
             <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/firewall/?rule=<?=$key?>">
                 <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
                   <? if ($data[$key]['ACTION'] == 'DROP') { ?>
-                    <i class="fas fa-minus-circle status-icon-red icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
+                    <i class="fas fa-minus-circle status-icon red icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
                   <? } else {?>
-                    <i class="fas fa-check-circle status-icon-green icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
+                    <i class="fas fa-check-circle status-icon green icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
                   <? } ?>
                 <? } else {?>
                   <? if ($data[$key]['ACTION'] == 'DROP') { ?>
@@ -99,11 +99,11 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
             <div class="clearfix l-unit__stat-col--left compact text-right">
               <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                 <div class="actions-panel clearfix">
-                  <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/firewall/?rule=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+                  <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/firewall/?rule=<?=$key?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
                         
                   <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
                     <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                      <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                      <i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                       <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
                       <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                         <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -112,7 +112,7 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
                   </div>
                   <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                     <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                      <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                      <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                       <input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
                       <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                         <p class="confirmation"><?=__('DELETE_RULE_CONFIRMATION',$key)?></p>

web/templates/admin/list_firewall_banlist.html

@@ -1,8 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/firewall/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
-          <a href="/add/firewall/banlist" class="ui-button cancel" title="<?=__('Ban IP Address')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Ban IP Address')?></a>
+          <a class="ui-button cancel" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+          <a href="/add/firewall/banlist" class="ui-button cancel" title="<?=__('Ban IP Address')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Ban IP Address')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>
@@ -60,7 +60,7 @@
                     <div class="actions-panel clearfix">
                       <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                         <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                          <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                          <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                           <input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>" />
                           <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                             <p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>

web/templates/admin/list_ip.html

@@ -1,8 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/server/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
-          <a href="/add/ip/" class="ui-button cancel" title="<?=__('Add IP')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add IP')?></a>
+          <a class="ui-button cancel" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+          <a href="/add/ip/" class="ui-button cancel" title="<?=__('Add IP')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add IP')?></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>
@@ -76,10 +76,10 @@ sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites'][
               <div class="clearfix l-unit__stat-col--left compact text-right">
                     <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                         <div class="actions-panel clearfix">
-                          <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/ip/?ip=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+                          <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/ip/?ip=<?=$key?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
                           <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                             <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                              <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                              <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                               <input type="hidden" name="delete_url" value="/delete/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>" />
                               <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                                 <p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>

web/templates/admin/list_log.html

@@ -1,8 +1,8 @@
 <div class="l-center">
   <div class="l-sort clearfix noselect">
     <div class="l-unit-toolbar__buttonstrip">
-      <a href="javascript:location.reload();" class="ui-button cancel" title="<?=__('Clear Log')?>"><i class="fas fa-redo status-icon-green"></i> <?=__('Refresh')?></a>
-      <a href="/delete/log/?token=<?=$_SESSION['token']?>" class="ui-button cancel" title="<?=__('Clear Log')?>"><i class="fas fa-times-circle status-icon-red"></i> <?=__('Delete Log')?></a>
+      <a href="javascript:location.reload();" class="ui-button cancel" title="<?=__('Clear Log')?>"><i class="fas fa-redo status-icon green"></i> <?=__('Refresh')?></a>
+      <a href="/delete/log/?token=<?=$_SESSION['token']?>" class="ui-button cancel" title="<?=__('Clear Log')?>"><i class="fas fa-times-circle status-icon red"></i> <?=__('Delete Log')?></a>
     </div>
     <div class="l-sort-toolbar clearfix">
     </div>

web/templates/admin/list_mail.html

@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a href="/add/mail/" class="ui-button cancel" title="<?=__('Add Mail Domain')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Mail Domain')?></a>
+          <a href="/add/mail/" class="ui-button cancel" title="<?=__('Add Mail Domain')?>"><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>
@@ -97,14 +97,14 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                   <div class="clearfix l-unit__stat-col--left text-right compact-4">
                       <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                           <div class="actions-panel clearfix">
-                            <div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>"><i class="fas fa-plus-circle status-icon-green status-icon-dim"></i></a></div>
-                            <div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>"><i class="fas fa-users status-icon-blue status-icon-dim"></i></div>
-                            <div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=$key?>/" target="_blank"><i class="fas fa-paper-plane status-icon-lightblue status-icon-dim"></i></div>
-                            <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+                            <div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>"><i class="fas fa-plus-circle status-icon green status-icon dim"></i></a></div>
+                            <div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>"><i class="fas fa-users status-icon blue status-icon dim"></i></div>
+                            <div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=$key?>/" target="_blank"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></div>
+                            <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
 
                             <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
                               <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                                <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                                <i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                                 <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                                   <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -113,7 +113,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                             </div>
                             <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                               <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                                <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                                <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                                 <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                                   <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
@@ -138,7 +138,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                       <? if($data[$key]['ANTIVIRUS'] == 'no'){ ?>
                         <i class="fas fa-times-circle" style="color: red;"></i>
                       <? } else {?>
-                        <i class="fas fa-check-circle status-icon-green"></i>
+                        <i class="fas fa-check-circle status-icon green"></i>
                       <? } ?>
                     </b>
                   </div>
@@ -146,7 +146,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                       <? if($data[$key]['ANTISPAM'] == 'no'){ ?>
                         <i class="fas fa-times-circle" style="color: red;"></i>
                       <? } else {?>
-                        <i class="fas fa-check-circle status-icon-green"></i>
+                        <i class="fas fa-check-circle status-icon green"></i>
                       <? } ?>
                     </b>
                   </div>
@@ -154,7 +154,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                       <? if($data[$key]['DKIM'] == 'no'){ ?>
                         <i class="fas fa-times-circle" style="color: red;"></i>
                       <? } else {?>
-                        <i class="fas fa-check-circle status-icon-green"></i>
+                        <i class="fas fa-check-circle status-icon green"></i>
                       <? } ?>
                     </b>
                   </div>
@@ -162,7 +162,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                       <? if($data[$key]['SSL'] == 'no'){ ?>
                         <i class="fas fa-times-circle" style="color: red;"></i>
                       <? } else {?>
-                        <i class="fas fa-check-circle status-icon-green"></i>
+                        <i class="fas fa-check-circle status-icon green"></i>
                       <? } ?>
                     </b>
                   </div>

web/templates/admin/list_mail_acc.html

@@ -1,8 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/mail/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
-          <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="ui-button cancel" title="<?=__('Add Mail Account')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Mail Account')?></a>
+          <a class="ui-button cancel" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+          <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="ui-button cancel" title="<?=__('Add Mail Account')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Mail Account')?></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>
@@ -98,12 +98,12 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
               <div class="clearfix l-unit__stat-col--left text-right compact-4">
                 <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                   <div class="actions-panel clearfix">
-                    <div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>&&_action=login" target="_blank"><i class="fas fa-envelope-open-text status-icon-maroon status-icon-dim"></i></div>
-                    <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+                    <div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>&&_action=login" target="_blank"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></div>
+                    <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
 
                     <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
                       <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                        <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                        <i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                         <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?php echo $key ?>&token=<?=$_SESSION['token']?>" />
                         <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                           <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -112,7 +112,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                     </div>
                     <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                     <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                      <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                      <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                         <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" />
                         <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                           <p class="confirmation"><?=__('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key)?></p>
@@ -132,7 +132,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                           <? if($data[$key]['ALIAS'] == ''){ ?>
                             0
                           <? } else {?>
-                            <i class="fas fa-check-circle status-icon-green"></i>
+                            <i class="fas fa-check-circle status-icon green"></i>
                           <? } ?>
                       <? } else {?>
                         <? if($data[$key]['ALIAS'] == ''){ ?>
@@ -148,7 +148,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                           <? if($data[$key]['FWD'] == ''){ ?>
                             <i class="fas fa-minus-circle"></i>
                           <? } else {?>
-                            <i class="fas fa-check-circle status-icon-green"></i>
+                            <i class="fas fa-check-circle status-icon green"></i>
                           <? } ?>
                       <? } else {?>
                           <? if($data[$key]['FWD'] == ''){ ?>
@@ -164,7 +164,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                           <? if($data[$key]['AUTOREPLY'] == 'no'){ ?>
                             <i class="fas fa-minus-circle"></i>
                           <? } else {?>
-                            <i class="fas fa-check-circle status-icon-green"></i>
+                            <i class="fas fa-check-circle status-icon green"></i>
                           <? } ?>
                       <? } else {?>
                           <? if($data[$key]['AUTOREPLY'] == 'no'){ ?>

web/templates/admin/list_packages.html

@@ -1,301 +1,217 @@
-    <div class="l-center">
-      <div class="l-sort clearfix noselect">
-        <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/user/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
-          <a href="/add/package/" class="ui-button cancel" title="<?=__('Add Package')?>"><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')?></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
-          <li entity="sort-name"><span class="name"><?=__('Package Name')?></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
-          <li entity="sort-star" sort_as_int="1"><span class="name"><?=__('Starred')?></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
-        </ul>
-        <div class="l-sort-toolbar clearfix">
-          <table>
-            <tr>
-              <td class="sort-by">
+  <div class="l-center">
+    <div class="l-sort clearfix noselect">
+      <div class="l-unit-toolbar__buttonstrip">
+        <a class="ui-button cancel" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+        <a href="/add/package/" class="ui-button cancel" title="<?=__('Add Package')?>"><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')?></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+        <li entity="sort-name"><span class="name"><?=__('Package Name')?></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
+        <li entity="sort-star" sort_as_int="1"><span class="name"><?=__('Starred')?></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>      </ul>
+      <div class="l-sort-toolbar clearfix">
+        <table>
+          <tr>
+            <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?> <i class="fas fa-sort-amount-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']?>" />
-                  <input type="text" name="q" class="search-input" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" />
-                  <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
-                </form>
-              </td>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
-              <td>
-                <form action="/bulk/package/" method="post" id="objects">
+            </td>
+            <td>
+              <form action="/bulk/package/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                 <div class="l-select">
-                  <select name="action" id="">
+                  <select class="" name="action">
                     <option value=""><?=__('apply to selected')?></option>
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" class="l-sort-toolbar__filter-apply" value="" />
-              </td>
-
-            </tr>
-          </table>
-        </div>
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
+            </td>
+          </tr>
+        </table>
       </div>
-      <!-- /.l-sort -->
     </div>
+  </div>
 
-    <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
-
-    <div class="l-center units animated fadeIn">
-      <?php
-        foreach ($data as $key => $value) {
-           ++$i;
-      ?>
-
-
-      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo ' l-unit--starred'; ?>"
-v_unit_id="<?=$key?>" v_section="package" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
-sort-star="<?if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo '1'; else echo '0'; ?>">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="package[]" value="<?php echo $key ?>">
-            
-          </div>
-          <!-- l-unit-toolbar__col -->
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <div class="actions-panel clearfix">
-              <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/package/?package=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="do_delete"></i>
-                  <input type="hidden" name="delete_url" value="/delete/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                  <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                    <p class="confirmation"><?=__('DELETE_PACKAGE_CONFIRMATION',$key)?></p>
-                  </div>
-                </a>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
+  <div class="l-separator"></div>
 
-            </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
+  <div class="l-center units animated fadeIn">
+      <div class="table-header"> 
+          <div class="l-unit__col l-unit__col--right">
+                <div class="clearfix l-unit__stat-col--left super-compact">
+                  <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
+                </div>
+                <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Package');?></b></div>
+                <div class="clearfix l-unit__stat-col--left compact-3 text-right"><b>&nbsp;</b></div>
+                <div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-terminal"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-hdd"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-exchange-alt"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe-americas"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-link"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-atlas"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-mail-bulk"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-inbox"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-database"></i></b></div>
+                <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-clock"></i></b></div>
+           </div>
         </div>
-        <!-- /.l-unit-toolbar -->
 
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
+    <?php
+      foreach ($data as $key => $value) {
+        ++$i;
+        if ($data[$key]['SUSPENDED'] == 'yes') {
+          $status = 'suspended';
+          $spnd_action = 'unsuspend' ;
+          $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ;
+        } else {
+          $status = 'active';
+          $spnd_action = 'suspend' ;
+          $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
+        }
+    ?>
+
+    <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred';?>" v_section="user"
+v_unit_id="<?=$key?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
+sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<? if($_SESSION['favourites']['USER'][$key] == 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<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
         </div>
-        <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate">
-            <?=$key?>
-          </div>
-
-
-          <div class="l-unit__stats">
-            <table>
-
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Web Template')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['WEB_TEMPLATE']?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('DNS domains')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['DNS_DOMAINS'])?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backups')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['BACKUPS']?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-              <tr>
-                <td>
-                  <? if (!empty($_SESSION['PROXY_SYSTEM'])) { ?>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Proxy Template')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['PROXY_TEMPLATE']?></b>
+            <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$key?></b></a>
+              <br />
+              <span style="font-size: 0.8rem;"><?=str_replace(',', ', ',$data[$key]['NS'])?></span>
+            </div>
+            <!-- START QUICK ACTION TOOLBAR AREA -->
+            <div class="clearfix l-unit__stat-col--left text-right compact-3">
+                  <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                      <div class="actions-panel clearfix">
+                        <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></div>
+                        <div class="actions-panel__col actions-panel__edit" key-action="href"><a href="/copy/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-clone status-icon teal status-icon dim"></i></div>
+                        <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                          <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                            <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
+                            <input type="hidden" name="delete_url" value="/delete/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                            <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                              <p class="confirmation"><?=__('DELETE_PACKAGE_CONFIRMATION',$key)?></p>
+                            </div>
+                          </a>
+                        </div>
+                      </div>
                     </div>
-                  </div>
+            </div>
+            <!-- END QUICK ACTION TOOLBAR AREA -->
+            <div class="clearfix l-unit__stat-col--left text-center compact">
+              <? if($data[$key]['SHELL'] == 'nologin'){ ?>
+                <i class="fas fa-minus-circle status-icon large"></i>
+              <? } else {?>
+                <i class="fas fa-check-circle status-icon large"></i>
+              <? } ?>
+            </div>
+            <div class="clearfix l-unit__stat-col--left text-center compact">
+              <?php if (preg_match('/[a-z]/i', $data[$key]['DISK_QUOTA'])): ?>
+                <b>&infin;</b>
+              <?php else: ?>
+                  <b><?=humanize_usage_size($data[$key]['DISK_QUOTA'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['DISK_QUOTA'])?></span>
+              <?php endif; ?>
+            </div>
+            <div class="clearfix l-unit__stat-col--left text-center compact">
+                <? if($data[$key]['WEB_DOMAINS'] == 'unlimited'){ ?>
+                  <b>&infin;</b>
+                <? } else {?>
+                  <b><?=humanize_usage_size($data[$key]['BANDWIDTH'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['BANDWIDTH'])?></span>
+                <? } ?>
+            </div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact">
+              <span class="jump-top badge gray raised">
+                <? if($data[$key]['WEB_DOMAINS'] == 'unlimited'){ ?>
+                  <b>&infin;</b>
+                <? } else {?>
+                 <b><?=$data[$key]['WEB_DOMAINS']?></b>
+                <? } ?>
+              </span>
+            </div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact">
+                <span class="jump-top badge gray raised">
+                  <? if($data[$key]['WEB_ALIASES'] == 'unlimited'){ ?>
+                    <b>&infin;</b>
+                  <? } else {?>
+                   <b><?=$data[$key]['WEB_ALIASES']?></b>
                   <? } ?>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('DNS records')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['DNS_RECORDS'])?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Bandwidth')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-<?php if (preg_match('/[a-z]/i', $data[$key]['BANDWIDTH'])): ?>
-                      <b><?=__($data[$key]['BANDWIDTH'])?></b>
-<?php else: ?>
-                      <b><?=humanize_usage_size($data[$key]['BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['BANDWIDTH'])?>
-
-<?php endif; ?>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('DNS Template')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['DNS_TEMPLATE']?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Mail Domains')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['MAIL_DOMAINS'])?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-<?php if (preg_match('/[a-z]/i', $data[$key]['DISK_QUOTA'])): ?>
-                      <b><?=__($data[$key]['DISK_QUOTA'])?></b>
-<?php else: ?>
-                      <b><?=humanize_usage_size($data[$key]['DISK_QUOTA'])?></b> <?=humanize_usage_measure($data[$key]['DISK_QUOTA'])?>
-
-<?php endif; ?>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('SSH Access')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['SHELL']?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Mail Accounts')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['MAIL_ACCOUNTS'])?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Name Servers')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=str_replace(',', '<br>',$data[$key]['NS'])?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Web Domains')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['WEB_DOMAINS'])?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Databases')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['DATABASES'])?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                </td>
-              </tr>
-
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Web Aliases')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['WEB_ALIASES'])?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Cron Jobs')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['CRON_JOBS'])?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                </td>
-              </tr>
-
-            </table>
-          </div>
-          <!-- /.l-unit__stats -->
+                </span>
+            </div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact">
+                <span class="jump-top badge gray raised">
+                  <? if($data[$key]['DNS_DOMAINS'] == 'unlimited'){ ?>
+                    <b>&infin;</b>
+                  <? } else {?>
+                   <b><?=$data[$key]['DNS_DOMAINS']?></b>
+                  <? } ?>
+                </span>
+            </div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact">
+                <span class="jump-top badge gray raised">
+                  <? if($data[$key]['DNS_RECORDS'] == 'unlimited'){ ?>
+                    <b>&infin;</b>
+                  <? } else {?>
+                   <b><?=$data[$key]['DNS_RECORDS']?></b>
+                  <? } ?>
+                </span>
+            </div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact">
+                <span class="jump-top badge gray raised">
+                  <? if($data[$key]['MAIL_DOMAINS'] == 'unlimited'){ ?>
+                    <b>&infin;</b>
+                  <? } else {?>
+                   <b><?=$data[$key]['MAIL_DOMAINS']?></b>
+                  <? } ?>
+                </span>
+            </div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact">
+                <span class="jump-top badge gray raised">
+                  <? if($data[$key]['MAIL_ACCOUNTS'] == 'unlimited'){ ?>
+                    <b>&infin;</b>
+                  <? } else {?>
+                   <b><?=$data[$key]['MAIL_ACCOUNTS']?></b>
+                  <? } ?>
+                </span>
+            </div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact">
+                <span class="jump-top badge gray raised">
+                  <? if($data[$key]['DATABASES'] == 'unlimited'){ ?>
+                    <b>&infin;</b>
+                  <? } else {?>
+                   <b><?=$data[$key]['DATABASES']?></b>
+                  <? } ?>
+                </span>
+              </div>
+              <div class="clearfix l-unit__stat-col--left text-center super-compact">
+                  <span class="jump-top badge gray raised">
+                    <? if($data[$key]['CRON_JOBS'] == 'unlimited'){ ?>
+                      <b>&infin;</b>
+                    <? } else {?>
+                     <b><?=$data[$key]['CRON_JOBS']?></b>
+                    <? } ?>
+                  </span>
+                </div>
         </div>
-        <!-- /.l-unit__col -->
-      </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div-->
-      <!-- /.l-separator -->
-      <?}?>
-
-    </div>
+       </div>
+    <?}?>
+  </div>
 
-    <div id="vstobjects">
-        <div class="l-separator"></div>
-    <div class="l-center">
-        <div class="l-unit-ft">
-          <table class='data'></table>
-          <!-- /form -->
-          <div class="l-unit__col l-unit__col--left clearfix"></div>
-          <div class="data-count l-unit__col l-unit__col--right clearfix">
-            <?php
-              if ( $i == 1) {
-                echo __('1 package');
-              } else {
-                echo __('%s packages',$i);
-              }
-            ?>
-          </div>
-      </div>
+  <div id="vstobjects">
+      <div class="l-separator visible"></div>
+  <div class="l-center">
+      <div class="l-unit-ft">
+        <table class='data'></table>
+        <div class="l-unit__col l-unit__col--left clearfix"></div>
+        <div class="data-count l-unit__col l-unit__col--right clearfix">
+          <?php
+          if ( $i == 1) {
+            echo __('1 package');
+          } else {
+            echo __('%s packages',$i);
+          }
+        ?>
+        </div>
     </div>
   </div>
+</div>

web/templates/admin/list_rrd.html

@@ -1,8 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/server/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
-          <a href="/list/server/?cpu" class="ui-button cancel" title="<?=__('show: CPU / MEM / NET / DISK');?>"><i class="fas fa-chart-pie status-icon-green"></i> <?=__('show: CPU / MEM / NET / DISK');?></a>
+          <a class="ui-button cancel" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+          <a href="/list/server/?cpu" class="ui-button cancel" title="<?=__('show: CPU / MEM / NET / DISK');?>"><i class="fas fa-chart-pie status-icon green"></i> <?=__('show: CPU / MEM / NET / DISK');?></a>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>

web/templates/admin/list_services.html

@@ -1,12 +1,12 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a href="/edit/server/" class="ui-button cancel" title="<?=__('Configure')?>"><i class="fas fa-cog status-icon-maroon"></i> <?=__('Configure')?></a>
-          <a href="/list/rrd/" class="ui-button cancel" title="<?=__('Graphs')?>"><i class="fas fa-chart-area status-icon-green"></i> <?=__('Graphs')?></a>
-          <a href="/list/ip/" class="ui-button cancel" title="<?=__('IP')?>"><i class="fas fa-ethernet status-icon-blue"></i> <?=__('IP')?></a>
-          <?php if ((isset($_SESSION['FIREWALL_SYSTEM'])) && (!empty($_SESSION['FIREWALL_SYSTEM']))) {?><a href="/list/firewall/" class="ui-button cancel" title="<?=__('Firewall')?>"><i class="fas fa-shield-alt status-icon-red"></i> <?=__('Firewall')?></a><?php }?>
-          <a href="/list/updates/" class="ui-button cancel" title="<?=__('Updates')?>"><i class="fas fa-sync status-icon-green"></i> <?=__('Updates')?></a>
-          <a href="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>" class="ui-button danger cancel" title="<?=__('Restart')?>"><i class="fas fa-undo status-icon-red"></i> <?=__('Restart')?></a>
+          <a href="/edit/server/" class="ui-button cancel" title="<?=__('Configure')?>"><i class="fas fa-cog status-icon maroon"></i> <?=__('Configure')?></a>
+          <a href="/list/rrd/" class="ui-button cancel" title="<?=__('Graphs')?>"><i class="fas fa-chart-area status-icon green"></i> <?=__('Graphs')?></a>
+          <a href="/list/ip/" class="ui-button cancel" title="<?=__('IP')?>"><i class="fas fa-ethernet status-icon blue"></i> <?=__('IP')?></a>
+          <?php if ((isset($_SESSION['FIREWALL_SYSTEM'])) && (!empty($_SESSION['FIREWALL_SYSTEM']))) {?><a href="/list/firewall/" class="ui-button cancel" title="<?=__('Firewall')?>"><i class="fas fa-shield-alt status-icon red"></i> <?=__('Firewall')?></a><?php }?>
+          <a href="/list/updates/" class="ui-button cancel" title="<?=__('Updates')?>"><i class="fas fa-sync status-icon green"></i> <?=__('Updates')?></a>
+          <a href="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>" class="ui-button danger cancel" title="<?=__('Restart')?>"><i class="fas fa-undo status-icon red"></i> <?=__('Restart')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>
@@ -106,9 +106,9 @@
           </div>
           <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/server/<? echo $key ?>/"><?=$key?></a></b></div>
           <div class="clearfix l-unit__stat-col--left text-center compact-2">
-                  <a href="/edit/server/<? echo $key ?>/"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim icon-large"></i></a>
-                  <a href="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="data-controls fas fa-undo status-icon-highlight status-icon-dim icon-large"></i></a>
-                  <a href="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pause status-icon-red status-icon-dim icon-large"></i></a>
+                  <a href="/edit/server/<? echo $key ?>/"><i class="fas fa-pencil-alt status-icon orange status-icon dim icon-large"></i></a>
+                  <a href="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="data-controls fas fa-undo status-icon highlight status-icon dim icon-large"></i></a>
+                  <a href="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pause status-icon red status-icon dim icon-large"></i></a>
             </div>
           <div class="clearfix l-unit__stat-col--left wide-3"><?=__($data[$key]['SYSTEM'])?></div>
           <div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_time($data[$key]['RTIME'])?></b></div>

web/templates/admin/list_stats.html

@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
           <div class="l-unit-toolbar__buttonstrip">
-              <a class="ui-button cancel" href='/list/stats/'><i class="fas fa-info-circle status-icon-lightblue"></i> <?=__('Overall Statistics')?></a>
+              <a class="ui-button cancel" href='/list/stats/'><i class="fas fa-info-circle status-icon lightblue"></i> <?=__('Overall Statistics')?></a>
           </div>
         <div class="l-sort-toolbar clearfix">
           <table>

web/templates/admin/list_updates.html

@@ -1,11 +1,11 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
             <div class="l-unit-toolbar__buttonstrip">
-                <a class="ui-button cancel" href="/list/server/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
+                <a class="ui-button cancel" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
                 <? if($autoupdate == 'Enabled') {
-                  echo '<a class="ui-button cancel" href="/delete/cron/autoupdate/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-on status-icon-green"></i>'.__('disable autoupdate').'</a>';
+                  echo '<a class="ui-button cancel" href="/delete/cron/autoupdate/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-on status-icon green"></i>'.__('disable autoupdate').'</a>';
                 } else {
-                  echo '<a class="ui-button cancel" href="/add/cron/autoupdate/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-off status-icon-red"></i>'.__('enable autoupdate').'</a>';
+                  echo '<a class="ui-button cancel" href="/add/cron/autoupdate/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-off status-icon red"></i>'.__('enable autoupdate').'</a>';
                 } ?>
              </div>
         <div class="l-sort-toolbar clearfix">
@@ -82,7 +82,7 @@
                   ?>
                   <? if ($data[$key]['UPDATED'] == 'yes') {
                     echo '
-                    <i class="fas fa-check-circle status-icon-green"></i></i>
+                    <i class="fas fa-check-circle status-icon green"></i></i>
                     ';
                   }
                   ?>

web/templates/admin/list_user.html

@@ -3,10 +3,10 @@
         <div class="l-unit-toolbar__buttonstrip">
         <?php
           if ($user == 'admin') {
-            echo '<a href="/add/user/" class="ui-button cancel" title="'.__('Add User').'"><i class="fas fa-plus-circle status-icon-green"></i>'.__('Add User').'</a>&nbsp;';
-            echo '<a href="/list/package/" class="ui-button cancel" title="'.__('Packages').'"><i class="fas fa-box-open status-icon-orange"></i>'.__('Packages').'</a>&nbsp;';
+            echo '<a href="/add/user/" class="ui-button cancel" title="'.__('Add User').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add User').'</a>&nbsp;';
+            echo '<a href="/list/package/" class="ui-button cancel" title="'.__('Packages').'"><i class="fas fa-box-open status-icon orange"></i>'.__('Packages').'</a>&nbsp;';
           } else {
-            echo '<a href="/add/web/" class="ui-button cancel" title="'.__('Add Web Domain').'"><i class="fas fa-plus-circle status-icon-green"></i>'.__('Add Web Domain').'</a>';
+            echo '<a href="/add/web/" class="ui-button cancel" title="'.__('Add Web Domain').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add Web Domain').'</a>';
           }
         ?>
       </div>
@@ -107,12 +107,12 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                             <?php
                               } else {
                               ?>
-                              <a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-sign-in-alt status-icon-green status-icon-dim icon-large"></i></a>
+                              <a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-sign-in-alt status-icon green status-icon dim icon-large"></i></a>
                             <?}?>
-                          <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></div>
+                          <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></div>
                           <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
                             <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                              <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                              <i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                               <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" />
                               <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                                 <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -121,7 +121,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                           </div>
                           <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                             <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                              <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                              <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                               <input type="hidden" name="delete_url" value="/delete/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" />
                               <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                                 <p class="confirmation"><?=__('DELETE_USER_CONFIRMATION',$key)?></p>

web/templates/admin/list_web.html

@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a href="/add/web/" class="ui-button cancel" title="<?=__('Add Web Domain')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Web Domain')?></a>
+          <a href="/add/web/" class="ui-button cancel" title="<?=__('Add Web Domain')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Web 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>
@@ -134,15 +134,15 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
           <div class="clearfix l-unit__stat-col--left compact-5 text-right">
             <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
               <div class="actions-panel clearfix">
-                <div class="actions-panel__col actions-panel__view" key-action="href"><a href="http://<?=$key?>/" target="_blank"><i class="fas fa-external-link-square-alt status-icon-lightblue status-icon-dim"></i></div>
-                <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/web/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></div>
-                <div class="actions-panel__col actions-panel__logs shortcut-l" key-action="href"><a href="/list/web-log/?domain=<?php echo $key ?>&type=access#"><i class="fas fa-binoculars status-icon-purple status-icon-dim"></i></a></div>
+                <div class="actions-panel__col actions-panel__view" key-action="href"><a href="http://<?=$key?>/" target="_blank"><i class="fas fa-external-link-square-alt status-icon lightblue status-icon dim"></i></div>
+                <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/web/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></div>
+                <div class="actions-panel__col actions-panel__logs shortcut-l" key-action="href"><a href="/list/web-log/?domain=<?php echo $key ?>&type=access#"><i class="fas fa-binoculars status-icon purple status-icon dim"></i></a></div>
                 <? if (!empty($data[$key]['STATS'])) { ?>
-                  <div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$key?>/vstats/"  target="_blank"><i class="fas fa-chart-bar status-icon-maroon status-icon-dim"></i></a></div>
+                  <div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$key?>/vstats/"  target="_blank"><i class="fas fa-chart-bar status-icon maroon status-icon dim"></i></a></div>
                 <? } ?>
                 <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
                   <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                    <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                    <i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                     <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                     <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                       <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -151,7 +151,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                 </div>
                 <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                   <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                    <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                    <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                     <input type="hidden" name="delete_url" value="/delete/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                     <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                       <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
@@ -169,9 +169,9 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                   <b>
                     <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
                         <? if($data[$key]['SSL'] == 'no'){ ?>
-                          <i class="fas fa-times-circle status-icon-red"></i>
+                          <i class="fas fa-times-circle status-icon red"></i>
                         <? } else {?>
-                          <i class="fas fa-check-circle status-icon-green"></i>
+                          <i class="fas fa-check-circle status-icon green"></i>
                         <? } ?>
                     <? } else {?>
                         <? if($data[$key]['SSL'] == 'no'){ ?>
@@ -188,7 +188,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                         <? if($web_stats == 'no'){ ?>
                           <i class="fas fa-minus-circle"></i>
                         <? } else {?>
-                          <i class="fas fa-check-circle status-icon-green"></i>
+                          <i class="fas fa-check-circle status-icon green"></i>
                         <? } ?>
                     <? } else {?>
                       <? if($web_stats == 'no'){ ?>

web/templates/admin/panel.html

@@ -20,7 +20,7 @@
 		<!-- /.l-menu -->
 		<div class="l-profile noselect">
 			<div class="l-menu__item"><span class="pill usage"> <i class="fas fa-hdd"></i>&nbsp;&nbsp;<b><?=humanize_usage_size($panel[$user]['U_DISK'])?></b> <?=humanize_usage_measure($panel[$user]['U_DISK'])?> / <i class="fas fa-exchange-alt"></i>&nbsp;&nbsp;<b><?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?></span></div>
-			<div class="l-menu__item"><a alt="<?=__('Notifications')?>" class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>"><i class="fas fa-bell <?if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " animated extended swing status-icon-orange"; ?>"></i></a></div>
+			<div class="l-menu__item"><a alt="<?=__('Notifications')?>" class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>"><i class="fas fa-bell <?if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " animated extended swing status-icon orange"; ?>"></i></a></div>
 			<div class="l-menu__item"><a href="/edit/user/?user=<?php echo $user; ?>" alt="<?=$user?>" class="l-profile__username"><i class="fas fa-user-circle"></i></a></div>
 			<div class="l-menu__item"><a href="/logout/" alt="<?=__('Log out')?>" class="l-profile__logout"><i class="fas fa-sign-out-alt"></i></a></div>
 		</div>

web/templates/user/panel.html

@@ -18,7 +18,7 @@
 		<!-- /.l-menu -->
 		<div class="l-profile noselect">
 				<div class="l-menu__item"><span class="pill usage"> <i class="fas fa-hdd"></i>&nbsp;&nbsp;<b><?=humanize_usage_size($panel[$user]['U_DISK'])?></b> <?=humanize_usage_measure($panel[$user]['U_DISK'])?> / <i class="fas fa-exchange-alt"></i>&nbsp;&nbsp;<b><?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?></span></div>
-			<div class="l-menu__item"><a alt="<?=__('Notifications')?>" class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>"><i class="fas fa-bell <?if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " status-icon-orange"; ?>"></i></a></div>
+			<div class="l-menu__item"><a alt="<?=__('Notifications')?>" class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>"><i class="fas fa-bell <?if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " status-icon orange"; ?>"></i></a></div>
 			<div class="l-menu__item"><a href="/edit/user/?user=<?php echo $user; ?>" alt="<?=$user?>" class="l-profile__username"><i class="fas fa-user-circle"></i></a></div>
 			<div class="l-menu__item"><a href="/logout/" alt="<?=__('Log out')?>" class="l-profile__logout"><i class="fas fa-sign-out-alt"></i></a></div>
 		</div>