Explorar o código

User interface refresh

Kristan Kenney %!s(int64=6) %!d(string=hai) anos
pai
achega
57497e95bb
Modificáronse 59 ficheiros con 765 adicións e 785 borrados
  1. 7 3
      web/css/animate.css
  2. 288 200
      web/css/styles.min.css
  3. BIN=BIN
      web/images/logo-header.png
  4. BIN=BIN
      web/images/sprite.png
  5. 4 4
      web/inc/i18n/en.php
  6. 8 8
      web/js/app.js
  7. 2 2
      web/login/index.php
  8. 0 1
      web/templates/admin/edit_backup_exclusions.html
  9. 0 3
      web/templates/admin/edit_cron.html
  10. 0 3
      web/templates/admin/edit_db.html
  11. 0 3
      web/templates/admin/edit_dns.html
  12. 0 3
      web/templates/admin/edit_dns_rec.html
  13. 0 3
      web/templates/admin/edit_firewall.html
  14. 0 3
      web/templates/admin/edit_ip.html
  15. 0 3
      web/templates/admin/edit_mail.html
  16. 5 9
      web/templates/admin/edit_mail_acc.html
  17. 0 3
      web/templates/admin/edit_package.html
  18. 2 2
      web/templates/admin/edit_server.html
  19. 0 3
      web/templates/admin/edit_user.html
  20. 58 61
      web/templates/admin/edit_web.html
  21. 9 9
      web/templates/admin/list_backup.html
  22. 5 3
      web/templates/admin/list_backup_detail.html
  23. 5 18
      web/templates/admin/list_backup_exclusions.html
  24. 14 15
      web/templates/admin/list_cron.html
  25. 38 36
      web/templates/admin/list_db.html
  26. 8 6
      web/templates/admin/list_dns.html
  27. 9 11
      web/templates/admin/list_dns_rec.html
  28. 16 27
      web/templates/admin/list_firewall.html
  29. 8 13
      web/templates/admin/list_firewall_banlist.html
  30. 11 15
      web/templates/admin/list_ip.html
  31. 57 62
      web/templates/admin/list_log.html
  32. 11 10
      web/templates/admin/list_mail.html
  33. 10 9
      web/templates/admin/list_mail_acc.html
  34. 5 2
      web/templates/admin/list_packages.html
  35. 6 10
      web/templates/admin/list_rrd.html
  36. 0 7
      web/templates/admin/list_search.html
  37. 1 1
      web/templates/admin/list_server_info.html
  38. 10 13
      web/templates/admin/list_services.html
  39. 5 2
      web/templates/admin/list_stats.html
  40. 11 17
      web/templates/admin/list_updates.html
  41. 9 13
      web/templates/admin/list_user.html
  42. 8 6
      web/templates/admin/list_web.html
  43. 1 1
      web/templates/admin/list_weblog.html
  44. 108 125
      web/templates/admin/panel.html
  45. 1 1
      web/templates/header.html
  46. 1 1
      web/templates/login.html
  47. 0 3
      web/templates/user/edit_dns.html
  48. 0 3
      web/templates/user/edit_user.html
  49. 0 3
      web/templates/user/edit_web.html
  50. 3 3
      web/templates/user/list_cron.html
  51. 3 3
      web/templates/user/list_db.html
  52. 2 2
      web/templates/user/list_dns.html
  53. 2 2
      web/templates/user/list_dns_rec.html
  54. 4 5
      web/templates/user/list_mail.html
  55. 4 5
      web/templates/user/list_mail_acc.html
  56. 1 1
      web/templates/user/list_search.html
  57. 2 2
      web/templates/user/list_stats.html
  58. 2 2
      web/templates/user/list_user.html
  59. 1 1
      web/templates/user/list_web.html

+ 7 - 3
web/css/animate.css

@@ -3557,13 +3557,17 @@
 }
 
 .animated {
-  -webkit-animation-duration: 1s;
-  animation-duration: 1s;
+  -webkit-animation-duration: 0.3s;
+  animation-duration: 0.3s;
   -webkit-animation-fill-mode: both;
   animation-fill-mode: both;
 }
 
