UI tidy (#3022)

web/css/src/themes/dark.css

@@ -687,22 +687,6 @@ textarea:focus::placeholder {
   text-transform: none !important;
 }
 
-.login .vst-advanced:hover {
-  color: #ff3478 !important;
-  background-color: transparent;
-  border-color: transparent;
-  border: none !important;
-  background: none !important;
-  box-shadow: none !important;
-}
-
-.login .vst-advanced:active {
-  color: #be1f54 !important;
-  border: none !important;
-  background: none !important;
-  box-shadow: none !important;
-}
-
 .vst-advanced:hover {
   color: #fff;
   background-color: #ff3478;
@@ -710,7 +694,6 @@ textarea:focus::placeholder {
   text-decoration: none;
 }
 
-.login .vst-advanced:active,
 .vst-advanced:active {
   color: #fff;
   background-color: #be1f54;
@@ -718,17 +701,6 @@ textarea:focus::placeholder {
   text-decoration: none;
 }
 
-.login .vst-advanced {
-  border-bottom: none;
-  color: #326b9b;
-  font-size: 0.85em !important;
-  text-decoration: none;
-  text-transform: uppercase;
-  border: none !important;
-  background: none !important;
-  box-shadow: none !important;
-}
-
 .lets-encrypt-note {}
 
 .additional-control {
@@ -986,6 +958,12 @@ a.button.cancel {
 
 }
 
+.body-login,
+.body-reset {
+  background: #303030;
+  background: radial-gradient(circle, rgb(77 77 77 / 100%) 0%, rgb(31 31 31 / 100%) 100%);
+}
+
 .login {
   background-color: #282828;
   box-shadow: 0 8px 25px rgb(0 0 0 / 30%), inset 0 0 2px rgb(0 0 0 / 25%);
@@ -995,10 +973,20 @@ a.button.cancel {
   color: #fff;
 }
 
-.login a.error {
+.login .error {
   color: #f864fa;
 }
 
+.login .label-link {
+  color: #eee;
+  text-transform: initial;
+  font-weight: 400;
+}
+
+.login .label-link:hover {
+  color: #ff3478;
+}
+
 .form-title {
   color: #e8e8e8;
 }
@@ -1226,38 +1214,6 @@ form#vstobjects.suspended {
   border-bottom: 1px solid #353535;
 }
 
-.shortcuts .close {
-
-}
-
-.shortcuts .close:hover {
-
-}
-
-.shortcuts .close:active {
-
-}
-
-.shortcuts .close .fas {
-
-}
-
-.shortcuts ul {
-
-}
-
-.shortcuts ul li {
-
-}
-
-.shortcuts ul li span {
-
-}
-
-.shortcuts ul li span.bigger {
-
-}
-
 .description {
 
 }
@@ -1386,12 +1342,6 @@ li[aria-expanded="true"] a {
   border-radius: 8px;
 }
 
-.body-login,
-.body-reset {
-  background: #303030 !important;
-  background: radial-gradient(circle, rgb(77 77 77 / 100%) 0%, rgb(31 31 31 / 100%) 100%) !important;
-}
-
 .debug-panel-contents {
   background-color: #282828;
 }
@@ -1432,11 +1382,6 @@ li[aria-expanded="true"] a {
   color: #fff !important;
 }
 
-.admin-warning-button {
-  padding-left: 65px !important;
-  padding-right: 65px !important;
-}
-
 @media screen and (max-width: 950px) {
   .helper-container {
     display: none;

web/css/src/themes/default.css

@@ -1037,16 +1037,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
   padding-right: 6px;
 }
 
-.body-login,
-.body-reset {
-  height: auto;
-  display: flex;
-  justify-content: center;
-  padding-top: 10%;
-  background: rgb(102 158 231) !important;
-  background: radial-gradient(circle, rgb(102 158 231 / 100%) 0%, rgb(43 86 177 / 100%) 100%) !important;
-}
-
 .body-user .l-unit.animated.fadeIn {
   line-height: 2rem;
 }
@@ -2277,16 +2267,6 @@ body.mobile .l-icon-shortcuts {
   text-transform: none;
 }
 
-.login .vst-advanced:hover {
-  color: #c36;
-  background-color: transparent;
-  border-color: transparent;
-  font-size: 0.85em !important;
-  box-shadow: none !important;
-  background: none !important;
-  border: none !important;
-}
-
 .vst-advanced:hover {
   color: #fff;
   background-color: #c36;
@@ -2294,35 +2274,10 @@ body.mobile .l-icon-shortcuts {
   text-decoration: none;
 }
 
-.login .vst-advanced:active {
-  color: #fff;
-  background-color: #f7d616;
-  border-color: #f7d616;
-  text-decoration: none;
-  font-size: 0.85em !important;
-  box-shadow: none !important;
-  background: none !important;
-  border: none !important;
-}
-
 .vst-advanced:active {
   font-size: unset;
 }
 
-.login .vst-advanced {
-  border-bottom: none;
-  color: #326b9b;
-  text-decoration: none;
-  text-transform: uppercase;
-  font-size: 0.85em !important;
-  box-shadow: none !important;
-  background: none !important;
-  border: none !important;
-  height: auto !important;
-  padding: 0 !important;
-  min-width: 0 !important;
-}
-
 .lets-encrypt-note {
   color: #89a40a !important;
   font-style: italic;
@@ -2684,8 +2639,27 @@ a.button.cancel {
   padding-left: 20px !important;
 }
 
+.body-login,
+.body-reset {
+  height: auto;
+  display: flex;
+  justify-content: center;
+  padding-top: 10%;
+  background: rgb(102 158 231);
+  background: radial-gradient(circle, rgb(102 158 231 / 100%) 0%, rgb(43 86 177 / 100%) 100%);
+}
+
+.body-login .debug-panel-header,
+.body-login .debug-panel-contents,
+.body-reset .debug-panel-header,
+.body-reset .debug-panel-contents {
+  display: none;
+}
+
 .login {
   display: flex;
+  align-items: flex-end;
+  font-size: 0.85rem;
   padding: 80px 50px;
   background-color: rgb(255 255 255 / 70%);
   border-radius: 6px;
@@ -2701,13 +2675,18 @@ a.button.cancel {
   margin-bottom: 30px;
 }
 
-.login a.error {
+.login .error {
   color: #be5abf;
-  font-size: 0.8rem;
+  margin-bottom: 20px;
 }
 
-.login .form-label {
-  font-size: 0.85rem;
+.login .label-link {
+  color: #326b9b;
+  text-transform: uppercase;
+}
+
+.login .label-link:hover {
+  color: #0077c6;
 }
 
 .login .form-control {
@@ -3128,8 +3107,8 @@ form#vstobjects.suspended {
 }
 
 .admin-warning-button {
-  padding-left: 59px !important;
-  padding-right: 59px !important;
+  padding-left: 65px !important;
+  padding-right: 65px !important;
 }
 
 .footer-banner {
@@ -3198,22 +3177,6 @@ form#vstobjects.suspended {
   color: #fff;
 }
 
-.float-left {
-  float: left;
-}
-
-.float-right {
-  float: right;
-}
-
-.display-inline-block {
-  display: inline-block;
-}
-
-.width-100p {
-  width: 100%;
-}
-
 .l-sort-toolbar table td {
   float: left;
   margin-left: 10px;
@@ -3263,24 +3226,19 @@ form#vstobjects.suspended {
   font-weight: 600;
 }
 
-.shortcuts .close {
+.shortcuts-close {
   cursor: pointer;
-  width: 20px;
+  padding: 5px;
 }
 
-.shortcuts .close:hover {
+.shortcuts-close:hover {
   color: #db0000;
 }
 
-.shortcuts .close:active {
+.shortcuts-close:active {
   color: #a60000;
 }
 
-.shortcuts .close .fas {
-  font-size: 0.8rem;
-  line-height: 1.4rem;
-}
-
 .shortcuts-inner {
   display: flex;
   width: 100%;
@@ -3614,13 +3572,6 @@ li[aria-expanded="true"] a {
   color: #aaa !important;
 }
 
-.body-login .debug-panel-header,
-.body-login .debug-panel-contents,
-.body-reset .debug-panel-header,
-.body-reset .debug-panel-contents {
-  display: none;
-}
-
 @media screen and (max-width: 950px) {
   .helper-container {
     display: none;
@@ -3735,6 +3686,18 @@ li[aria-expanded="true"] a {
   display: none !important;
 }
 
+.u-inline-block {
+  display: inline-block !important;
+}
+
+.u-float-left {
+  float: left !important;
+}
+
+.u-float-right {
+  float: right !important;
+}
+
 .text-right {
   text-align: right !important;
 }
@@ -3771,6 +3734,10 @@ li[aria-expanded="true"] a {
   margin-right: 15px !important;
 }
 
+.u-mr30 {
+  margin-right: 30px !important;
+}
+
 .u-mb5 {
   margin-bottom: 5px !important;
 }

web/css/src/themes/vestia.css

@@ -17,11 +17,6 @@ strong {
   font-weight: 600;
 }
 
-.body-login,
-.body-reset {
-  background: #5f7eb3 !important;
-}
-
 .table-header {
   box-shadow: none !important;
   background: #fafafa !important;
@@ -314,8 +309,7 @@ strong {
   border: 1px solid #f16100;
 }
 
-.form-control:focus,
-.login .form-control:focus {
+.form-control:focus {
   border-color: #ff6701;
   background-color: #fff4ed;
   color: #333;
@@ -566,11 +560,6 @@ a.ui-button:focus {
   background: none !Important;
 }
 
-a.vst-advanced .fas {
-  display: none !important;
-  overflow: hidden;
-}
-
 a.vst-advanced {
   text-transform: uppercase;
   font-size: 0.9em !important;
@@ -629,6 +618,11 @@ a.vst-advanced:focus {
   color: #809c00 !important;
 }
 
+.body-login,
+.body-reset {
+  background: #ededed;
+}
+
 .login {
   background-color: rgb(255 255 255 / 100%);
   box-shadow: 0 2px 5px rgb(0 0 0 / 30%), inset 0 0 2px rgb(255 255 255);
@@ -636,9 +630,12 @@ a.vst-advanced:focus {
   border-radius: 0;
 }
 
-.body-login,
-.body-reset {
-  background: #ededed !important;
+.login .button {
+  background: #94be00 !important;
+  text-shadow: none !important;
+  color: #fff !important;
+  border: none !important;
+  border-radius: 0 !important;
 }
 
 .body-login input.button.cancel,
@@ -666,20 +663,6 @@ a.vst-advanced:focus {
   color: #326b9b !important;
 }
 
-.login .form-control {
-  border-color: #bbb;
-}
-
-.body-login button.button,
-.body-reset button.button,
-.login .button {
-  background: #94be00 !important;
-  text-shadow: none !important;
-  color: #fff !important;
-  border: none !important;
-  border-radius: 0 !important;
-}
-
 .l-logo {
   height: 24px !important;
   margin-top: 8px !important;

web/js/init.js

@@ -337,7 +337,7 @@ $(document).ready(function(){
               );
 
               shortcut.add("h", function(){
-                $('.shortcuts').toggle();
+                $('.shortcuts').toggleClass('u-hidden');
               }, {
                   'type':             'keydown',
                   'propagate':        false,
@@ -347,7 +347,7 @@ $(document).ready(function(){
               );
 
               shortcut.add("Esc", function(){
-                $('.shortcuts').hide();
+                $('.shortcuts').addClass('u-hidden');
                 $('input, checkbox, textarea, select').blur();
               }, {
                   'type':             'keydown',
@@ -538,12 +538,12 @@ $(document).ready(function(){
 
 
 
-              $('.shortcuts .close').click(function(){
-                $('.shortcuts').hide();
+              $('.shortcuts-close').click(function(){
+                $('.shortcuts').addClass('u-hidden');
               });
 
               $('.to-shortcuts').click(function(){
-                $('.shortcuts').toggle();
+                $('.shortcuts').toggleClass('u-hidden');
               });
 
               $(document).click(function(evt){

web/login/index.php

@@ -111,11 +111,11 @@ function authenticate_user($user, $password, $twofa = '')
         if ($return_var > 0) {
             sleep(2);
             if ($return_var == 5) {
-                $error = '<a class="error">' . _('Account has been suspended') . '</a>';
+                $error = '<p class="error">' . _('Account has been suspended') . '</p>';
             } elseif ($return_var == 1) {
-                $error = '<a class="error">' . _('Unsupported hash method') . '</a>';
+                $error = '<p class="error">' . _('Unsupported hash method') . '</p>';
             } else {
-                $error = '<a class="error">' . _('Invalid username or password') . '</a>';
+                $error = '<p class="error">' . _('Invalid username or password') . '</p>';
             }
             return $error;
         } else {
@@ -157,7 +157,7 @@ function authenticate_user($user, $password, $twofa = '')
             // Check API answer
             if ($return_var > 0) {
                 sleep(2);
-                $error = '<a class="error">' . _('Invalid username or password') . '</a>';
+                $error = '<p class="error">' . _('Invalid username or password') . '</p>';
                 $v_session_id = quoteshellarg($_POST['token']);
                 exec(HESTIA_CMD . 'v-log-user-login ' . $v_user . ' ' . $v_ip . ' failed ' . $v_session_id . ' ' . $v_user_agent, $output, $return_var);
                 return $error;
@@ -169,7 +169,7 @@ function authenticate_user($user, $password, $twofa = '')
                 unset($output);
                 if ($data[$user]['LOGIN_DISABLED'] === 'yes') {
                     sleep(2);
-                    $error = '<a class="error">' . _('Invalid username or password') . '</a>';
+                    $error = '<p class="error">' . _('Invalid username or password') . '</p>';
                     $v_session_id = quoteshellarg($_POST['token']);
                     exec(HESTIA_CMD . 'v-log-user-login ' . $v_user . ' ' . $v_ip . ' failed ' . $v_session_id . ' ' . $v_user_agent .' yes "Login disabled for this user"', $output, $return_var);
                     return $error;
@@ -180,7 +180,7 @@ function authenticate_user($user, $password, $twofa = '')
                     $v_login_user_allowed_ips = array_map('trim', $v_login_user_allowed_ips);
                     if (!in_array($ip, $v_login_user_allowed_ips, true)) {
                         sleep(2);
-                        $error = '<a class="error">' . _('Invalid username or password') . '</a>';
+                        $error = '<p class="error">' . _('Invalid username or password') . '</p>';
                         $v_session_id = quoteshellarg($_POST['token']);
                         exec(HESTIA_CMD . 'v-log-user-login ' . $v_user . ' ' . $v_ip . ' failed ' . $v_session_id . ' ' . $v_user_agent .' yes "Ip not in allowed list"', $output, $return_var);
                         return $error;
@@ -189,7 +189,7 @@ function authenticate_user($user, $password, $twofa = '')
 
                 if ($data[$user]['TWOFA'] != '') {
                     exec(HESTIA_CMD . "v-check-user-2fa " . $v_user . " " . $v_twofa, $output, $return_var);
-                    $error = "<a class=\"error\">" . _('Invalid or missing 2FA token') . "</a>";
+                    $error = "<p class=\"error\">" . _('Invalid or missing 2FA token') . "</p>";
                     if (empty($twofa)) {
                         $_SESSION['login']['username'] = $user;
                         $_SESSION['login']['password'] = $password;
@@ -200,7 +200,7 @@ function authenticate_user($user, $password, $twofa = '')
                         unset($output);
                         if ($return_var > 0) {
                             sleep(2);
-                            $error = '<a class="error">' ._('Invalid or missing 2FA token') . '</a>';
+                            $error = '<p class="error">' . _('Invalid or missing 2FA token') . '</p>';
                             $_SESSION['login']['username'] = $user;
                             $_SESSION['login']['password'] = $password;
                             $v_session_id = quoteshellarg($_POST['token']);

web/reset/index.php

@@ -60,10 +60,10 @@ if ((!empty($_POST['user'])) && (empty($_POST['code']))) {
                         header("Location: /reset/?action=code&user=".$_POST['user']);
                         exit;
                 }
-                
+
             }
         } else {
-            $ERROR = "<a class=\"error\">"._('Please wait 15 minutes before sending a new request')."</a>";
+            $ERROR = "<p class=\"error\">"._('Please wait 15 minutes before sending a new request')."</p>";
         }
     }
     unset($output);
@@ -91,7 +91,7 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass
                     unlink($v_password);
                     if ($return_var > 0) {
                         sleep(5);
-                        $ERROR = "<a class=\"error\">"._('An internal error occurred')."</a>";
+                        $ERROR = "<p class=\"error\">"._('An internal error occurred')."</p>";
                     } else {
                         $_SESSION['user'] = $_POST['user'];
                         header("Location: /");
@@ -99,20 +99,20 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass
                     }
                 } else {
                     sleep(5);
-                    $ERROR = "<a class=\"error\">"._('Code has been expired')."</a>";
+                    $ERROR = "<p class=\"error\">"._('Code has been expired')."</p>";
                     exec(HESTIA_CMD . 'v-log-user-login ' . $v_user . ' ' . $v_ip . ' failed ' . $v_session_id . ' ' . $v_user_agent .' yes "Reset code has been expired"', $output, $return_var);
                 }
             } else {
                 sleep(5);
-                $ERROR = "<a class=\"error\">"._('Invalid username or code')."</a>";
+                $ERROR = "<p class=\"error\">"._('Invalid username or code')."</p>";
                 exec(HESTIA_CMD . 'v-log-user-login ' . $v_user . ' ' . $v_ip . ' failed ' . $v_session_id . ' ' . $v_user_agent .' yes "Invalid Username or Code"', $output, $return_var);
             }
         } else {
             sleep(5);
-            $ERROR = "<a class=\"error\">"._('Invalid username or code')."</a>";
+            $ERROR = "<p class=\"error\">"._('Invalid username or code')."</p>";
         }
     } else {
-        $ERROR = "<a class=\"error\">"._('Passwords not match')."</a>";
+        $ERROR = "<p class=\"error\">"._('Passwords not match')."</p>";
     }
 }
 

web/templates/footer.html

@@ -17,10 +17,10 @@
     <p><?=_('LEAVE_PAGE_CONFIRMATION')?></p>
   </div>
 
-  <div class="shortcuts animated fadeIn" style="display:none">
+  <div class="shortcuts animated fadeIn u-hidden">
     <div class="shortcuts-header">
       <div class="shortcuts-title"><?=_('Shortcuts')?></div>
-      <div class="close text-center">
+      <div class="shortcuts-close">
         <i class="fas fa-times"></i>
       </div>
     </div>

web/templates/pages/add_access_key.html

@@ -6,7 +6,7 @@
         <i class="fas fa-arrow-left status-icon blue"></i><?= _('Back'); ?>
       </a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects">
         <i class="fas fa-save status-icon purple"></i><?= _('Save'); ?>
       </a>

web/templates/pages/add_cron.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_db.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>
@@ -31,8 +31,8 @@
         <?php } ?>
         <?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
           <div class="u-side-by-side u-pt18">
-            <div><a href="/add/user/" class="vst-advanced admin-warning-button"><?=_('Add User');?></a></div>
-            <div><a href="/add/db/?accept=true" class="vst-advanced button danger admin-warning-button"><?=_('Continue');?></a></div>
+            <div><a href="/add/user/" class="button admin-warning-button"><?=_('Add User');?></a></div>
+            <div><a href="/add/db/?accept=true" class="button danger admin-warning-button"><?=_('Continue');?></a></div>
           </div>
         <?php } ?>
         <?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>

web/templates/pages/add_dns.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>
@@ -31,8 +31,8 @@
         <?php } ?>
         <?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
           <div class="u-side-by-side u-pt18">
-            <div><a href="/add/user/" class="vst-advanced admin-warning-button"><?=_('Add User');?></a></div>
-            <div><a href="/add/dns/?accept=true" class="vst-advanced button danger admin-warning-button"><?=_('Continue');?></a></div>
+            <div><a href="/add/user/" class="button admin-warning-button"><?=_('Add User');?></a></div>
+            <div><a href="/add/dns/?accept=true" class="button danger admin-warning-button"><?=_('Continue');?></a></div>
           </div>
         <?php } ?>
         <?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>

web/templates/pages/add_dns_rec.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" 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>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_firewall.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_firewall_banlist.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/firewall/banlist/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_firewall_ipset.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/firewall/ipset/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_ip.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_key.html

@@ -8,7 +8,7 @@
         <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/key/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <?php } ?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_mail.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>
@@ -31,8 +31,8 @@
         <?php } ?>
         <?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
           <div class="u-side-by-side u-pt18">
-            <div><a href="/add/user/" class="vst-advanced admin-warning-button"><?=_('Add User');?></a></div>
-            <div><a href="/add/mail/?accept=true" class="vst-advanced button danger admin-warning-button"><?=_('Continue');?></a></div>
+            <div><a href="/add/user/" class="button admin-warning-button"><?=_('Add User');?></a></div>
+            <div><a href="/add/mail/?accept=true" class="button danger admin-warning-button"><?=_('Continue');?></a></div>
           </div>
         <?php } ?>
         <?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>

web/templates/pages/add_mail_acc.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" 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>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_package.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_user.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_web.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
         <a href="#" class="ui-button" title="<?=_('Save');?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
       <?php } ?>
@@ -33,8 +33,8 @@
         <?php } ?>
         <?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
           <div class="u-side-by-side u-pt18">
-            <div><a href="/add/user/" class="vst-advanced admin-warning-button"><?=_('Add User');?></a></div>
-            <div><a href="/add/web/?accept=true" class="vst-advanced button danger admin-warning-button"><?=_('Continue');?></a></div>
+            <div><a href="/add/user/" class="button admin-warning-button"><?=_('Add User');?></a></div>
+            <div><a href="/add/web/?accept=true" class="button danger admin-warning-button"><?=_('Continue');?></a></div>
           </div>
         <?php } ?>
         <?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>

web/templates/pages/edit_backup_exclusions.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/backup/exclusions/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_cron.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_db.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_dns.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_dns_rec.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" 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>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_firewall.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_ip.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_mail.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_mail_acc.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" 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>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_package.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server.html

@@ -8,7 +8,7 @@
         <a href="/list/firewall/" class="ui-button cancel" dir="ltr"><i class="fas fa-shield-alt status-icon red"></i><?=_('Firewall');?></a>
       <?php }?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_bind9.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_dovecot.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_httpd.html

@@ -5,7 +5,7 @@
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/edit/server/php/" class="ui-button cancel" dir="ltr"><i class="fas fa-pencil-alt status-icon orange"></i><?=_('Configure');?> PHP</a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_mysql.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_nginx.html

@@ -5,7 +5,7 @@
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/edit/server/php/" class="ui-button cancel" dir="ltr"><i class="fas fa-pencil-alt status-icon orange"></i> <?=_('Configure');?> PHP</a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_pgsql.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_php.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_service.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_user.html

@@ -24,7 +24,7 @@
         <a href="<?=$keys_url; ?>" id="btn-create" class="ui-button cancel" dir="ltr" title="<?=_('Access Keys');?>"><i class="fas fa-key status-icon purple"></i><?=_('Access Keys');?></a>
       <?php } ?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <?php if (($_SESSION['user'] == $v_username) || (isset($_SESSION['look']))) {?>
         <!-- Do not show delete button for currently logged in user-->
       <?} else {?>

web/templates/pages/edit_web.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="/delete/web/cache/?domain=<?=htmlentities($v_domain);?>&token=<?=$_SESSION['token'];?>" class="ui-button cancel <?php if ( $v_nginx_cache == 'yes' || (($v_proxy_template == 'caching' || is_int(strpos($v_proxy_template, 'caching-'))) && $_SESSION['PROXY_SYSTEM'] == 'nginx')) { echo "block"; } else{ echo "u-hidden"; }?>" id="v-clear-cache">
         <i class="fas fa-trash status-icon red"></i><?=_('Purge Nginx Cache');?>
       </a>

web/templates/pages/generate_ssl.html

@@ -1,6 +1,6 @@
 <div class="l-center">
   <div class="l-sort clearfix">
-    <div class="l-sort-toolbar clearfix float-left">
+    <div class="l-sort-toolbar clearfix u-float-left">
       <?php show_alert_message($_SESSION);?>
     </div>
   </div>

web/templates/pages/list_log.html

@@ -28,13 +28,13 @@
       <?php }
       } ?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-redo status-icon green"></i><?=_('Refresh');?></a>
       <?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
         <!-- Hide delete buttons-->
       <?php } else { ?>
         <?php if (($_SESSION['userContext'] === 'admin') || (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no'))) {?>
-          <div class="actions-panel display-inline-block" key-action="js">
+          <div class="actions-panel u-inline-block" key-action="js">
             <a class="data-controls do_delete ui-button danger cancel">
               <i class="do_delete fas fa-times-circle status-icon red"></i><?=_('Delete');?>
               <?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user']))) {?>

web/templates/pages/list_log_auth.html

@@ -8,13 +8,13 @@
         <a href="/list/log/" id="btn-back" class="ui-button cancel" dir="ltr"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <?php } ?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-redo status-icon green"></i><?=_('Refresh');?></a>
       <?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
         <!-- Hide delete buttons-->
       <?php } else { ?>
         <?php if (($_SESSION['userContext'] === 'admin') || (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no'))) {?>
-          <div class="actions-panel display-inline-block" key-action="js">
+          <div class="actions-panel u-inline-block" key-action="js">
             <a class="data-controls do_delete ui-button danger cancel">
               <i class="do_delete fas fa-times-circle status-icon red"></i><?=_('Delete');?>
               <?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user']))) {?>

web/templates/pages/list_server_preview.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a href="/edit/server/" id="btn-back" class="ui-button cancel" dir="ltr"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
     </div>
   </div>
 </div>

web/templates/pages/list_services.html

@@ -9,7 +9,7 @@
       <a href="/list/firewall/" class="ui-button cancel" dir="ltr"><i class="fas fa-shield-alt status-icon red"></i><?=_('Firewall');?></a>
       <?php }?>
       <a href="/list/log/?user=system&token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-binoculars status-icon orange"></i><?=_('Logs');?></a>
-      <div class="actions-panel display-inline-block" key-action="js">
+      <div class="actions-panel u-inline-block" key-action="js">
         <a class="data-controls do_servicerestart ui-button danger cancel">
           <i class="do_servicerestart fas fa-undo status-icon red"></i><?=_('Restart');?>
           <input type="hidden" name="servicerestart_url" value="/restart/system/?hostname=<?=$sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>&system_reset_token=<?=time(); ?>">

web/templates/pages/list_ssl.html

@@ -1,7 +1,7 @@
 <!-- Begin toolbar -->
 <div class="l-center">
   <div class="l-sort clearfix noselect">
-    <div class="l-sort-toolbar clearfix float-left">
+    <div class="l-sort-toolbar clearfix u-float-left">
 
     </div>
   </div>

web/templates/pages/list_webapps.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/edit/web/?domain=<?=htmlentities($v_domain)?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
     </div>
   </div>
 </div>

web/templates/pages/login/login.html

@@ -1,26 +1,22 @@
 <div class="login animated zoomIn">
-  <div style="padding-top: 40px; padding-right: 30px;">
-    <a href="/" class="u-block">
-      <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
-    </a>
-  </div>
-  <div>
-    <form id="form_login" method="post" action="/login/">
-      <input type="hidden" name="token" value="<?=$_SESSION['token']; ?>">
-      <input type="hidden" name="murmur" value="" id="murmur">
-      <h1 class="login-title">
-        <?=_('Welcome to Hestia Control Panel');?>
-      </h1>
-      <?php if (isset($error)) echo $error ?>
-      <div class="u-mb20">
-        <label for="user" class="form-label"><?=_('Username');?></label>
-        <input type="text" class="form-control" name="user" id="user" tabindex="1" style="width:260px;" autofocus>
-      </div>
-      <button tabindex="3" type="submit" class="button">
-        <?=_('Next');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i>
-      </button>
-    </form>
-  </div>
+  <a href="/" class="u-block u-mr30">
+    <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
+  </a>
+  <form id="form_login" method="post" action="/login/">
+    <input type="hidden" name="token" value="<?=$_SESSION['token']; ?>">
+    <input type="hidden" name="murmur" value="" id="murmur">
+    <h1 class="login-title">
+      <?=_('Welcome to Hestia Control Panel');?>
+    </h1>
+    <?php if (isset($error)) echo $error ?>
+    <div class="u-mb20">
+      <label for="user" class="form-label"><?=_('Username');?></label>
+      <input type="text" class="form-control" name="user" id="user" tabindex="1" style="width:260px;" autofocus>
+    </div>
+    <button tabindex="3" type="submit" class="button">
+      <?=_('Next');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i>
+    </button>
+  </form>
 </div>
 
 </body>

web/templates/pages/login/login_1.html

@@ -1,34 +1,30 @@
-<div class="login">
-  <div style="padding-top: 40px; padding-right: 30px;">
-    <a href="/" class="u-block">
-      <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
-    </a>
-  </div>
-  <div class="animated fadeIn">
-    <form id="form_login" method="post" action="/login/">
-      <input type="hidden" name="token" value="<?=$_SESSION['token']; ?>">
-      <input type="hidden" name="murmur" value="" id="murmur">
-      <h1 class="login-title">
-        <?=_('Welcome');?> <?=htmlspecialchars($_SESSION['login']['username']); ?>!
-      </h1>
-      <?php if (isset($ERROR)) echo $ERROR ?>
-      <div class="u-mb20">
-        <label for="password" class="form-label u-side-by-side">
-          <?=_('Password');?>
-          <?php if ($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] !== 'no' ) {?>
-            <a tabindex="5" class="vst-advanced" href="/reset/">
-              <?=_('forgot password');?>
-            </a>
-          <?php } ?>
-        </label>
-        <input type="password" class="form-control" name="password" id="password" tabindex="2" style="width:260px;" autofocus>
-      </div>
-      <div>
-        <button tabindex="3" type="submit" class="button"><?=_('Login');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i></button>&nbsp;&nbsp;
-        <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/?logout=true'">
-      </div>
-    </form>
-  </div>
+<div class="login animated zoomIn">
+  <a href="/" class="u-block u-mr30">
+    <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
+  </a>
+  <form id="form_login" method="post" action="/login/">
+    <input type="hidden" name="token" value="<?=$_SESSION['token']; ?>">
+    <input type="hidden" name="murmur" value="" id="murmur">
+    <h1 class="login-title">
+      <?=_('Welcome');?> <?=htmlspecialchars($_SESSION['login']['username']); ?>!
+    </h1>
+    <?php if (isset($ERROR)) echo $ERROR ?>
+    <div class="u-mb20">
+      <label for="password" class="form-label u-side-by-side">
+        <?=_('Password');?>
+        <?php if ($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] !== 'no' ) {?>
+          <a tabindex="5" class="label-link" href="/reset/">
+            <?=_('forgot password');?>
+          </a>
+        <?php } ?>
+      </label>
+      <input type="password" class="form-control" name="password" id="password" tabindex="2" style="width:260px;" autofocus>
+    </div>
+    <div>
+      <button tabindex="3" type="submit" class="button"><?=_('Login');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i></button>&nbsp;&nbsp;
+      <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/?logout=true'">
+    </div>
+  </form>
 </div>
 
 </body>

web/templates/pages/login/login_2.html

@@ -1,32 +1,28 @@
-<div class="login">
-  <div style="padding-top: 40px; padding-right: 30px;">
-    <a href="/" class="u-block">
-      <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
-    </a>
-  </div>
-  <div class="animated fadeIn">
-    <form id="form_login" method="post" action="/login/">
-      <input type="hidden" name="token" value="<?=$_SESSION['token']; ?>">
-      <input type="hidden" name="murmur" value="" id="murmur">
-      <h1 class="login-title">
-        <?=_('2 Factor Authentication');?>
-      </h1>
-      <?php if (isset($ERROR)) echo $ERROR ?>
-      <div class="u-mb20">
-        <label for="twofa" class="form-label u-side-by-side">
-          <?=_('2FA Token');?>
-          <a tabindex="5" class="vst-advanced" href="/reset2fa/">
-            <?=_('Forgot token');?>
-          </a>
-        </label>
-        <input type="text" class="form-control" name="twofa" id="twofa" tabindex="2" style="width:260px;" autofocus>
-      </div>
-      <div>
-        <button tabindex="3" type="submit" class="button"><?=_('Login');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i></button>&nbsp;&nbsp;
-        <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/?logout'">
-      </div>
-    </form>
-  </div>
+<div class="login animated zoomIn">
+  <a href="/" class="u-block u-mr30">
+    <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
+  </a>
+  <form id="form_login" method="post" action="/login/">
+    <input type="hidden" name="token" value="<?=$_SESSION['token']; ?>">
+    <input type="hidden" name="murmur" value="" id="murmur">
+    <h1 class="login-title">
+      <?=_('2 Factor Authentication');?>
+    </h1>
+    <?php if (isset($ERROR)) echo $ERROR ?>
+    <div class="u-mb20">
+      <label for="twofa" class="form-label u-side-by-side">
+        <?=_('2FA Token');?>
+        <a tabindex="5" class="label-link" href="/reset2fa/">
+          <?=_('Forgot token');?>
+        </a>
+      </label>
+      <input type="text" class="form-control" name="twofa" id="twofa" tabindex="2" style="width:260px;" autofocus>
+    </div>
+    <div>
+      <button tabindex="3" type="submit" class="button"><?=_('Login');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i></button>&nbsp;&nbsp;
+      <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/?logout'">
+    </div>
+  </form>
 </div>
 
 </body>

web/templates/pages/login/login_a.html

@@ -1,37 +1,33 @@
 <div class="login animated zoomIn">
-  <div style="padding-top: 40px; padding-right: 30px;">
-    <a href="/" class="u-block">
-      <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
-    </a>
-  </div>
-  <div>
-    <form id="form_login" method="post" action="/login/">
-      <input type="hidden" name="token" value="<?=$_SESSION['token']; ?>">
-      <input type="hidden" name="murmur" value="" id="murmur">
-      <h1 class="login-title">
-        <?=_('Welcome to Hestia Control Panel');?>
-      </h1>
-      <?php if (isset($error)) echo $error ?>
-      <div class="u-mb10">
-        <label for="user" class="form-label"><?=_('Username');?></label>
-        <input type="text" class="form-control" name="user" id="user" tabindex="1" style="width:260px;" autofocus>
-      </div>
-      <div class="u-mb20">
-        <label for="password" class="form-label u-side-by-side">
-          <?=_('Password');?>
-          <?php if ($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] !== 'no' ) {?>
-            <a tabindex="5" class="vst-advanced" href="/reset/">
-              <?=_('forgot password');?>
-            </a>
-          <?php } ?>
-        </label>
-        <input type="password" class="form-control" name="password" id="password" tabindex="2" style="width:260px;" autofocus>
-      </div>
-      <button tabindex="3" type="submit" class="button">
-        <?=_('Next');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i>
-      </button>
-    </form>
-  </div>
+  <a href="/" class="u-block u-mr30">
+    <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
+  </a>
+  <form id="form_login" method="post" action="/login/">
+    <input type="hidden" name="token" value="<?=$_SESSION['token']; ?>">
+    <input type="hidden" name="murmur" value="" id="murmur">
+    <h1 class="login-title">
+      <?=_('Welcome to Hestia Control Panel');?>
+    </h1>
+    <?php if (isset($error)) echo $error ?>
+    <div class="u-mb10">
+      <label for="user" class="form-label"><?=_('Username');?></label>
+      <input type="text" class="form-control" name="user" id="user" tabindex="1" style="width:260px;" autofocus>
+    </div>
+    <div class="u-mb20">
+      <label for="password" class="form-label u-side-by-side">
+        <?=_('Password');?>
+        <?php if ($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] !== 'no' ) {?>
+          <a tabindex="5" class="label-link" href="/reset/">
+            <?=_('forgot password');?>
+          </a>
+        <?php } ?>
+      </label>
+      <input type="password" class="form-control" name="password" id="password" tabindex="2" style="width:260px;" autofocus>
+    </div>
+    <button tabindex="3" type="submit" class="button">
+      <?=_('Next');?>&nbsp;&nbsp;&nbsp;<i class="fas fa-sign-in-alt"></i>
+    </button>
+  </form>
 </div>
 
 </body>

web/templates/pages/login/reset2fa.html

@@ -1,11 +1,9 @@
-<div class="login">
-  <div style="padding-top: 40px; padding-right: 30px;">
-    <a href="/" class="u-block">
-      <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
-    </a>
-  </div>
-  <div class="animated fadeIn">
-    <?php if ($success) {?>
+<div class="login animated zoomIn">
+  <a href="/" class="u-block u-mr30">
+    <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
+  </a>
+  <?php if ($success) {?>
+    <div>
       <h1 class="login-title">
         <?=_('2FA Reset successfully'); ?>
       </h1>
@@ -13,28 +11,28 @@
       <div class="u-mt20">
         <input type="button" class="button" value="<?=_('Log in');?>" onclick="location.href='/login/'">
       </div>
-    <?php } else { ?>
-      <form method="post" action="/reset2fa/">
-        <input type="hidden" name="token" value="<?=$_SESSION['token'];?>"/>
-        <h1 class="login-title">
-          <?=_('Reset 2FA');?>
-        </div>
-        <?php if (isset($ERROR)) echo $ERROR ?>
-        <div class="u-mb10">
-          <label for="user" class="form-label"><?=_('Username');?></label>
-          <input type="text" class="form-control" name="user" id="user" tabindex="1" style="width:260px;">
-        </div>
-        <div class="u-mb20">
-          <label for="twofa" class="form-label"><?=_('2FA Reset Code');?></label>
-          <input type="text" class="form-control" name="twofa" id="twofa" tabindex="1" style="width:260px;">
-        </div>
-        <div>
-          <input tabindex="2" type="submit" value="<?=_('Submit');?>" class="button">&nbsp;&nbsp;
-          <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/?logout'">
-        </div>
-      </form>
-    <?php } ?>
-  </div>
+    </div>
+  <?php } else { ?>
+    <form method="post" action="/reset2fa/">
+      <input type="hidden" name="token" value="<?=$_SESSION['token'];?>"/>
+      <h1 class="login-title">
+        <?=_('Reset 2FA');?>
+      </div>
+      <?php if (isset($ERROR)) echo $ERROR ?>
+      <div class="u-mb10">
+        <label for="user" class="form-label"><?=_('Username');?></label>
+        <input type="text" class="form-control" name="user" id="user" tabindex="1" style="width:260px;">
+      </div>
+      <div class="u-mb20">
+        <label for="twofa" class="form-label"><?=_('2FA Reset Code');?></label>
+        <input type="text" class="form-control" name="twofa" id="twofa" tabindex="1" style="width:260px;">
+      </div>
+      <div>
+        <input tabindex="2" type="submit" value="<?=_('Submit');?>" class="button">&nbsp;&nbsp;
+        <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/?logout'">
+      </div>
+    </form>
+  <?php } ?>
 </div>
 
 </body>

web/templates/pages/login/reset_1.html

@@ -1,30 +1,26 @@
-<div class="login">
-  <div style="padding-top: 40px; padding-right: 30px;">
-    <a href="/" class="u-block">
-      <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
-    </a>
-  </div>
-  <div class="animated fadeIn">
-    <form method="post" action="/reset/">
-      <input type="hidden" name="token" value="<?=$_SESSION['token'];?>"/>
-      <h1 class="login-title">
-        <?=_('Forgot Password');?>
-      </h1>
-      <?php if (isset($ERROR)) echo $ERROR ?>
-      <div class="u-mb10">
-        <label for="user" class="form-label"><?=_('Username');?></label>
-        <input type="text" class="form-control" name="user" id="user" tabindex="1" style="width:260px;">
-      </div>
-      <div class="u-mb20">
-        <label for="email" class="form-label"><?=_('Email');?></label>
-        <input type="email" class="form-control" name="email" id="email" tabindex="1" style="width:260px;">
-      </div>
-      <div>
-        <input tabindex="2" type="submit" value="<?=_('Submit');?>" class="button">&nbsp;&nbsp;
-        <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/?logout'">
-      </div>
-    </form>
-  </div>
+<div class="login animated zoomIn">
+  <a href="/" class="u-block u-mr30">
+    <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
+  </a>
+  <form method="post" action="/reset/">
+    <input type="hidden" name="token" value="<?=$_SESSION['token'];?>"/>
+    <h1 class="login-title">
+      <?=_('Forgot Password');?>
+    </h1>
+    <?php if (isset($ERROR)) echo $ERROR ?>
+    <div class="u-mb10">
+      <label for="user" class="form-label"><?=_('Username');?></label>
+      <input type="text" class="form-control" name="user" id="user" tabindex="1" style="width:260px;">
+    </div>
+    <div class="u-mb20">
+      <label for="email" class="form-label"><?=_('Email');?></label>
+      <input type="email" class="form-control" name="email" id="email" tabindex="1" style="width:260px;">
+    </div>
+    <div>
+      <input tabindex="2" type="submit" value="<?=_('Submit');?>" class="button">&nbsp;&nbsp;
+      <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/?logout'">
+    </div>
+  </form>
 </div>
 
 </body>

web/templates/pages/login/reset_2.html

@@ -1,31 +1,27 @@
-<div class="login">
-  <div style="padding-top: 40px; padding-right: 30px;">
-    <a href="/" class="u-block">
-      <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
-    </a>
-  </div>
-  <div class="animated fadeIn">
-    <form method="get" action="/reset/">
-      <h1 class="login-title">
-        <?=_('Forgot Password');?>
-      </h1>
-      <?php if (isset($ERROR)) echo $ERROR ?>
-      <p style="padding: 12px 0 0 2px;">
-        <?=_('RESET_CODE_SENT');?>
-      </p>
-      <div class="u-mb20">
-        <input type="hidden" name="action" value="confirm">
-        <input type="hidden" name="token" value="<?=htmlentities($_SESSION['token']);?>"/>
-        <input type="hidden" name="user" value="<?=htmlentities($_GET['user'])?>">
-        <label for="code" class="form-label"><?=_('Reset Code');?></label>
-        <input type="text" class="form-control" name="code" id="code" tabindex="1" style="width:260px;">
-      </div>
-      <div>
-        <input tabindex="2" type="submit" value="<?=_('Confirm');?>" class="button">&nbsp;&nbsp;
-        <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/reset/'">
-      </div>
-    </form>
-  </div>
+<div class="login animated zoomIn">
+  <a href="/" class="u-block u-mr30">
+    <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
+  </a>
+  <form method="get" action="/reset/">
+    <h1 class="login-title">
+      <?=_('Forgot Password');?>
+    </h1>
+    <?php if (isset($ERROR)) echo $ERROR ?>
+    <p style="padding: 12px 0 0 2px;">
+      <?=_('RESET_CODE_SENT');?>
+    </p>
+    <div class="u-mb20">
+      <input type="hidden" name="action" value="confirm">
+      <input type="hidden" name="token" value="<?=htmlentities($_SESSION['token']);?>"/>
+      <input type="hidden" name="user" value="<?=htmlentities($_GET['user'])?>">
+      <label for="code" class="form-label"><?=_('Reset Code');?></label>
+      <input type="text" class="form-control" name="code" id="code" tabindex="1" style="width:260px;">
+    </div>
+    <div>
+      <input tabindex="2" type="submit" value="<?=_('Confirm');?>" class="button">&nbsp;&nbsp;
+      <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/reset/'">
+    </div>
+  </form>
 </div>
 
 </body>

web/templates/pages/login/reset_3.html

@@ -1,33 +1,29 @@
-<div class="login">
-  <div style="padding-top: 40px; padding-right: 30px;">
-    <a href="/" class="u-block">
-      <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
-    </a>
-  </div>
-  <div class="animated fadeIn">
-    <form method="post">
-      <h1 class="login-title">
-        <?=_('Forgot Password');?>
-      </h1>
-      <?php if (isset($ERROR)) echo $ERROR ?>
-      <div class="u-mb10">
-        <input type="hidden" name="action" value="confirm">
-        <input type="hidden" name="token" value="<?=htmlentities($_SESSION['token']);?>"/>
-        <input type="hidden" name="user" value="<?=htmlentities($_GET['user']);?>">
-        <input type="hidden" name="code" value="<?=htmlentities($_GET['code']);?>">
-        <label for="password" class="form-label"><?=_('New Password');?></label>
-        <input type="password" class="form-control" name="password" id="password" tabindex="1" style="width:260px;">
-      </div>
-      <div class="u-mb20">
-        <label for="password_confirm" class="form-label"><?=_('Confirm Password');?></label>
-        <input type="password" class="form-control" name="password_confirm" id="password_confirm" tabindex="2" style="width:260px;">
-      </div>
-      <div>
-        <input tabindex="3" type="submit" value="<?=_('Reset');?>" class="button">&nbsp;&nbsp;
-        <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/'">
-      </div>
-    </form>
-  </div>
+<div class="login animated zoomIn">
+  <a href="/" class="u-block u-mr30">
+    <img src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" width="100" height="120">
+  </a>
+  <form method="post">
+    <h1 class="login-title">
+      <?=_('Forgot Password');?>
+    </h1>
+    <?php if (isset($ERROR)) echo $ERROR ?>
+    <div class="u-mb10">
+      <input type="hidden" name="action" value="confirm">
+      <input type="hidden" name="token" value="<?=htmlentities($_SESSION['token']);?>"/>
+      <input type="hidden" name="user" value="<?=htmlentities($_GET['user']);?>">
+      <input type="hidden" name="code" value="<?=htmlentities($_GET['code']);?>">
+      <label for="password" class="form-label"><?=_('New Password');?></label>
+      <input type="password" class="form-control" name="password" id="password" tabindex="1" style="width:260px;">
+    </div>
+    <div class="u-mb20">
+      <label for="password_confirm" class="form-label"><?=_('Confirm Password');?></label>
+      <input type="password" class="form-control" name="password_confirm" id="password_confirm" tabindex="2" style="width:260px;">
+    </div>
+    <div>
+      <input tabindex="3" type="submit" value="<?=_('Reset');?>" class="button">&nbsp;&nbsp;
+      <input type="button" class="button cancel" value="<?=_('Back');?>" onclick="location.href='/login/'">
+    </div>
+  </form>
 </div>
 
 </body>

web/templates/pages/setup_webapp.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="ui-button cancel" dir="ltr" id="btn-back" href="/add/webapp/?domain=<?=htmlentities($v_domain);?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip float-right">
+    <div class="l-unit-toolbar__buttonstrip u-float-right">
       <?php
         if (!empty($_SESSION['error_msg'])) {
           echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";