Просмотр исходного кода

Simplify parallax/fixed/sticky positioning (#3044)

* Consistent viewport meta tag

* Simplify fixed/sticky positioning
Alec Rust 3 лет назад
Родитель
Сommit
68a6a301ef
91 измененных файлов с 228 добавлено и 440 удалено
  1. 1 1
      install/common/templates/web/skel/document_errors/403.html
  2. 1 1
      install/common/templates/web/skel/document_errors/404.html
  3. 1 1
      install/common/templates/web/skel/document_errors/410.html
  4. 1 1
      install/common/templates/web/skel/document_errors/50x.html
  5. 1 1
      install/common/templates/web/skel/public_html/index.html
  6. 1 1
      install/common/templates/web/suspend/index.html
  7. 1 1
      install/common/templates/web/unassigned/index.html
  8. 4 10
      web/css/src/themes/dark.css
  9. 31 62
      web/css/src/themes/default.css
  10. 1 1
      web/css/src/themes/vestia.css
  11. 0 0
      web/css/themes/dark.min.css
  12. 0 0
      web/css/themes/default.min.css
  13. 0 0
      web/css/themes/vestia.min.css
  14. 1 1
      web/error/403.html
  15. 1 1
      web/error/404.html
  16. 1 1
      web/error/410.html
  17. 1 1
      web/error/50x.html
  18. 8 47
      web/js/app.js
  19. 1 1
      web/js/init.js
  20. 1 1
      web/templates/includes/end_js.html
  21. 0 2
      web/templates/includes/panel.html
  22. 1 0
      web/templates/includes/title.html
  23. 2 4
      web/templates/pages/add_access_key.html
  24. 2 4
      web/templates/pages/add_cron.html
  25. 2 4
      web/templates/pages/add_db.html
  26. 2 4
      web/templates/pages/add_dns.html
  27. 2 4
      web/templates/pages/add_dns_rec.html
  28. 2 4
      web/templates/pages/add_firewall.html
  29. 2 4
      web/templates/pages/add_firewall_banlist.html
  30. 2 4
      web/templates/pages/add_firewall_ipset.html
  31. 2 4
      web/templates/pages/add_ip.html
  32. 2 4
      web/templates/pages/add_key.html
  33. 2 4
      web/templates/pages/add_mail.html
  34. 2 4
      web/templates/pages/add_mail_acc.html
  35. 2 4
      web/templates/pages/add_package.html
  36. 2 4
      web/templates/pages/add_user.html
  37. 2 4
      web/templates/pages/add_web.html
  38. 2 4
      web/templates/pages/edit_backup_exclusions.html
  39. 2 4
      web/templates/pages/edit_cron.html
  40. 2 4
      web/templates/pages/edit_db.html
  41. 2 4
      web/templates/pages/edit_dns.html
  42. 2 4
      web/templates/pages/edit_dns_rec.html
  43. 2 4
      web/templates/pages/edit_firewall.html
  44. 2 4
      web/templates/pages/edit_ip.html
  45. 2 4
      web/templates/pages/edit_mail.html
  46. 2 4
      web/templates/pages/edit_mail_acc.html
  47. 2 4
      web/templates/pages/edit_package.html
  48. 2 4
      web/templates/pages/edit_server.html
  49. 2 4
      web/templates/pages/edit_server_bind9.html
  50. 2 4
      web/templates/pages/edit_server_dovecot.html
  51. 2 4
      web/templates/pages/edit_server_httpd.html
  52. 2 4
      web/templates/pages/edit_server_mysql.html
  53. 2 4
      web/templates/pages/edit_server_nginx.html
  54. 2 4
      web/templates/pages/edit_server_pgsql.html
  55. 2 4
      web/templates/pages/edit_server_php.html
  56. 2 4
      web/templates/pages/edit_server_service.html
  57. 2 4
      web/templates/pages/edit_user.html
  58. 2 4
      web/templates/pages/edit_web.html
  59. 2 4
      web/templates/pages/generate_ssl.html
  60. 2 4
      web/templates/pages/list_access_key.html
  61. 3 4
      web/templates/pages/list_access_keys.html
  62. 3 5
      web/templates/pages/list_backup.html
  63. 2 4
      web/templates/pages/list_backup_detail.html
  64. 9 10
      web/templates/pages/list_backup_exclusions.html
  65. 3 5
      web/templates/pages/list_cron.html
  66. 3 5
      web/templates/pages/list_db.html
  67. 3 5
      web/templates/pages/list_dns.html
  68. 2 4
      web/templates/pages/list_dns_public.html
  69. 2 4
      web/templates/pages/list_dns_rec.html
  70. 3 5
      web/templates/pages/list_firewall.html
  71. 3 5
      web/templates/pages/list_firewall_banlist.html
  72. 3 5
      web/templates/pages/list_firewall_ipset.html
  73. 3 5
      web/templates/pages/list_ip.html
  74. 3 5
      web/templates/pages/list_key.html
  75. 3 5
      web/templates/pages/list_log.html
  76. 2 4
      web/templates/pages/list_log_auth.html
  77. 3 5
      web/templates/pages/list_mail.html
  78. 3 5
      web/templates/pages/list_mail_acc.html
  79. 3 5
      web/templates/pages/list_mail_dns.html
  80. 4 6
      web/templates/pages/list_packages.html
  81. 2 3
      web/templates/pages/list_rrd.html
  82. 3 5
      web/templates/pages/list_search.html
  83. 3 5
      web/templates/pages/list_server_preview.html
  84. 4 6
      web/templates/pages/list_services.html
  85. 2 4
      web/templates/pages/list_ssl.html
  86. 3 5
      web/templates/pages/list_stats.html
  87. 2 4
      web/templates/pages/list_updates.html
  88. 4 6
      web/templates/pages/list_user.html
  89. 3 5
      web/templates/pages/list_web.html
  90. 3 5
      web/templates/pages/list_webapps.html
  91. 2 4
      web/templates/pages/setup_webapp.html

+ 1 - 1
install/common/templates/web/skel/document_errors/403.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Access Denied</title>
     <style>
       body {

+ 1 - 1
install/common/templates/web/skel/document_errors/404.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Page Not Found</title>
     <style>
       body {

+ 1 - 1
install/common/templates/web/skel/document_errors/410.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Resource is Gone</title>
     <style>
       body {

+ 1 - 1
install/common/templates/web/skel/document_errors/50x.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Internal Server Error</title>
     <style>
       body {

+ 1 - 1
install/common/templates/web/skel/public_html/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Coming Soon</title>
     <style>
       body {

+ 1 - 1
install/common/templates/web/suspend/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Access Denied</title>
     <style>
       body {

+ 1 - 1
install/common/templates/web/unassigned/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Success!</title>
     <style>
       body {

+ 4 - 10
web/css/src/themes/dark.css

@@ -256,22 +256,17 @@ strong {
   color: #aaa;
 }
 
-.l-separator.selected,
 .l-separator {
   border-top: 1px solid #454545;
 }
 
-div.l-content > div.l-separator:nth-of-type(2) {
-}
-
-div.l-content > div.l-separator:nth-of-type(4) {
-  border-bottom: 1px solid #454545;
+.l-sort {
+  border-color: #454545;
   background-color: #282828;
-  box-shadow: 0 4px 6px rgb(0 0 0 / 25%) !important;
 }
 
-.l-sort {
-  background-color: #282828;
+.l-sort.is-active {
+  box-shadow: 0 4px 6px rgb(0 0 0 / 25%);
 }
 
 .context-menu.sort-order {
@@ -396,7 +391,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
   border-left: 1px solid #212121 !important;
   border-right: 1px solid #212121 !important;
   border-bottom: 1px solid #212121 !important;
-  border-top: 1px solid #454545 !important;
   text-shadow: 0 1px rgb(0 0 0 / 95%);
   border-bottom-left-radius: 0 !important;
   border-bottom-right-radius: 0 !important;

+ 31 - 62
web/css/src/themes/default.css

@@ -291,11 +291,11 @@ table {
 .l-header {
   background: linear-gradient(to bottom, rgb(104 145 196 / 100%) 0%, rgb(69 114 181 / 100%) 50%, rgb(65 90 149 / 100%) 100%);
   background-color: #5070a6;
-  overflow: hidden;
   position: fixed;
   width: 100%;
   height: 39px;
   z-index: 900;
+  top: 0;
   font-size: 0.8rem;
   text-shadow: 1px 1px rgb(0 0 0 / 25%);
   box-shadow: 0 4px 10px rgb(100 100 100 / 40%);
@@ -684,35 +684,26 @@ table {
 }
 
 .l-stat {
-  margin: 34px auto;
-  position: fixed;
   background-color: #fff;
-  z-index: 100;
-  padding-top: 36px;
+  padding-top: 31px;
   overflow: hidden;
   text-align: center;
   display: flex;
-  width: 100%;
-  max-width: 1020px;
 }
 
 .l-stat__col {
-  display: inline-block;
-  vertical-align: top;
   flex: 1;
 }
 
 .l-stat__col a {
-  display: inline-block;
-  padding-bottom: 36px;
-  min-height: 113px;
-  width: 136px;
-  border-bottom: 4px solid #fff;
+  display: block;
+  min-height: 110px;
   overflow: hidden;
+  margin-left: 20px;
+  margin-right: 20px;
+  border-bottom: 4px solid #fff;
+  padding-bottom: 16px;
   background-color: #fff;
-  padding-top: 3px;
-  margin-top: -3px;
-  padding-left: 5px;
 }
 
 .l-stat__col a:hover {
@@ -780,39 +771,35 @@ table {
   color: #c36;
 }
 
-.l-separator.selected,
 .l-separator {
   height: 1px;
   border-top: 1px solid #ddd;
 }
 
-div.l-content > div.l-separator:nth-of-type(2) {
-  margin-top: 180px;
-  width: 100%;
-  position: fixed;
-  z-index: 120;
+.l-sort {
+  display: flex;
+  position: sticky;
+  z-index: 2;
+  top: 38px;
+  height: 44px;
+  justify-content: center;
+  background-color: #fff;
+  padding-top: 6px;
+  padding-bottom: 6px;
+  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
 }
 
-div.l-content > div.l-separator:nth-of-type(4) {
-  margin-top: 225px;
-  width: 100%;
-  position: fixed;
-  z-index: 110;
-  border-top: none;
-  border-bottom: 1px solid #ddd;
+.l-sort.is-active {
+  box-shadow: 0 4px 6px rgb(0 0 0 / 10%);
 }
 
-.l-sort {
-  position: fixed;
+.l-sort__inner {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  width: 100%;
   max-width: 1020px;
-  background-color: #fff;
-  z-index: 120;
-  margin-top: 181px;
-  height: 44px;
+  width: 100%;
 }
 
 .l-sort__create-btn {
@@ -869,7 +856,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
   position: absolute;
   top: 35px;
   left: 0;
-  z-index: 3;
   overflow: hidden;
   border-radius: 4px;
   background-color: rgb(255 255 255 / 95%);
@@ -1208,7 +1194,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
   border-left: 1px solid #d0d0d0 !important;
   border-right: 1px solid #d0d0d0 !important;
   border-bottom: 1px solid #d0d0d0 !important;
-  border-top: 1px solid #d0d0d0 !important;
   text-shadow: 0 1px rgb(255 255 255 / 100%);
   box-shadow: inset 0 1px 1px rgb(255 255 255 / 100%), inset 0 0 1px rgb(255 255 255 / 100%), inset 0 0 4px rgb(255 255 255 / 80%), 0 1px 4px rgb(140 140 140 / 35%) !important;
   border-radius: 0 0 6px 6px;
@@ -1219,8 +1204,8 @@ div.l-content > div.l-separator:nth-of-type(4) {
   line-height: 1rem;
   margin-top: 1px;
   position: sticky;
-  top: 145px;
-  z-index: 100;
+  top: 82px;
+  z-index: 1;
   padding-top: 4px;
   padding-bottom: 4px;
 }
@@ -1959,7 +1944,7 @@ body.mobile .l-unit-toolbar__col--right {
 
 .form-container {
   font-size: 0.85rem;
-  padding: 1em 1em 2em 9rem;
+  padding: 2em 1em 2em 9rem;
 }
 
 .vst-error {
@@ -2580,36 +2565,20 @@ body.mobile .l-unit-toolbar__col--right {
   padding-top: 2px;
 }
 
-div.l-content.collapsed > div.l-separator:nth-of-type(2) {
-  margin-top: 93px;
-  position: fixed;
-}
-
-div.l-content.collapsed > div.l-separator:nth-of-type(4) {
-  margin-top: 138px;
-  position: fixed;
+.l-content {
+  padding-top: 39px;
 }
 
-div.l-content.collapsed .l-sort {
+.l-content.collapsed .l-sort {
   margin-top: 94px;
 }
 
-.l-content > .units.l-center::before {
-  content: "";
-  display: block;
-  height: 224px;
-}
-
 .console-output {
   font-family: Inconsolata, "Lucida Console", Monaco, monospace;
   font-size: 0.92rem;
   color: #202020;
 }
 
-form#vstobjects {
-  padding-top: 240px;
-}
-
 form#vstobjects.suspended {
   background-color: #fff;
   padding-bottom: 30px;
@@ -3085,7 +3054,7 @@ form#vstobjects.suspended {
 .helper-container {
   float: right;
   margin-bottom: -450px;
-  margin-top: 425px;
+  margin-top: 199px;
   margin-right: 14px;
   padding-top: 0;
   width: 610px;

+ 1 - 1
web/css/src/themes/vestia.css

@@ -503,7 +503,7 @@ a#btn-back:focus {
 }
 
 .helper-container {
-  margin-top: 420px;
+  margin-top: 194px;
   border-radius: 0;
   box-shadow: none;
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
web/css/themes/dark.min.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
web/css/themes/default.min.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
web/css/themes/vestia.min.css


+ 1 - 1
web/error/403.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Access Denied</title>
     <style>
       body {

+ 1 - 1
web/error/404.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Page Not Found</title>
     <style>
       body {

+ 1 - 1
web/error/410.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Resource is Gone</title>
     <style>
       body {

+ 1 - 1
web/error/50x.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Internal Server Error</title>
     <style>
       body {

+ 8 - 47
web/js/app.js

@@ -669,8 +669,6 @@ var fb = _DEBUG && 'undefined' != typeof(console) ? console : {
 
 var checked = false;
 var frmname = '';
-var lastScrollTop = 0;
-
 
 //
 var App = {
@@ -968,55 +966,18 @@ String.prototype.trim = function()
     return str;
 }
 
-hover_menu = function() {
-    var sep_1 = $('div.l-content > div.l-separator:nth-of-type(2)');
-    var sep_2 = $('div.l-content > div.l-separator:nth-of-type(4)');
-    var nav_main = $('.l-stat');
-    var nav_a = $('.l-stat .l-stat__col a');
-    var nav_context = $('.l-sort');
-
-    var st = $(window).scrollTop();
-
-    if (st <= 112) {
-        sep_1.css({'margin-top': 180 - 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': 181 - st + 'px'});
-        sep_2.css({'box-shadow':'none'});
-        sep_2.css({'height': '1px'});
-    }
-
-    if(st > 112){
-        sep_1.css({'margin-top': '100px'});
-        sep_2.css({'margin-top': '130px'});
-        sep_2.css({'height': '15px'});
-        nav_a.css({'height': '0'});
-        nav_a.css({'min-height': '0'});
-        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 6px 0 rgba(200, 200, 200, 0.35)'});
-    }
-
-    if(st == 0){
-        nav_a.css({'min-height': '113px'});
-        nav_a.css({'height': '113px'});
-    }
+set_sticky_class = function() {
+    var sort = $('.l-sort');
+    var sortOffset = sort.offset().top;
+    var headerHeight = $('.l-header').outerHeight();
 
-    if(st < 109 ){
-        nav_a.find('ul').css({'visibility': 'visible'});
-        nav_main.css({'padding-top': 36 + 'px'});
-    }
-
-    if (st <= 112 && st > 110 ) {
-        nav_main.css({'padding-top': 36 - st + 109 + 'px'});
+    if ($(window).scrollTop() > sortOffset - headerHeight) {
+        sort.addClass('is-active');
+    } else {
+        sort.removeClass('is-active');
     }
-
-    lastScrollTop = st;
 }
 
-
 function checkedAll(frmname) {
     if($('input#toggle-all').prop('checked')){
         $('.l-unit:not(.header)').addClass("selected");

+ 1 - 1
web/js/init.js

@@ -35,7 +35,7 @@ $(document).ready(function(){
             }
             /* eslint-enable no-useless-escape */
 
-            $(window).scroll(function(){hover_menu()});
+            $(window).scroll(function(){set_sticky_class()});
 
             $('.l-sort-toolbar .sort-by').click(function(){
               $('.context-menu.sort-order').toggle().css({left: $(this).parent().parent().parent().position().left - 0});

+ 1 - 1
web/templates/includes/end_js.html

@@ -17,7 +17,7 @@
  } ?>
 <script>
   $(function() {
-    hover_menu();
+    set_sticky_class();
   });
 </script>
 

+ 0 - 2
web/templates/includes/panel.html

@@ -207,5 +207,3 @@
       <?php } ?>
     </div>
   </div>
-
-  <div class="l-separator"></div>

+ 1 - 0
web/templates/includes/title.html

@@ -1,2 +1,3 @@
 <meta charset="utf-8">
 <title><?=_($TAB)?> - <?=htmlentities($_SERVER['HTTP_HOST']); ?> - <?=_('Hestia Control Panel');?></title>
+<meta name="viewport" content="width=device-width, initial-scale=1">

+ 2 - 4
web/templates/pages/add_access_key.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/access-key/">
         <i class="fas fa-arrow-left status-icon blue"></i><?= _('Back'); ?>
@@ -15,8 +15,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
   <form id="vstobjects" name="v_add_access_key" method="post">
     <input type="hidden" name="token" value="<?= $_SESSION['token'] ?>">

+ 2 - 4
web/templates/pages/add_cron.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <div class="helper-container">

+ 2 - 4
web/templates/pages/add_db.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_db" method="post">

+ 2 - 4
web/templates/pages/add_dns.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_dns" method="post">

+ 2 - 4
web/templates/pages/add_dns_rec.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/dns/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_dns_rec" method="post">

+ 2 - 4
web/templates/pages/add_firewall.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_ip" method="post">

+ 2 - 4
web/templates/pages/add_firewall_banlist.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/banlist/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_ip" method="post">

+ 2 - 4
web/templates/pages/add_firewall_ipset.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/ipset/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_ipset" method="post">

+ 2 - 4
web/templates/pages/add_ip.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_ip" method="post">

+ 2 - 4
web/templates/pages/add_key.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && ($_GET['user'] !== 'admin')) { ?>
         <a class="button button-secondary" id="btn-back" href="/list/key/?user=<?=htmlentities($_GET['user']);?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -15,8 +15,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_key" method="post">

+ 2 - 4
web/templates/pages/add_mail.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_mail" method="post">

+ 2 - 4
web/templates/pages/add_mail_acc.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_mail_acc" method="post">

+ 2 - 4
web/templates/pages/add_package.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_package" method="post">

+ 2 - 4
web/templates/pages/add_user.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_user" method="post">

+ 2 - 4
web/templates/pages/add_web.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -13,8 +13,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_add_web" method="post">

+ 2 - 4
web/templates/pages/edit_backup_exclusions.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/backup/exclusions/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_backup_exclusions" method="post" class="<?=_($v_status)?>">

+ 2 - 4
web/templates/pages/edit_cron.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <div class="helper-container">

+ 2 - 4
web/templates/pages/edit_db.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_db" method="post" class="<?=$v_status?>">

+ 2 - 4
web/templates/pages/edit_dns.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_dns" method="post" class="<?=$v_status?>">

+ 2 - 4
web/templates/pages/edit_dns_rec.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/dns/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_dns_rec" method="post" class="<?=$v_status?>">

+ 2 - 4
web/templates/pages/edit_firewall.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_firewall" method="post" class="<?=$v_status?>">

+ 2 - 4
web/templates/pages/edit_ip.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_ip" method="post">

+ 2 - 4
web/templates/pages/edit_mail.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_mail" method="post" class="<?=$v_status?>">

+ 2 - 4
web/templates/pages/edit_mail_acc.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_mail_acc" method="post" class="<?=$v_status?>">

+ 2 - 4
web/templates/pages/edit_package.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_package" method="post" class="<?=$v_status?>">

+ 2 - 4
web/templates/pages/edit_server.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/list/ip/" class="button button-secondary"><i class="fas fa-ethernet status-icon blue"></i><?=_('IP');?></a>
@@ -15,8 +15,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_configure_server" method="post">

+ 2 - 4
web/templates/pages/edit_server_bind9.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_configure_server" method="post">

+ 2 - 4
web/templates/pages/edit_server_dovecot.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_configure_server" method="post">

+ 2 - 4
web/templates/pages/edit_server_httpd.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/edit/server/php/" class="button button-secondary"><i class="fas fa-pencil-alt status-icon orange"></i><?=_('Configure');?> PHP</a>
@@ -12,8 +12,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_configure_server" method="post">

+ 2 - 4
web/templates/pages/edit_server_mysql.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_configure_server" method="post">

+ 2 - 4
web/templates/pages/edit_server_nginx.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/edit/server/php/" class="button button-secondary"><i class="fas fa-pencil-alt status-icon orange"></i> <?=_('Configure');?> PHP</a>
@@ -12,8 +12,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_configure_server" method="post">

+ 2 - 4
web/templates/pages/edit_server_pgsql.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_configure_server" method="post">

+ 2 - 4
web/templates/pages/edit_server_php.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_configure_server" method="post">

+ 2 - 4
web/templates/pages/edit_server_service.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -11,8 +11,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_configure_server" method="post">

+ 2 - 4
web/templates/pages/edit_user.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <?php
@@ -44,8 +44,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" method="post" name="v_edit_user" class="<?=$v_status?>">

+ 2 - 4
web/templates/pages/edit_web.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -19,8 +19,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_edit_web" method="post" class="<?=$v_status?>">

+ 2 - 4
web/templates/pages/generate_ssl.html

@@ -1,13 +1,11 @@
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-sort-toolbar">
       <?php show_alert_message($_SESSION);?>
     </div>
   </div>
 </div>
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_generate_csr" method="post">

+ 2 - 4
web/templates/pages/list_access_key.html

@@ -10,8 +10,8 @@ if (!empty($_POST['ok'])) {
 <?php } ?>
 
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/access-key/">
         <i class="fas fa-arrow-left status-icon blue"></i><?= _('Back'); ?>
@@ -21,8 +21,6 @@ if (!empty($_POST['ok'])) {
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
   <form id="vstobjects">
 

+ 3 - 4
web/templates/pages/list_access_keys.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/edit/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/add/access-key/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Access Key');?></a>
@@ -31,7 +31,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
 
 <div class="l-center units">
   <div class="header table-header">
@@ -102,7 +101,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d Access Key', '%d Access Keys', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_backup.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if ($read_only !== 'true') {?>
         <a href="/schedule/backup/?token=<?=$_SESSION['token']?>" class="button button-secondary"><i class="fas fa-plus-circle status-icon green"></i><?=_('Create Backup');?></a>
@@ -36,8 +36,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -128,7 +126,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d backup', '%d backups', $i),$i); ?>
       </div>
     </div>

+ 2 - 4
web/templates/pages/list_backup_detail.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/schedule/restore/?token=<?=$_SESSION['token']?>&backup=<?=htmlentities($_GET['backup'])?>" class="button button-secondary"><i class="fas fa-undo status-icon green"></i><?=_('Restore All');?></a>
@@ -29,8 +29,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">

+ 9 - 10
web/templates/pages/list_backup_exclusions.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/edit/backup/exclusions/" class="button button-secondary"><i class="fas fa-pencil-alt status-icon orange"></i><?=_('Editing Backup Exclusions');?></a>
@@ -20,8 +20,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -54,13 +52,14 @@
       </div>
     <?php } ?>
   </div>
+</div>
 
-  <div id="vstobjects">
-    <div class="l-separator"></div>
-    <div class="l-center">
-      <div class="l-unit-ft">
-        <div class="l-unit__col l-unit__col--right total clearfix">
-        </div>
+<div id="vstobjects">
+  <div class="l-separator"></div>
+  <div class="l-center">
+    <div class="l-unit-ft">
+      <div class="l-unit__col l-unit__col--right total clearfix">
       </div>
     </div>
   </div>
+</div>

+ 3 - 5
web/templates/pages/list_cron.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if ($read_only !== 'true') {?>
         <a href="/add/cron/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Cron Job');?></a>
@@ -56,8 +56,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -151,7 +149,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d cron job', '%d cron jobs', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_db.html

@@ -12,8 +12,8 @@
 ?>
 
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if ($read_only !== 'true') {?>
         <a href="/add/db/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Database');?></a>
@@ -80,8 +80,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -189,7 +187,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d SQL database', '%d SQL databases', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_dns.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if ($read_only !== 'true') {?>
         <a href="/add/dns/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add DNS Domain');?></a>
@@ -55,8 +55,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -163,7 +161,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d DNS zone', '%d DNS zones', $i),$i); ?>
       </div>
     </div>

+ 2 - 4
web/templates/pages/list_dns_public.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if ($read_only !== 'true') {?>
         <a href="/add/dns/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add DNS Domain');?></a>
@@ -55,8 +55,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
 
 <div class="l-unit animated fadeIn">

+ 2 - 4
web/templates/pages/list_dns_rec.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <?php if ($read_only !== 'true') {?>
@@ -55,8 +55,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">

+ 3 - 5
web/templates/pages/list_firewall.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/add/firewall/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Rule');?></a>
@@ -37,8 +37,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units compact">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -138,7 +136,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d firewall rule', '%d firewall rules', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_firewall_banlist.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/add/firewall/banlist/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Ban IP Address');?></a>
@@ -23,8 +23,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -80,7 +78,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php
           if ( $i == 0) {
             echo _('There are currently no banned IP addresses.');

+ 3 - 5
web/templates/pages/list_firewall_ipset.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/add/firewall/ipset/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add IP list');?></a>
@@ -23,8 +23,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -88,7 +86,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php
           if ( $i == 0) {
             echo _('There are currently no IP lists defined.');

+ 3 - 5
web/templates/pages/list_ip.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/add/ip/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add IP');?></a>
@@ -35,8 +35,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -103,7 +101,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d IP address', '%d IP addresses', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_key.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/edit/user/?token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
             <?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && ($_GET['user'] !== 'admin')) { ?>
@@ -13,8 +13,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -64,7 +62,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d SSH Key', '%d SSH Keys', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_log.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
         <a href="/list/user/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -54,8 +54,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
 
   <div class="header table-header">
@@ -101,7 +99,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d log record', '%d log records', $i),$i); ?>
       </div>
     </div>

+ 2 - 4
web/templates/pages/list_log_auth.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && (htmlentities($_GET['user']) !== 'admin')) { ?>
         <a href="/list/log/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
@@ -34,8 +34,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">

+ 3 - 5
web/templates/pages/list_mail.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if ($read_only !== 'true') {?>
         <a href="/add/mail/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Mail Domain');?></a>
@@ -54,8 +54,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -225,7 +223,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d mail domain', '%d mail domains', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_mail_acc.html

@@ -3,8 +3,8 @@
   if (!empty($_SESSION['WEBMAIL_ALIAS'])) $v_webmail_alias = $_SESSION['WEBMAIL_ALIAS'];
 ?>
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <?php if ($read_only !== 'true') { ?>
@@ -58,8 +58,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -202,7 +200,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d mail account', '%d mail accounts', $i),$i); ?>
       </div>
       <div class="l-unit__col l-unit__col--right back clearfix">

+ 3 - 5
web/templates/pages/list_mail_dns.html

@@ -2,8 +2,8 @@
   $v_webmail_alias = "webmail";
   if (!empty($_SESSION['WEBMAIL_ALIAS'])) $v_webmail_alias = $_SESSION['WEBMAIL_ALIAS'];
 ?>
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -12,8 +12,6 @@
   </div>
 </div>
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -116,7 +114,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
       </div>
       <div class="l-unit__col l-unit__col--right back clearfix">
       </div>

+ 4 - 6
web/templates/pages/list_packages.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/add/package/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Package');?></a>
@@ -35,8 +35,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -216,10 +214,10 @@
 </div>
 
 <div id="vstobjects">
-  <div class="l-separator visible"></div>
+  <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d package', '%d packages', $i),$i); ?>
       </div>
     </div>

+ 2 - 3
web/templates/pages/list_rrd.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/list/server/?cpu" class="button button-secondary"><i class="fas fa-chart-pie status-icon green"></i><?=_('show: CPU / MEM / NET / DISK');?></a>
@@ -17,7 +17,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
 <div class="l-center units animated fadeIn">
   <!-- Begin graph list item loop -->
   <?php foreach ($data as $key => $value) { ?>

+ 3 - 5
web/templates/pages/list_search.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a href="javascript:window.history.back();" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-sync status-icon green"></i> <?=_('Refresh');?></a>
@@ -27,8 +27,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">
@@ -161,7 +159,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d object', '%d objects', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_server_preview.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a href="/edit/server/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -10,8 +10,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
 
   <div class="header table-header">
@@ -41,7 +39,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
       </div>
     </div>
   </div>

+ 4 - 6
web/templates/pages/list_services.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a href="/edit/server/" class="button button-secondary"><i class="fas fa-cog status-icon maroon"></i><?=_('Configure');?></a>
       <a href="/list/rrd/" class="button button-secondary"><i class="fas fa-chart-area status-icon blue"></i><?=_('Graphs');?></a>
@@ -39,8 +39,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
 
   <div class="">
@@ -172,11 +170,11 @@
 </div>
 
 <div id="vstobjects">
-  <div class="l-separator visible"></div>
+  <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
       <div class="l-unit__col l-unit__col--left clearfix"></div>
-      <div class="l-unit__col l-unit__col--right clearfix"></div>
+      <div class="l-unit__col l-unit__col--right"></div>
     </div>
   </div>
 </div>

+ 2 - 4
web/templates/pages/list_ssl.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-sort-toolbar">
 
     </div>
@@ -8,8 +8,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <form id="vstobjects" name="v_generate_csr" method="post">

+ 3 - 5
web/templates/pages/list_stats.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if (($_SESSION['userContext'] === 'admin') && (!isset($_SESSION['look']))) { ?>
         <a class="button button-secondary" href='/list/stats/'><i class="fas fa-binoculars status-icon lightblue"></i><?=_('Overall Statistics');?></a>
@@ -47,8 +47,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
 
   <!-- Begin statistics list item loop -->
@@ -233,7 +231,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d month', '%d months', $i),$i); ?>
       </div>
     </div>

+ 2 - 4
web/templates/pages/list_updates.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <?php
@@ -20,8 +20,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
   <div class="header table-header">
     <div class="l-unit__col l-unit__col--right">

+ 4 - 6
web/templates/pages/list_user.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a href="/add/user/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add User');?></a>
       <a href="/list/package/" class="button button-secondary"><i class="fas fa-box-open status-icon orange"></i><?=_('Packages');?></a>
@@ -56,8 +56,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units">
 
   <!-- Table header -->
@@ -182,10 +180,10 @@
 </div>
 
 <div id="vstobjects">
-  <div class="l-separator visible"></div>
+  <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d user account', '%d user accounts', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_web.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <?php if ($read_only !== 'true') {?>
         <a href="/add/web/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Web Domain');?></a>
@@ -55,8 +55,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center units narrow">
 
   <!-- Table header -->
@@ -246,7 +244,7 @@
   <div class="l-separator"></div>
   <div class="l-center">
     <div class="l-unit-ft">
-      <div class="l-unit__col l-unit__col--right clearfix">
+      <div class="l-unit__col l-unit__col--right">
         <?php printf(ngettext('%d web domain', '%d web domains', $i),$i); ?>
       </div>
     </div>

+ 3 - 5
web/templates/pages/list_webapps.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/edit/web/?domain=<?=htmlentities($v_domain)?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -10,9 +10,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
-<div class="l-center animated fadeIn" style="padding-top:240px;">
+<div class="l-center animated fadeIn">
 
   <div style="margin-left:68px; margin-top: 20px">
     <h1 class="form-title"><?=_('Quick Install App');?></h1>

+ 2 - 4
web/templates/pages/setup_webapp.html

@@ -1,6 +1,6 @@
 <!-- Begin toolbar -->
-<div class="l-center">
-  <div class="l-sort">
+<div class="l-sort">
+  <div class="l-sort__inner">
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/add/webapp/?domain=<?=htmlentities($v_domain);?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
@@ -20,8 +20,6 @@
 </div>
 <!-- End toolbar -->
 
-<div class="l-separator"></div>
-
 <div class="l-center animated fadeIn">
 
   <?php if( !empty($WebappInstaller->getOptions())): ?>

Некоторые файлы не были показаны из-за большого количества измененных файлов