-.animated.infinite {
+.animated.extended {
+  -webkit-animation-duration: 0.6s;
+  animation-duration: 0.6s;
+}
+.animated.long {
   -webkit-animation-iteration-count: infinite;
   animation-iteration-count: infinite;
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 288 - 200
web/css/styles.min.css


BIN=BIN
web/images/logo-header.png


BIN=BIN
web/images/sprite.png


+ 4 - 4
web/inc/i18n/en.php

@@ -93,7 +93,7 @@ $LANG['en'] = array(
     'list accounts'  => 'List %s Accounts',
     'add account'  => 'Add Account',
     'open webmail'  => 'Open Webmail',
-    'list fail2ban' => 'View all banned IPs',
+    'list fail2ban' => 'View Banned IPs',
     'open %s'  => 'Open %s',
     'download'  => 'Download',
     'restore'  => 'Restore',
@@ -105,8 +105,8 @@ $LANG['en'] = array(
     'generate'  => 'Generate',
     'Generate CSR' => 'Generate Self-Signed SSL Certificate',
     'reread IP' => 'Verify IP address',
-    'enable autoupdate' => 'Enable Automatic Updates',
-    'disable autoupdate' => 'Disable Automatic Updates',
+    'enable autoupdate' => 'Automatic Updates: Off',
+    'disable autoupdate' => 'Automatic Updates: On',
     'turn on notifications' => 'Enable Notifications',
     'turn off notifications' => 'Disable Notifications',
     'configure' => 'Configure',
@@ -583,7 +583,7 @@ $LANG['en'] = array(
     'Template Manager' => 'Template Manager',
     'Backup Migration Manager' => 'Backup Migration Manager',
     'FileManager' => 'File Manager',
-    'show: CPU / MEM / NET / DISK' => 'View detailed system statistics',
+    'show: CPU / MEM / NET / DISK' => 'Usage Details',
 
     'sort by' => 'sort by',
     'Date' => 'Date',

+ 8 - 8
web/js/app.js

@@ -1003,11 +1003,11 @@ hover_menu = function() {
     var st = $(window).scrollTop();
 
     if (st <= 112) {
-        sep_1.css({'margin-top': 214 - st + 'px'});
-        sep_2.css({'margin-top': 259 - st + 'px'});
+        sep_1.css({'margin-top': 178 - st + 'px'});
+        sep_2.css({'margin-top': 225 - st + 'px'});
         nav_a.css({'height': 111 - st + 'px'});
         nav_a.css({'min-height': 111 - st + 'px'});
-        nav_context.css({'margin-top': 215 - st + 'px'});
+        nav_context.css({'margin-top': 181 - st + 'px'});
         sep_2.css({'box-shadow':'none'});
         sep_2.css({'background-color': '#ddd'});
         sep_2.css({'height': '1px'});
@@ -1023,21 +1023,21 @@ hover_menu = function() {
         nav_context.css({'margin-top': '101px'});
         nav_a.find('ul').css({'visibility': 'hidden'});
         nav_main.css({'padding-top': '27px'});
-        sep_2.css({'box-shadow':'0 5px 3px 0 rgba(200, 200, 200, 0.5)'});
+        sep_2.css({'box-shadow':'0 2px 6px 0 rgba(200, 200, 200, 0.35)'});
     }
 
     if(st == 0){
-        nav_a.css({'min-height': '111px'});
-        nav_a.css({'height': '111px'});
+        nav_a.css({'min-height': '70px'});
+        nav_a.css({'height': '70px'});
     }
 
     if(st < 109 ){
         nav_a.find('ul').css({'visibility': 'visible'});
-        nav_main.css({'padding-top': 30 + 'px'});
+        nav_main.css({'padding-top': 34 + 'px'});
     }
 
     if (st <= 112 && st > 110 ) {
-        nav_main.css({'padding-top': 30 - st + 109  + 'px'});
+        nav_main.css({'padding-top': 34 - st + 109  + 'px'});
     }
 
     lastScrollTop = st;

+ 2 - 2
web/login/index.php

@@ -25,7 +25,7 @@ if (isset($_SESSION['user'])) {
             $_SESSION['look_alert'] = 'yes';
         }
     }
-    header("Location: /list/user/");
+    header("Location: /list/web/");
     exit;
 }
 
@@ -128,7 +128,7 @@ if (isset($_POST['user']) && isset($_POST['password'])) {
                         unset($_SESSION['request_uri']);
                         exit;
                     } else {
-                        header("Location: /list/user/");
+                        header("Location: /list/web/");
                         exit;
                     }
                 }

+ 0 - 1
web/templates/admin/edit_backup_exclusions.html

@@ -38,7 +38,6 @@
                                 <td>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 0 - 3
web/templates/admin/edit_cron.html

@@ -356,11 +356,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?=__($v_status)?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 0 - 3
web/templates/admin/edit_db.html

@@ -37,11 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 0 - 3
web/templates/admin/edit_dns.html

@@ -36,11 +36,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 0 - 3
web/templates/admin/edit_dns_rec.html

@@ -36,11 +36,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?= __($v_status) ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 0 - 3
web/templates/admin/edit_firewall.html

@@ -37,11 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 0 - 3
web/templates/admin/edit_ip.html

@@ -37,11 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?=__($v_status)?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 0 - 3
web/templates/admin/edit_mail.html

@@ -36,11 +36,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 5 - 9
web/templates/admin/edit_mail_acc.html

@@ -37,15 +37,12 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?=$v_status?>"><b><?=__($v_status)?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">
-                      <table class="data-col2" width="600px">
+                      <table class="data-col2" width="440px">
                         <tr>
                             <td class="vst-text step-top input-label">
                                 <?php print __('Account');?>
@@ -96,7 +93,7 @@
                         </tr>
                         <tr>
                             <td>
-                                <textarea size="20" class="vst-textinput" name="v_fwd"><?=htmlentities(trim($v_fwd, "'"))?></textarea>
+                                <textarea size="20" class="vst-textinput short" name="v_fwd"><?=htmlentities(trim($v_fwd, "'"))?></textarea>
                             </td>
                         </tr>
                         <tr>
@@ -155,7 +152,6 @@
                         <tr>
                             <td colspan="2">
                                 <select id="mail_configuration" class="vst-list flat">
-                                    <option v_type="hostname" domain="<?=$hostname?>"><?=__('Use server hostname')?></option>
                                     <option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
                                     <option v_type="starttls"><?=__('Use STARTTLS')?></option>
                                     <option v_type="ssl"><?=__('Use SSL / TLS')?></option>
@@ -173,7 +169,7 @@
                         </tr>
                         <tr>
                             <td><?=__('IMAP hostname')?>:</td>
-                            <td><div id="td_imap_hostname"><?=$hostname?></div></td>
+                            <td><div id="td_imap_hostname">mail.<?=$v_domain?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP port')?>:</td>
@@ -189,7 +185,7 @@
                         </tr>
                         <tr>
                             <td><?=__('SMTP hostname')?>:</td>
-                            <td><div id="td_smtp_hostname"><?=$hostname?></div></td>
+                            <td><div id="td_smtp_hostname">mail.<?=$v_domain?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP port')?>:</td>
@@ -205,7 +201,7 @@
                         </tr>
                         <?
                             list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                            $webmail = "http://webmail.".$http_host."/";
+                            $webmail = "http://webmail.".$v_domain."/";
                             if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                         ?>
                         <tr>

+ 0 - 3
web/templates/admin/edit_package.html

@@ -31,11 +31,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?=$v_status?>"><b><?=__($v_status)?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 2 - 2
web/templates/admin/edit_server.html

@@ -580,7 +580,7 @@
                             <tr>
                                 <td class="vst-text input-label step-top">
                                     <a href="javascript:elementHideShow('ssl');" class="vst-text">
-                                        <b><?php print __('Hestia SSL');?> <!-- span style="color:#ff6701;font-size:10px; padding:0 10px;">preview</span--><img src="/images/arrow.png"></b>
+                                        <b><?php print __('Hestia SSL');?> <!-- span style="color:#cc3366;font-size:10px; padding:0 10px;">preview</span--><img src="/images/arrow.png"></b>
                                     </a>
                                 </td>
                             </tr>
@@ -680,7 +680,7 @@
                             <tr>
                                 <td class="vst-text input-label step-top">
                                     <a href="javascript:elementHideShow('hestia');" class="vst-text">
-                                        <b><?php print __('Hestia Control Panel Plugins');?> <!-- span style="color:#ff6701;font-size:10px; padding:0 10px;">preview</span--><img src="/images/arrow.png"></b>
+                                        <b><?php print __('Hestia Control Panel Plugins');?> <!-- span style="color:#cc3366;font-size:10px; padding:0 10px;">preview</span--><img src="/images/arrow.png"></b>
                                     </a>
                                 </td>
                             </tr>

+ 0 - 3
web/templates/admin/edit_user.html

@@ -37,11 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?=$v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 58 - 61
web/templates/admin/edit_web.html

@@ -37,11 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?=$v_status ?>"><b><?=__($v_status) ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">
@@ -82,7 +79,60 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <textarea size="20" class="vst-textinput" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
+                                    <textarea size="20" class="vst-textinput short" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text step-top">
+                                    <?php print __('Web Statistics');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_stats">
+                                        <?php
+                                            foreach ($stats as $key => $value) {
+                                                $svalue = "'".$value."'";
+                                                echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";
+                                                if (empty($v_stats)) $v_stats = 'none';
+                                                if (( $value == $v_stats ) || ($svalue == $v_stats )){
+                                                    echo ' selected' ;
+                                                }
+                                            echo ">". htmlentities(__($value)) ."</option>\n";
+                                            }
+                                    ?>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr  class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none<? } ?>">
+                                <td class="vst-text input-label step-left">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"><?php print __('Statistics Authorization');?></label>
+                                </td>
+                            </tr>
+                            <tr class="stats-auth">
+                                <td class="step-left">
+                                    <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
+                                        <tr>
+                                            <td class="vst-text input-label">
+                                                <?php print __('Username');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_stats_user" value="<?=htmlentities(trim($v_stats_user, "'"))?>">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text input-label">
+                                                <?php print __('Password');?> / <a href="javascript:WEBrandom();" class="generate"><?php print __('generate');?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input password" name="v_stats_password" value="<?=htmlentities(trim($v_stats_password, "'"))?>" id="v_password">
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                             <tr>
@@ -172,7 +222,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo htmlentities(trim($v_proxy_ext, "'"));} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
+                                                <textarea size="20" class="vst-textinput short" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo htmlentities(trim($v_proxy_ext, "'"));} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
                                             </td>
                                         </tr>
                                     </table>
@@ -219,7 +269,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
+                                                <textarea size="20" class="vst-textinput short" name="v_ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
                                             </td>
                                         </tr>
                                         <tr>
@@ -229,7 +279,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_ssl_key"><?=htmlentities(trim($v_ssl_key, "'"))?></textarea>
+                                                <textarea size="20" class="vst-textinput short" name="v_ssl_key"><?=htmlentities(trim($v_ssl_key, "'"))?></textarea>
                                             </td>
                                         </tr>
                                         <tr>
@@ -239,7 +289,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
+                                                <textarea size="20" class="vst-textinput short" name="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
                                             </td>
                                         </tr>
                                         <?
@@ -312,59 +362,6 @@
                                     </table>
                                 </td>
                             </tr>
-                            <tr>
-                                <td class="vst-text step-top">
-                                    <?php print __('Web Statistics');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-list" name="v_stats">
-                                        <?php
-                                            foreach ($stats as $key => $value) {
-                                                $svalue = "'".$value."'";
-                                                echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";
-                                                if (empty($v_stats)) $v_stats = 'none';
-                                                if (( $value == $v_stats ) || ($svalue == $v_stats )){
-                                                    echo ' selected' ;
-                                                }
-                                            echo ">". htmlentities(__($value)) ."</option>\n";
-                                            }
-                                    ?>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr  class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none<? } ?>">
-                                <td class="vst-text input-label step-left">
-                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"><?php print __('Statistics Authorization');?></label>
-                                </td>
-                            </tr>
-                            <tr class="stats-auth">
-                                <td class="step-left">
-                                    <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
-                                        <tr>
-                                            <td class="vst-text input-label">
-                                                <?php print __('Username');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_stats_user" value="<?=htmlentities(trim($v_stats_user, "'"))?>">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text input-label">
-                                                <?php print __('Password');?> / <a href="javascript:WEBrandom();" class="generate"><?php print __('generate');?></a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input password" name="v_stats_password" value="<?=htmlentities(trim($v_stats_password, "'"))?>" id="v_password">
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
                             <tr>
                                 <td class="vst-text step-top">
                                     <label><input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_additional_ftp_accounts(this)"> <?php print __('Additional FTP Account');?></label>

+ 9 - 9
web/templates/admin/list_backup.html

@@ -1,17 +1,17 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/schedule/backup/" class="l-sort__create-btn" title="<?=__('Create Backup')?>"></a>
+        <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>
+        </div>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="step-right">
-                <a class="vst" href="/list/backup/exclusions/"><?=__('backup exclusions')?></a>
-              </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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -27,7 +27,7 @@
                     <option value="delete"><?php print __('delete') ?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
             </tr>
           </table>
@@ -41,12 +41,12 @@
 
 
     <div class="l-center units animated fadeIn">
-        <div class="l-unit header">
+        <div class="l-unit header table-header">
             <div class="l-unit__col l-unit__col--left clearfix">
               <div class="text-center jump-small-top"></div>
             </div>
       
-            <div class="l-unit__col l-unit__col--right step-top table-header">
+            <div class="l-unit__col l-unit__col--right step-top">
               <div style="margin-bottom: 40px;">
                   <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('File Name');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('Date');?></b></div>
@@ -109,7 +109,7 @@
                       <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="backup[]" value="<?php echo $key ?>">
                       <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$key?></a></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center wide"><b><?=translate_date($data[$key]['DATE'])?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_usage_size($data[$key]['SIZE'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['SIZE'])?></span></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['TYPE']?></div>

+ 5 - 3
web/templates/admin/list_backup_detail.html

@@ -1,6 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="l-sort__create-btn restore" title="<?=__('Restore All')?>"></a>
+        <div class="l-unit-toolbar__buttonstrip">
+          <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>
             <tr>
@@ -8,7 +10,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -25,7 +27,7 @@
                     <option value="restore"><?php print __('restore') ?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
             </tr>
           </table>

+ 5 - 18
web/templates/admin/list_backup_exclusions.html

@@ -1,6 +1,9 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/edit/backup/exclusions/" class="l-sort__create-btn edit" title="<?=__('Configure')?>"></a>
+        <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>
+        </div>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -8,24 +11,9 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
-              <td>
-                <form action="/bulk/backup/exclusions/" method="post" id="objects">
-                <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
-                <div class="l-select">
-                  <select name="" id="">
-                    <option value=""><?=__('apply to selected')?></option>
-                    <option value="delete"><?php print __('delete') ?></option>
-                  </select>
-                </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
-              </td-->
             </tr>
           </table>
         </div>
@@ -107,7 +95,6 @@
           <!-- /form -->
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right total clearfix">
-            <a class="button cancel" href="/list/backup/"><?=__('Back')?></a>
           </div>
       </div>
     </div>

+ 14 - 15
web/templates/admin/list_cron.html

@@ -1,6 +1,15 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/cron/" class="l-sort__create-btn" title="<?=__('Add Cron Job')?>"></a>
+        <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>
+          <?
+            if($panel[$user]['CRON_REPORTS'] == 'yes') {
+              echo '<a class="ui-button cancel" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell-slash 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 status-icon-orange"></i> '.__('turn on notifications').'</a>';
+            }
+          ?>
+        </div>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Command')?></span><span class="up">&nbsp;</span></li>
@@ -9,21 +18,11 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="step-right">
-              &nbsp;
-              <?
-                if($panel[$user]['CRON_REPORTS'] == 'yes') {
-                  echo '<a class="vst" href="/delete/cron/reports/?token='.$_SESSION['token'].'">'.__('turn off notifications').'</a>';
-                } else {
-                  echo '<a class="vst" href="/add/cron/reports/?token='.$_SESSION['token'].'">'.__('turn on notifications').'</a>';
-                }
-              ?>
-              </td>
-              <td class="l-sort-toolbar__search-box step-left">
+              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -43,7 +42,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
@@ -128,7 +127,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__name separate small-2">
-            <?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>
+            <a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a>
           </div>
           <!-- /.l-unit__name -->
           <div class="l-unit__stats separate">

+ 38 - 36
web/templates/admin/list_db.html

@@ -1,6 +1,37 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/db/" class="l-sort__create-btn" title="<?=__('Add Database')?>"></a>
+        <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>
+          <?
+            $mysql = 0;
+            $pgsql = 0;
+
+
+            list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
+
+            foreach ($data as $key => $value) {
+              if ($data[$key]['TYPE'] == 'mysql'){
+                $mysql = 1;
+
+                $db_myadmin_link = "http://".$http_host."/phpmyadmin/";
+                if (!empty($_SESSION['DB_PMA_URL']))
+                  $db_myadmin_link = $_SESSION['DB_PMA_URL'];
+              }
+              if ($data[$key]['TYPE'] == 'pgsql'){
+                $pgsql = 1;
+                $db_pgadmin_link = "http://".$http_host."/phppgadmin/";
+                if (!empty($_SESSION['DB_PGA_URL']))
+                  $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
+              }
+            }
+            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>';
+            }
+            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>';
+            }
+          ?>
+        </div>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Database')?></span><span class="up">&nbsp;</span></li>
@@ -12,40 +43,11 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-            <?
-              $mysql = 0;
-              $pgsql = 0;
-
-
-              list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-
-              foreach ($data as $key => $value) {
-                if ($data[$key]['TYPE'] == 'mysql'){
-                  $mysql = 1;
-
-                  $db_myadmin_link = "http://".$http_host."/phpmyadmin/";
-                  if (!empty($_SESSION['DB_PMA_URL']))
-                    $db_myadmin_link = $_SESSION['DB_PMA_URL'];
-                }
-                if ($data[$key]['TYPE'] == 'pgsql'){
-                  $pgsql = 1;
-                  $db_pgadmin_link = "http://".$http_host."/phppgadmin/";
-                  if (!empty($_SESSION['DB_PGA_URL']))
-                    $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
-                }
-              }
-              if($mysql){
-                echo '<td class="step-right"><a class="vst" href="'.$db_myadmin_link.'" target="_blank">phpMyAdmin</td>';
-              }
-              if($pgsql){
-                echo '<td class="step-right"><a class="vst" href="'.$db_pgadmin_link.'" target="_blank">phpPgAdmin</td>';
-              }
-            ?>
-              <td class="l-sort-toolbar__search-box step-left">
+              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -63,7 +65,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
@@ -79,12 +81,12 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
     <div class="l-center units animated fadeIn">
-        <div class="l-unit header">
+        <div class="l-unit header table-header">
             <div class="l-unit__col l-unit__col--left clearfix">
               <div class="text-center jump-small-top"></div>
             </div>
       
-            <div class="l-unit__col l-unit__col--right step-top table-header">
+            <div class="l-unit__col l-unit__col--right step-top">
               <div style="margin-bottom: 40px;">
                   <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Database');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Type');?></b></div>
@@ -159,7 +161,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                       <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
                       <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/db/?database=<?=$key?>"><?=$key?></a></b></div>
                   <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 wide"><b><?=$data[$key]['DBUSER']?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['HOST']?></b></div>

+ 8 - 6
web/templates/admin/list_dns.html

@@ -1,6 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/" title="<?=__('Add DNS Domain')?>" class="l-sort__create-btn"></a>
+        <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>
+        </div>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-expire" sort_as_int="1"><span class="name"><?=__('Expire')?></span><span class="up">&nbsp;</span></li>
@@ -16,7 +18,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -34,7 +36,7 @@
                     <option value="delete"><?php print __('delete');?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
 	      <td class="sort-by">
 		<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
@@ -51,12 +53,12 @@
 
 
     <div class="l-center units animated fadeIn">
-        <div class="l-unit header">
+        <div class="l-unit header table-header">
             <div class="l-unit__col l-unit__col--left clearfix">
               <div class="text-center jump-small-top"></div>
             </div>
       
-            <div class="l-unit__col l-unit__col--right step-top table-header">
+            <div class="l-unit__col l-unit__col--right step-top">
               <div style="margin-bottom: 40px;">
                   <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Domain');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Records');?></b></div>
@@ -124,7 +126,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
                       <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
                       <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/list/dns/?domain=<?=$key?>"><?=$key?></a></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><? if(!empty($data[$key]['SRC'])) echo "<span>⇢ ".$data[$key]['SRC']."</span>&nbsp; &nbsp; ";  if($data[$key]['RECORDS']) echo '<span>'.$data[$key]['RECORDS'].'</span>';?></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['TPL']?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['TTL']?></div>

+ 9 - 11
web/templates/admin/list_dns_rec.html

@@ -1,6 +1,9 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=__('Add DNS Record')?>" class="l-sort__create-btn"></a>
+        <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>
+        </div>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -8,7 +11,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -27,7 +30,7 @@
                     <option value="delete"><?php print __('delete');?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
             </tr>
           </table>
@@ -45,16 +48,12 @@
 
     <div class="l-center units animated fadeIn">
 
-    <div class="l-unit header">
-      <div class="subtitle"><?=__('Listing')?>  <?=htmlentities($_GET['domain'])?></div>
-    </div>
-    
-    <div class="l-unit header">
+    <div class="l-unit header table-header">
       <div class="l-unit__col l-unit__col--left clearfix">
         <div class="text-center jump-small-top"></div>
       </div>
 
-      <div class="l-unit__col l-unit__col--right step-top table-header">
+      <div class="l-unit__col l-unit__col--right step-top">
         <div style="margin-bottom: 40px;">
           <div class="clearfix l-unit__stat-col--left small"><b><?php print __('Record');?></b></div>
           <div class="clearfix l-unit__stat-col--left compact"><b><?php print __('Type');?></b></div>
@@ -117,7 +116,7 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
-            <div class="clearfix l-unit__stat-col--left small"><b><? echo substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?></b></div>
+            <div class="clearfix l-unit__stat-col--left small"><b><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>"><? echo substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?></a></b></div>
             <div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TYPE']?></b></div>
             <div class="clearfix l-unit__stat-col--left compact"><?=$data[$key]['PRIORITY']?>&nbsp;</div>
             <div class="clearfix l-unit__stat-col--left wide-4"><?=htmlspecialchars($data[$key]['VALUE'], ENT_QUOTES, 'UTF-8')?></div>
@@ -150,7 +149,6 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
             ?>
           </div>
           <div class="data-count l-unit__col l-unit__col--right back clearfix">
-            <a class="button cancel" href="/list/dns/"><?=__('Back')?></a>
           </div>
       </div>
     </div>

+ 16 - 27
web/templates/admin/list_firewall.html

@@ -1,6 +1,12 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/firewall/" class="l-sort__create-btn" title="<?=__('Add Rule')?>"></a>
+        <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>
+          <? 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>';
+          } ?>
+        </div>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-action"><span class="name active"><?=__('Action')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-protocol"><span class="name"><?=__('Protocol')?></span><span class="up">&nbsp;</span></li>
@@ -12,22 +18,13 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="step-right">
-                <? if(!empty($_SESSION['FIREWALL_EXTENSION'])) {
-                     echo '<a class="vst" href="/list/firewall/banlist/"> '.__('list fail2ban').'</a>';
-                   } ?>
-              </td>
-              <td class="l-sort-toolbar__search-box step-left">
-                <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
-                </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 class="sort-by">
+                  <?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                </td>
               <td>
                 <form action="/bulk/firewall/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -37,10 +34,7 @@
                     <option value="delete"><?php print __('delete') ?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
-              </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
             </tr>
           </table>
@@ -53,12 +47,12 @@
     <!-- /.l-separator -->
 
     <div class="l-center units compact animated fadeIn">         
-          <div class="l-unit header">
+          <div class="l-unit header table-header">
             <div class="l-unit__col l-unit__col--left clearfix">
               <div class="text-center jump-small-top"></div>
             </div>
       
-            <div class="l-unit__col l-unit__col--right step-top table-header">
+            <div class="l-unit__col l-unit__col--right step-top">
               <div style="margin-bottom: 40px;">
                   <div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Action');?></b></div>
                   <div class="clearfix l-unit__stat-col--left wide-1 text-center"><b><?php print __('Comment');?></b></div>   
@@ -126,27 +120,22 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
                   <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="rule[]" value="<?php echo $key ?>">
                   <label for="check<?php echo $i ?>" class="check-label"></label>
                 </div>
-            <div class="clearfix l-unit__stat-col--left wide"><b>
-
+            <div class="clearfix l-unit__stat-col--left wide"><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'])?>
                   <? } else {?>
                     <i class="fas fa-check-circle status-icon-green icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
                   <? } ?>
-                  
                 <? } else {?>
-
                   <? if ($data[$key]['ACTION'] == 'DROP') { ?>
                     <i class="fas fa-minus-circle icon-pad-right" style=""></i> <?=__($data[$key]['ACTION'])?>
                   <? } else {?>
                     <i class="fas fa-check-circle icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
                   <? } ?>
-
                 <? } ?>
-
-            </b></div>
+              </a></b>
+            </div>
             <div class="clearfix l-unit__stat-col--left wide-1 text-center"><b><? if(!empty($data[$key]['COMMENT'])) echo '' . $data[$key]['COMMENT']; else echo "&nbsp;"; ?></b></div>
             <div class="clearfix l-unit__stat-col--left text-center"><b><?=__($data[$key]['PROTOCOL'])?></b></div>
             <div class="clearfix l-unit__stat-col--left wide-2 text-center"><b><?=$data[$key]['PORT']?></b></div>

+ 8 - 13
web/templates/admin/list_firewall_banlist.html

@@ -1,17 +1,12 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/firewall/banlist/" class="l-sort__create-btn" title="<?=__('Ban IP Address')?>"></a>
-
+        <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>
+        </div>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
-                </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>
@@ -25,7 +20,7 @@
                     <option value="delete"><?php print __('delete') ?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
             </tr>
           </table>
@@ -39,12 +34,12 @@
 
 
     <div class="l-center units animated fadeIn">
-        <div class="l-unit header">
+        <div class="l-unit header table-header">
             <div class="l-unit__col l-unit__col--left clearfix">
               <div class="text-center jump-small-top"></div>
             </div>
       
-            <div class="l-unit__col l-unit__col--right step-top table-header">
+            <div class="l-unit__col l-unit__col--right step-top">
               <div style="margin-bottom: 40px;">
                   <div class="clearfix l-unit__stat-col--left"><b><?php print __('Date');?></b></div>
                   <div class="clearfix l-unit__stat-col--left"><b><?php print __('Time');?></b></div>
@@ -129,7 +124,7 @@
             ?>
           </div>
           <div class="data-count l-unit__col l-unit__col--right back clearfix">
-            <a class="button cancel" href="/list/firewall/"><?=__('Back')?></a>
+           
           </div>
       </div>
     </div>

+ 11 - 15
web/templates/admin/list_ip.html

@@ -1,6 +1,9 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/ip/" class="l-sort__create-btn" title="<?=__('Add IP')?>"></a>
+        <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>
+        </div>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-ip"><span class="name"><?=__('ip')?></span><span class="up">&nbsp;</span></li>
@@ -13,17 +16,13 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
-                </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 class="sort-by">
+                  <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                </td>
               <td>
                 <form action="/bulk/ip/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,10 +33,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" class="l-sort-toolbar__filter-apply" value="" />
-              </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
             </tr>
           </table>
@@ -49,12 +45,12 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
     <div class="l-center units animated fadeIn">
-      <div class="l-unit header">
+      <div class="l-unit header table-header">
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="text-center jump-small-top"></div>
         </div>
       
-        <div class="l-unit__col l-unit__col--right step-top table-header">
+        <div class="l-unit__col l-unit__col--right step-top">
           <div style="margin-bottom: 40px;">
             <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('IP Address');?></b></div>
             <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Netmask');?></b></div>
@@ -105,7 +101,7 @@ sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites'][
                 <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ip[]" value="<?=$key?>">
                 <label for="check<?php echo $i ?>" class="check-label"></label>
               </div>
-              <div class="clearfix l-unit__stat-col--left wide-2"><b><?=$key?></b></div>
+              <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/ip/?ip=<?=$key?>"><?=$key?></a></b></div>
               <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['NETMASK']?></b></div>
               <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['INTERFACE']?></b></div>
               <div class="clearfix l-unit__stat-col--left text-center"><b><?=__($data[$key]['STATUS'])?></b></div>

+ 57 - 62
web/templates/admin/list_log.html

@@ -1,75 +1,70 @@
-    <div class="l-center">
-      <div class="l-sort clearfix noselect">
-        <div class="l-sort-toolbar clearfix">
-
-
-            <div class="l-unit table-header" style="padding-top: 6px;">
-                <div class="l-unit__col l-unit__col--left clearfix">
-                  <div class="text-center jump-small-top"></div>
-                </div>
-          
-                <div class="l-unit__col l-unit__col--right">
-                    <div class="clearfix l-unit__stat-col--left small"><b><?=__('Date')?></b></div>
-                    <div class="clearfix l-unit__stat-col--left compact"><b><?=__('Time')?></b></div>
-                    <div class="clearfix l-unit__stat-col--left wide-4"><b><?=__('Value')?></b></div>
-                </div>
-             </div>
-
-
-
-        </div>
+<div class="l-center">
+    <div class="l-sort clearfix noselect">
+        <div class="l-unit header" style="padding-top: 6px;">
+            <div class="l-unit__col l-unit__col--left clearfix">
+              <div class="text-center jump-small-top"></div>
+            </div>
+      
+            <div class="l-unit__col l-unit__col--right">
+                <div class="clearfix l-unit__stat-col--left small"><b><?=__('Date')?></b></div>
+                <div class="clearfix l-unit__stat-col--left compact"><b><?=__('Time')?></b></div>
+                <div class="clearfix l-unit__stat-col--left wide-4"><b><?=__('Value')?></b></div>
+            </div>
+         </div>
+      <div class="l-sort-toolbar clearfix">
       </div>
-      <!-- /.l-sort -->
     </div>
+    <!-- /.l-sort -->
+  </div>
 
-    <div class="l-separator"></div>
-    <!-- /.l-separator -->
+  <div class="l-separator"></div>
+  <!-- /.l-separator -->
 
 
-    <div class="l-center units animated fadeIn">
+  <div class="l-center units animated fadeIn">
 
-      <?php
-        foreach ($data as $key => $value) {
-           ++$i;
-      ?>
+    <?php
+      foreach ($data as $key => $value) {
+         ++$i;
+    ?>
 
-      <div class="l-unit header">
-          <div class="l-unit__col l-unit__col--left clearfix">
-            <div class="text-center jump-small-top"></div>
-          </div>
-    
-          <div class="l-unit__col l-unit__col--right step-top">
-            <div style="margin-bottom: 40px;">
-              <div class="clearfix l-unit__stat-col--left small"><b><?=translate_date($data[$key]['DATE'])?></b></div>
-              <div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
-              <div class="clearfix l-unit__stat-col--left wide-4"><?=$data[$key]['CMD']?></div>
-            </div>
+    <div class="l-unit header">
+        <div class="l-unit__col l-unit__col--left clearfix">
+          <div class="text-center jump-small-top"></div>
+        </div>
+  
+        <div class="l-unit__col l-unit__col--right step-top">
+          <div style="margin-bottom: 40px;">
+            <div class="clearfix l-unit__stat-col--left small"><b><?=translate_date($data[$key]['DATE'])?></b></div>
+            <div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
+            <div class="clearfix l-unit__stat-col--left wide-4"><?=$data[$key]['CMD']?></div>
           </div>
+        </div>
 
-        <!-- /.l-unit__col -->
-      </div>
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
-      <?}?>
+      <!-- /.l-unit__col -->
+    </div>
+    <!-- /.l-unit -->
+    <!--div class="l-separator"></div-->
+    <!-- /.l-separator -->
+    <?}?>
 
-    </div>-->
+  </div>-->
 
-    <div id="vstobjects">
-        <div class="l-separator"></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">
-            <?
-              if ( $i == 1) {
-                echo __('1 log record');
-              } else {
-                echo __('%s log records',$i);
-              }
-            ?>
-          </div>
-      </div>
+  <div id="vstobjects">
+      <div class="l-separator"></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">
+          <?
+            if ( $i == 1) {
+              echo __('1 log record');
+            } else {
+              echo __('%s log records',$i);
+            }
+          ?>
+        </div>
     </div>
   </div>
+</div>

+ 11 - 10
web/templates/admin/list_mail.html

@@ -1,6 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/" class="l-sort__create-btn" title="<?=__('Add Mail Domain')?>"></a>
+        <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>
+        </div>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
@@ -11,19 +13,18 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="step-right">
+              <td class="">
                 <?
                   list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                  $webmail = "http://webmail.".$http_host."/";
+                  $webmail = "http://".$http_host."/webmail/";
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
-                <a class="vst" href="<?=$webmail?>" target="_blank"><?=__('open webmail')?> <i></i></a>
               </td>
-              <td class="l-sort-toolbar__search-box step-left">
+              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -41,7 +42,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
@@ -60,12 +61,12 @@
 
 
     <div class="l-center units animated fadeIn">
-            <div class="l-unit header">
+            <div class="l-unit header table-header">
                 <div class="l-unit__col l-unit__col--left clearfix">
                   <div class="text-center jump-small-top"></div>
                 </div>
           
-                <div class="l-unit__col l-unit__col--right step-top table-header">
+                <div class="l-unit__col l-unit__col--right step-top">
                   <div style="margin-bottom: 40px;">
                       <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Domain');?></b></div>
                       <div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?php print __('Accounts');?></b></div>
@@ -145,7 +146,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                       <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
                       <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                  <div class="clearfix l-unit__stat-col--left wide-3"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="?domain=<?=$key?>"><?=$key?></a></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact-2"><b>
                     <? if($data[$key]['ACCOUNTS']) { echo '<span>'.$data[$key]['ACCOUNTS'].'</span>'; ?>
                     <? } else {?>

+ 10 - 9
web/templates/admin/list_mail_acc.html

@@ -1,6 +1,9 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=__('Add Mail Account')?>"></a>
+        <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>
+        </div>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Account')?></span><span class="up">&nbsp;</span></li>
@@ -10,19 +13,18 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="step-right">
+              <td class="">
                 <?
                   list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                   $webmail = "http://webmail.".$http_host."/";
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
-                <a class="vst" href="<?=$webmail?>" target="_blank"><?=__('open webmail')?> <i></i></a>
               </td>
-              <td class="l-sort-toolbar__search-box step-left">
+              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -40,7 +42,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
@@ -56,12 +58,12 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
     <div class="l-center units animated fadeIn">
-        <div class="l-unit header">
+        <div class="l-unit header table-header">
             <div class="l-unit__col l-unit__col--left clearfix">
               <div class="text-center jump-small-top"></div>
             </div>
       
-            <div class="l-unit__col l-unit__col--right step-top table-header">
+            <div class="l-unit__col l-unit__col--right step-top">
               <div style="margin-bottom: 40px;">
                   <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Username');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Disk');?></b></div>
@@ -207,7 +209,6 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
             ?>
           </div>
           <div class="data-count l-unit__col l-unit__col--right back clearfix">
-            <a class="button cancel" href="/list/mail/"><?=__('Back')?></a>
           </div>
         </div>
       </div>

+ 5 - 2
web/templates/admin/list_packages.html

@@ -1,6 +1,9 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/package/" class="l-sort__create-btn" title="<?=__('Add Package')?>"></a>
+        <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/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" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Package Name')?></span><span class="up">&nbsp;</span></li>
@@ -13,7 +16,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">

+ 6 - 10
web/templates/admin/list_rrd.html

@@ -1,15 +1,11 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <div class="l-sort-toolbar clearfix float-left">
-          <table class="width-100p">
+        <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>
+        </div>
+        <div class="l-sort-toolbar clearfix">
+          <table>
             <tr>
-              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
-                </form>
-              </td>
               <td>
                 <a class="vst<?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo " selected" ?>" href="?period=daily"><?=__('Daily')?></a>
                 <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'weekly')) echo " selected" ?>" href="?period=weekly"><?=__('Weekly')?></a>
@@ -18,7 +14,7 @@
               </td>
 
               <td>
-                <div class="timer-container">
+                <div class="timer-container" style="float:right;">
                   <span class="timer-button pause"></span>
                   <span class="timer-button play hidden"></span>
 

+ 0 - 7
web/templates/admin/list_search.html

@@ -9,13 +9,6 @@
           <span class="title edit display-inline-block float-left"><b><?=__('Search Results')?></b></span>
           <table class="float-right">
             <tr>
-              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
-                </form>
-              </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>

+ 1 - 1
web/templates/admin/list_server_info.html

@@ -40,5 +40,5 @@
   </div>
   <!-- /.l-header -->
 
-  <div style="color: #ff6701; padding: 10px 0 20px 20px; background: #fff; ">.</div><div class="l-center">
+  <div style="color: #cc3366; padding: 10px 0 20px 20px; background: #fff; ">.</div><div class="l-center">
   <pre style="color: #555">

+ 10 - 13
web/templates/admin/list_services.html

@@ -1,20 +1,17 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/edit/server/" class="l-sort__create-btn edit" title="<?=__('Configure')?>"></a>
-
+        <div class="l-unit-toolbar__buttonstrip">
+          <a href="/edit/server/" class="ui-button cancel" title="<?=__('Configure')?>"><i class="fas fa-cog status-icon-lightblue"></i> <?=__('Configure')?></a>
+          <a href="/list/package/" class="ui-button cancel" title="<?=__('Packages')?>"><i class="fas fa-box-open status-icon-orange"></i> <?=__('Packages')?></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/rrd/" class="ui-button cancel" title="<?=__('Graphs')?>"><i class="fas fa-chart-area status-icon-orange"></i> <?=__('Graphs')?></a>
+          <a href="/list/updates/" class="ui-button cancel" title="<?=__('Updates')?>"><i class="fas fa-sync status-icon-green"></i> <?=__('Updates')?></a>
+          <a href="/list/server/?cpu" class="ui-button cancel" title="<?=__('show: CPU / MEM / NET / DISK');?>"><i class="fas fa-search status-icon-blue"></i> <?=__('show: CPU / MEM / NET / DISK');?></a>
+        </div>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
-                </form>
-              </td>
-              <td class="step-right">
-                <a class="vst" href="/list/server/?cpu" target="_blank" > <?=__('show: CPU / MEM / NET / DISK');?> </a>
-              </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>
@@ -30,7 +27,7 @@
                       <option value="restart"><?php print __('restart');?></option>
                     </select>
                 </div>
-                <input type="submit" class="l-sort-toolbar__filter-apply" value="">
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
             </tr>
           </table>

+ 5 - 2
web/templates/admin/list_stats.html

@@ -1,5 +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/user/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
+            </div>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -7,7 +10,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
                 </form>
               </td>
               <td></td>
@@ -31,7 +34,7 @@
                           ?>
                     </select>
                   </div>
-                  <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                  <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
                 </form>
               </td>
             </tr>

+ 11 - 17
web/templates/admin/list_updates.html

@@ -1,22 +1,16 @@
     <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>
+                <? 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>';
+                } 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>';
+                } ?>
+             </div>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="step-right">
-                <? if($autoupdate == 'Enabled') {
-                     echo '<a class="vst" href="/delete/cron/autoupdate/?token='.$_SESSION['token'].'">'.__('disable autoupdate').'</a>';
-                   } else {
-                     echo '<a class="vst" href="/add/cron/autoupdate/?token='.$_SESSION['token'].'">'.__('enable autoupdate').'</a>';
-                   } ?>
-              </td>
-              <td class="l-sort-toolbar__search-box step-left">
-                <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
-                </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>
@@ -30,7 +24,7 @@
                     <option value="update"><?php print __('update') ?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
             </tr>
           </table>
@@ -44,12 +38,12 @@
 
 
     <div class="l-center units animated fadeIn">
-        <div class="l-unit header">
+        <div class="l-unit header table-header">
             <div class="l-unit__col l-unit__col--left clearfix">
               <div class="text-center jump-small-top"></div>
             </div>
       
-            <div class="l-unit__col l-unit__col--right step-top table-header">
+            <div class="l-unit__col l-unit__col--right step-top">
               <div style="margin-bottom: 40px;">
                   <div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Package');?></b></div>
                   <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Description');?></b></div>

+ 9 - 13
web/templates/admin/list_user.html

@@ -1,12 +1,14 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
+        <div class="l-unit-toolbar__buttonstrip">
         <?php
           if ($user == 'admin') {
-            echo '<a class="l-sort__create-btn" href="/add/user/" title="'.__('Add User').'"></a>';
+            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;';
           } else {
-            echo '<a class="l-sort__create-btn" href="/add/web/" title="'.__('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>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Username')?></span><span class="up">&nbsp;</span></li>
@@ -17,17 +19,13 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
-                </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 class="sort-by">
+                  <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                </td>
               <td>
                 <form action="/bulk/user/" method="post" id="objects">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -46,11 +44,9 @@
                       <option value="delete"><?=__('delete')?></option>
                     </select>
                   </div>
-                  <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
-              </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                  <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
+
             </tr>
           </table>
         </div>

+ 8 - 6
web/templates/admin/list_web.html

@@ -1,6 +1,8 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/web/" class="l-sort__create-btn" title="<?=__('Add Web Domain')?>"></a>
+        <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>
+        </div>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
@@ -16,7 +18,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -34,7 +36,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" class="l-sort-toolbar__filter-apply" value=""/>
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
@@ -50,12 +52,12 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
     <div class="l-center units narrow animated fadeIn">
-        <div class="l-unit header">
+        <div class="l-unit header table-header">
             <div class="l-unit__col l-unit__col--left clearfix">
               <div class="text-center jump-small-top"></div>
             </div>
       
-            <div class="l-unit__col l-unit__col--right step-top table-header">
+            <div class="l-unit__col l-unit__col--right step-top">
               <div style="margin-bottom: 40px;">
                   <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Domain');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('IP address');?></b></div>
@@ -178,7 +180,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                 <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?=$key?>">
                 <label for="check<?=$i?>" class="check-label"></label>
               </div>
-                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/edit/web/?domain=<?=$key?>" alt="<?=__('Edit')?>"><?=$key?></a></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><?=empty($ips[$data[$key]['IP']]['NAT']) ? $data[$key]['IP'] : "{$ips[$data[$key]['IP']]['NAT']}"; ?></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 compact"><b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?></span></div>

+ 1 - 1
web/templates/admin/list_weblog.html

@@ -36,5 +36,5 @@
   </div>
   <!-- /.l-header -->
 
-  <div style="color: #ff6701; padding: 10px 0 20px 20px; background: #fff; "><?php echo __('Last 70 lines of %s.%s.log',htmlentities($_GET['domain']),htmlentities($_GET['type'])) ;?></div>
+  <div style="color: #cc3366; padding: 10px 0 20px 20px; background: #fff; "><?php echo __('Last 70 lines of %s.%s.log',htmlentities($_GET['domain']),htmlentities($_GET['type'])) ;?></div>
   <pre style="margin-left: 20px; color: #555; font-family: arial; font-size: 14px; line-height: 30px;">

+ 108 - 125
web/templates/admin/panel.html

@@ -1,138 +1,121 @@
-  <div class="hidden" id="token" token="<?=$_SESSION['token']?>"></div>
-  <a href="#" class="to-top">
-    <i class="l-icon-to-top"></i>
-  </a>
-  <a href="#" class="to-shortcuts">
-    <i class="l-icon-shortcuts"></i>
-  </a>
+<div class="hidden" id="token" token="<?=$_SESSION['token']?>"></div>
+<a href="#" class="to-top">
+	<i class="l-icon-to-top"></i>
+</a>
+<a href="#" class="to-shortcuts">
+	<i class="l-icon-shortcuts"></i>
+</a>
 
-  <div class="l-header">
-    <div class="l-center">
-      <a href="/list/user/" class="l-logo"></a>
-      <!-- /.l-logo -->
-      <div class="l-menu clearfix noselect">
-        <div class="l-menu__item <?php if($TAB == 'PACKAGE' ) echo 'l-menu__item--active' ?>"><a href="/list/package/"><?=__('Packages')?></a></div>
-        <div class="l-menu__item <?php if($TAB == 'IP' ) echo 'l-menu__item--active' ?>"><a href="/list/ip/"><?=__('IP')?></a></div>
-        <div class="l-menu__item <?php if($TAB == 'RRD' ) echo 'l-menu__item--active' ?>"><a href="/list/rrd/"><?=__('Graphs')?></a></div>
-        <div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><?=__('Statistics')?></a></div>
-        <div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><?=__('Log')?></a></div>
-        <div class="l-menu__item <?php if($TAB == 'UPDATES' ) echo 'l-menu__item--active' ?>"><a href="/list/updates/"><?=__('Updates')?></a></div>
-        <?php if ((isset($_SESSION['FIREWALL_SYSTEM'])) && (!empty($_SESSION['FIREWALL_SYSTEM']))) {?><div class="l-menu__item <?php if($TAB == 'FIREWALL' ) echo 'l-menu__item--active' ?>"><a href="/list/firewall/"><?=__('Firewall')?></a></div><?php }?>
-        <div class="l-menu__item <?php if($TAB == 'SERVER' ) echo 'l-menu__item--active' ?>"><a href="/list/server/"><?=__('Server')?></a></div>
-      </div>
-      <!-- /.l-menu -->
-      <div class="l-profile noselect">
-        <a class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>">&nbsp;</a>
-				<a class="l-profile__server"><? echo gethostname(); ?></a>
-				<a class="l-profile__username" href="/edit/user/?user=<?php echo $user; ?>"><?=$user?></a>
-				<a class="l-profile__logout" href="/logout/"> <?=__('Log out')?> <i class="fas fa-sign-out-alt"></i></a>
-      </div>
-      <!-- /.l-profile -->
-    </div>
-  </div>
-  <ul class="notification-container hidden"></ul>
+<div class="l-header">
+	<div class="l-center">
+		<a href="/list/web/" class="l-logo"></a>
+		<!-- /.l-logo -->
+		<div class="l-menu clearfix noselect">
+			<div class="l-menu__item <?php if($TAB == 'WEB' ) echo 'l-menu__item--active animated fadeIn' ?> <?php if($TAB == 'DNS' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'MAIL' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'BACKUP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'CRON' ) echo 'l-menu__item--active' ?>"><a href="/list/web/"><i class="fas fa-chart-bar"></i>&nbsp;&nbsp;&nbsp;<?=__('Dashboard')?></a></div>
+			<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active animated fadeIn' ?>"><a href="/list/log/"><i class="fas fa-clipboard-list"></i>&nbsp;&nbsp;&nbsp;<?=__('Log')?></a></div>
+			<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active animated fadeIn' ?>"><a href="/list/stats/"><i class="fas fa-chart-pie"></i>&nbsp;&nbsp;&nbsp;<?=__('Statistics')?></a></div>
+			<div class="l-menu__item <?php if($TAB == 'USER' ) echo 'l-menu__item--active animated fadeIn' ?>"><a href="/list/user/"><i class="fas fa-users"></i>&nbsp;&nbsp;&nbsp;<?=__('Users')?></a></div>
+			<div class="l-menu__item <?php if($TAB == 'SERVER' ) echo 'l-menu__item--active animated fadeIn' ?> <?php if($TAB == 'UPDATES' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'IP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'RRD' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'PACKAGE' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'FIREWALL' ) echo 'l-menu__item--active' ?>"><a href="/list/server/"><i class="fas fa-server"></i>&nbsp;&nbsp;&nbsp;<?=__('Server')?></a></div>
+		</div>
+		<!-- /.l-menu -->
+		<div class="l-profile noselect">
+			<a class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>">&nbsp;</a>
+			<a class="l-profile__server"><? echo gethostname(); ?></a>
+			<a class="l-profile__username" href="/edit/user/?user=<?php echo $user; ?>"><?=$user?></a>
+			<a class="l-profile__logout" href="/logout/"> <?=__('Log out')?> <i class="fas fa-sign-out-alt"></i></a>
+		</div>
+		<!-- /.l-profile -->
+	</div>
+</div>
+<ul class="notification-container hidden"></ul>
 
-  <!-- /.l-header -->
+<!-- /.l-header -->
 
-  <div class="l-content">
-    <div class="l-center">
-      <div class="l-stat">
-        <div class="l-stat__col <?php if($TAB == 'USER' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/user/">
-            <div class="l-stat__col-title"><?=__('USER')?>&nbsp;&nbsp;<i class="fas fa-users"></i></div>
-            <ul>
-              <li><?=__('users')?>: <span><?=$panel[$user]['U_USERS']?></span></li>
-              <li><?=__('spnd');?>: <span><?=$panel[$user]['SUSPENDED_USERS']?></span></li>
-            </ul>
-          </a>
-				</div>
-		<?php if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {?>	
-			<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
-						<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
-							<a href="/list/web/">
-								<div class="l-stat__col-title"><?=__('WEB')?>&nbsp;&nbsp;<i class="fas fa-globe-americas"></i></div>
-								<ul>
-									<li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
-									<li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
-									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
-								</ul>
-							</a>
-						</div>
-			<?php } ?>
-		<?php } ?>	
+<div class="l-content">
+	<div class="l-center">
+		<div class="l-stat">
+	<?php if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {?>	
+		<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
+					<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
+						<a href="/list/web/">
+							<div class="l-stat__col-title <?php if($TAB == 'WEB' ) echo 'animated pulse' ?>"><?=__('WEB')?>&nbsp;&nbsp;<i class="fas fa-globe-americas"></i></div>
+							<ul>
+								<li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?> / <?=$panel[$user]['SUSPENDED_WEB']?></span></li>
+								<li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
+							</ul>
+						</a>
+					</div>
+		<?php } ?>
+	<?php } ?>	
 
-		<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>			
-			<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
-						<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
-							<a href="/list/dns/">
-								<div class="l-stat__col-title"><?=__('DNS')?>&nbsp;&nbsp;<i class="fas fa-at"></i></div>
-								<ul>
-									<li><?=__('zones')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
-									<li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
-									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
-								</ul>
-							</a>
-						</div>
-			<?php } ?>
+	<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>			
+		<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
+					<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
+						<a href="/list/dns/">
+							<div class="l-stat__col-title <?php if($TAB == 'DNS' ) echo 'animated pulse' ?>"><?=__('DNS')?>&nbsp;&nbsp;<i class="fas fa-at"></i></div>
+							<ul>
+								<li><?=__('zones')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?> / <?=$panel[$user]['SUSPENDED_DNS']?></span></li>
+								<li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
+							</ul>
+						</a>
+					</div>
 		<?php } ?>
+	<?php } ?>
 
-		<?php if ((isset($_SESSION['IMAP_SYSTEM'])) && (!empty($_SESSION['IMAP_SYSTEM']))) {?>			
-			<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
-						<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
-							<a href="/list/mail/">
-								<div class="l-stat__col-title"><?=__('MAIL')?>&nbsp;&nbsp;<i class="fas fa-mail-bulk"></i></div>
-								<ul>
-									<li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
-									<li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
-									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
-								</ul>
-							</a>
-						</div>
-			<?php } ?>
+	<?php if ((isset($_SESSION['IMAP_SYSTEM'])) && (!empty($_SESSION['IMAP_SYSTEM']))) {?>			
+		<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
+					<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
+						<a href="/list/mail/">
+							<div class="l-stat__col-title <?php if($TAB == 'MAIL' ) echo 'animated pulse' ?>"><?=__('MAIL')?>&nbsp;&nbsp;<i class="fas fa-mail-bulk"></i></div>
+							<ul>
+								<li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?> / <?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
+								<li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
+							</ul>
+						</a>
+					</div>
 		<?php } ?>
+	<?php } ?>
 
-		<?php if ((isset($_SESSION['DB_SYSTEM'])) && (!empty($_SESSION['DB_SYSTEM']))) {?>	
-			<?php if($panel[$user]['DATABASES'] != "0") { ?>
-						<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
-							<a href="/list/db/">
-								<div class="l-stat__col-title"><?=__('DB')?>&nbsp;&nbsp;<i class="fas fa-database"></i></div>
-								<ul>
-									<li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
-									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
-								</ul>
-							</a>
-						</div>
-			<?php } ?>
+	<?php if ((isset($_SESSION['DB_SYSTEM'])) && (!empty($_SESSION['DB_SYSTEM']))) {?>	
+		<?php if($panel[$user]['DATABASES'] != "0") { ?>
+					<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
+						<a href="/list/db/">
+							<div class="l-stat__col-title <?php if($TAB == 'DB' ) echo 'animated pulse' ?>"><?=__('DB')?>&nbsp;&nbsp;<i class="fas fa-database"></i></div>
+							<ul>
+								<li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?> / <?=$panel[$user]['SUSPENDED_DB']?></span></li>
+							</ul>
+						</a>
+					</div>
 		<?php } ?>
+	<?php } ?>
 
-		<?php if ((isset($_SESSION['CRON_SYSTEM'])) && (!empty($_SESSION['CRON_SYSTEM']))) {?>	
-			<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
-						<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
-							<a href="/list/cron/">
-								<div class="l-stat__col-title"><?=__('CRON')?>&nbsp;&nbsp;<i class="fas fa-clock"></i></div>
-								<ul>
-									<li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
-									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
-								</ul>
-							</a>
-						</div>
-			<?php } ?>
+	<?php if ((isset($_SESSION['CRON_SYSTEM'])) && (!empty($_SESSION['CRON_SYSTEM']))) {?>	
+		<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
+					<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
+						<a href="/list/cron/">
+							<div class="l-stat__col-title <?php if($TAB == 'CRON' ) echo 'animated pulse' ?>"><?=__('CRON')?>&nbsp;&nbsp;<i class="fas fa-clock"></i></div>
+							<ul>
+								<li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?> / <?=$panel[$user]['SUSPENDED_CRON']?></span></li>
+							</ul>
+						</a>
+					</div>
 		<?php } ?>
+	<?php } ?>
 
-		<?php if ((isset($_SESSION['BACKUP_SYSTEM'])) && (!empty($_SESSION['BACKUP_SYSTEM']))) {?>	
-			<?php if($panel[$user]['BACKUPS'] != "0") { ?>
-						<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
-							<a href="/list/backup/">
-								<div class="l-stat__col-title"><?=__('BACKUP')?>&nbsp;&nbsp;<i class="fas fa-undo"></i></div>
-								<ul>
-									<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
-								</ul>
-							</a>
-						</div>
-			<?php } ?>
+	<?php if ((isset($_SESSION['BACKUP_SYSTEM'])) && (!empty($_SESSION['BACKUP_SYSTEM']))) {?>	
+		<?php if($panel[$user]['BACKUPS'] != "0") { ?>
+					<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
+						<a href="/list/backup/">
+							<div class="l-stat__col-title <?php if($TAB == 'BACKUP' ) echo 'animated pulse' ?>"><?=__('BACKUP')?>&nbsp;&nbsp;<i class="fas fa-undo"></i></div>
+							<ul>
+								<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
+							</ul>
+						</a>
+					</div>
 		<?php } ?>
-      </div>
-      <!-- /.l-stats -->
-    </div>
-    <div class="l-separator"></div>
-    <!-- /.l-separator -->
+	<?php } ?>
+		</div>
+		<!-- /.l-stats -->
+	</div>
+	<div class="l-separator"></div>
+	<!-- /.l-separator -->

+ 1 - 1
web/templates/header.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-  <title>Hestia - <?=__($TAB)?></title>
+  <title>Hestia Control Panel - <?=__($TAB)?></title>
   <link rel="stylesheet" href="/css/styles.min.css?1446554103">
   <link type="text/css" href="/css/animate.css?1446554103" rel="stylesheet" />
   <link type="text/css" href="/css/jquery-custom-dialogs.css?1446554103" rel="stylesheet" />

+ 1 - 1
web/templates/login.html

@@ -1,5 +1,5 @@
         <center>
-            <table class="login animated fadeIn">
+            <table class="login animated fadeInLeft">
                 <tr>
                     <td>
                         <table>

+ 0 - 3
web/templates/user/edit_dns.html

@@ -36,11 +36,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?=$v_status?>"><b><?=__($v_status)?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 0 - 3
web/templates/user/edit_user.html

@@ -37,11 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?=$v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 0 - 3
web/templates/user/edit_web.html

@@ -37,11 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
-                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?=$v_status ?>"><b><?=__($v_status) ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">

+ 3 - 3
web/templates/user/list_cron.html

@@ -19,11 +19,11 @@
               ?>
               </td>
 
-              <td class="l-sort-toolbar__search-box step-left">
+              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -41,7 +41,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>

+ 3 - 3
web/templates/user/list_db.html

@@ -42,11 +42,11 @@
               }
             ?>
 
-              <td class="l-sort-toolbar__search-box step-left">
+              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -62,7 +62,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>

+ 2 - 2
web/templates/user/list_dns.html

@@ -16,7 +16,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -32,7 +32,7 @@
                     <option value="delete"><?php print __('delete');?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>

+ 2 - 2
web/templates/user/list_dns_rec.html

@@ -8,7 +8,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -25,7 +25,7 @@
                     <option value="delete"><?php print __('delete');?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
             </tr>
           </table>

+ 4 - 5
web/templates/user/list_mail.html

@@ -11,19 +11,18 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="step-right">
+              <td class="">
                 <?
                   list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                   $webmail = "http://".$http_host."/webmail/";
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
-                <a class="vst" href="<?=$webmail?>" target="_blank"><?=__('open webmail')?> <i></i></a>
               </td>
-              <td class="l-sort-toolbar__search-box step-left">
+              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -39,7 +38,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>

+ 4 - 5
web/templates/user/list_mail_acc.html

@@ -10,19 +10,18 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="step-right">
+              <td class="">
                 <?
                   list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                   $webmail = "http://".$http_host."/webmail/";
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
-                <a class="vst" href="<?=$webmail?>" target="_blank"><?=__('open webmail')?> <i></i></a>
               </td>
-              <td class="l-sort-toolbar__search-box step-left">
+              <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -38,7 +37,7 @@
                     <option value="delete"><?=__('delete')?></option>
                   </select>
                 </div>
-                <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>

+ 1 - 1
web/templates/user/list_search.html

@@ -13,7 +13,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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="sort-by">

+ 2 - 2
web/templates/user/list_stats.html

@@ -7,7 +7,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
                 </form>
               </td>
               <td></td>
@@ -31,7 +31,7 @@
                           ?>
                     </select>
                   </div>
-                  <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                  <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
                 </form>
               </td>
             </tr>

+ 2 - 2
web/templates/user/list_user.html

@@ -21,7 +21,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">
@@ -44,7 +44,7 @@
                       <option value="delete"><?=__('delete')?></option>
                     </select>
                   </div>
-                  <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
+                  <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
               <td class="sort-by">
                 <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>

+ 1 - 1
web/templates/user/list_web.html

@@ -16,7 +16,7 @@
                 <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']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
+                  <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">

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio