Merge branch 'bugfix-ui'

install/deb/themes/dark.css

@@ -784,7 +784,7 @@ a {
   z-index: 900;
   height: 38px;
   text-shadow: 1px 1px rgba(0,0,0,0.5);
-  box-shadow: 0px 8px 20px rgba(0,0,0,0.35);
+  box-shadow: 0px 8px 15px rgba(0,0,0,0.25);
 }
 
 .l-header a {
@@ -2647,10 +2647,9 @@ a.vst-text:active b{
 
 .advanced-options {
   background: #454545 !important;
-  border: 1px solid #707070 !important;
-  text-shadow: 0px 1px rgba(0,0,0,0.35);
+  border: 1px solid #505050 !important;
+  text-shadow: 0px 1px rgba(0,0,0,0.4);
   box-shadow: 0px 2px 6px rgba(0,0,0,0.4) !important;
-  box-shadow: none !important;
   color: #fff !important;
   padding: 4px 0px 0px 18px;
   overflow: hidden;
@@ -3104,6 +3103,7 @@ a.button.cancel {
   vertical-align: top;
   width: 500px;
   border-radius: 6px;
+  cursor: default;
 }
 
 .login-welcome {
@@ -3294,8 +3294,8 @@ form#vstobjects.suspended {
   padding-right: 8px;
   margin-right: 10px;
   line-height: 0.75rem;
-  box-shadow: inset 0px 0px 1px rgba(0,0,0,0.25), 0px 1px 1px rgba(0,0,0,0.25);
-  background-color: rgba(15,15,15,0.45);
+  box-shadow: inset 0px 1px 1px rgba(0,0,0,0.85), 0px 1px 1px rgba(0,0,0,0.2);
+  background-color: rgba(15,15,15,0.5);
   font-weight: 500;
   border: 1px solid rgba(120,120,120,0.95);
   text-shadow: 0px 1px 1px rgba(0,0,0,0.5);
@@ -3529,6 +3529,8 @@ form#vstobjects.suspended {
   border-top-left-radius: 6px;
   border-top-right-radius: 6px;
   box-shadow: 0px 3px 40px rgba(0,0,0,0.6);
+  line-height: 1rem;
+  cursor: default;
 }
 
 .shortcuts .header {
@@ -3538,7 +3540,7 @@ form#vstobjects.suspended {
 
 .shortcuts .title {
   text-transform: uppercase;
-  color: #ffcc00;
+  color: #ff3478;
   padding: 7px 0 7px 14px;
   display: inline-block;
   float: left;
@@ -3555,13 +3557,15 @@ form#vstobjects.suspended {
   width: 46px;
 }
 .shortcuts .close:hover {
-  background-color: #000;
+
 }
 .shortcuts .close:active {
-  background-color: #3b9de8;
+
 }
+
 .shortcuts .close .fas {
-  font-size: 1.3rem;
+  font-size: 0.8rem;
+  line-height: 1.4rem;
 }
 .shortcuts ul {
   list-style-type: none;
@@ -3577,7 +3581,7 @@ form#vstobjects.suspended {
   padding-top: 30px;
 }
 .shortcuts ul li span {
-  color: #48F4EF;
+  color: #ff3478;
   display: inline-block;
   font-weight: 600;
   padding: 0 20px 0 0;

install/deb/themes/flat.css

@@ -14,6 +14,10 @@ b, strong {
 
 .table-header {
     box-shadow: none !important;
+    background: #fafafa !important;
+}
+.advanced-options {
+    background: #fafafa !important;
 }
 
 .l-header {

web/css/styles.min.css

@@ -3071,6 +3071,7 @@ a.button.cancel {
   vertical-align: top;
   width: 500px;
   border-radius: 6px;
+  cursor: default;
 }
 
 .login-welcome {
@@ -3188,7 +3189,7 @@ form#vstobjects {
 }
 
 form#vstobjects.suspended {
-  background-color: #EAEAEA;
+  background-color: #fff;
   padding-bottom: 30px;
 }
 
@@ -3500,7 +3501,10 @@ form#vstobjects.suspended {
   border-top-left-radius: 6px;
   border-top-right-radius: 6px;
   box-shadow: 0px 3px 40px rgba(0,0,0,0.6);
+  line-height: 1rem;
+  cursor: default;
 }
+
 .shortcuts .header {
   border-bottom: 1px solid #333;
   height: 43px;
@@ -3508,7 +3512,7 @@ form#vstobjects.suspended {
 
 .shortcuts .title {
   text-transform: uppercase;
-  color: #ffcc00;
+  color: #ff3478;
   padding: 7px 0 7px 14px;
   display: inline-block;
   float: left;
@@ -3525,13 +3529,14 @@ form#vstobjects.suspended {
   width: 46px;
 }
 .shortcuts .close:hover {
-  background-color: #000;
+  color: #db0000;
 }
 .shortcuts .close:active {
-  background-color: #3b9de8;
+  color: #a60000;
 }
 .shortcuts .close .fas {
-  font-size: 1.3rem;
+  font-size: 0.8rem;
+  line-height: 1.4rem;
 }
 .shortcuts ul {
   list-style-type: none;
@@ -3547,13 +3552,14 @@ form#vstobjects.suspended {
   padding-top: 30px;
 }
 .shortcuts ul li span {
-  color: #48F4EF;
+  color: #ff3478;
   display: inline-block;
   font-weight: 600;
   padding: 0 20px 0 0;
   text-align: right;
 /*  width: 140px;*/
 }
+
 .shortcuts ul li span.bigger {
   font-size: 18px;
 }

web/inc/i18n/en.php

@@ -132,7 +132,7 @@ $LANG['en'] = array(
     'Adding IP address'  => 'Add IP Address',
     'Editing IP Address'  => 'Edit IP Address',
     'Editing Backup Exclusions' => 'Edit Backup Exclusions',
-    'Generating CSR' => 'Generate New Self-Signed SSL Certificate',
+    'Generating CSR' => 'New Self-Signed SSL Certificate',
     'Listing'  => 'Listing',
     'Search Results'  => 'Search Results',
     'Adding Firewall Rule' => 'Add Firewall Rule',

web/templates/admin/generate_ssl.html

@@ -1,7 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix">
         <div class="l-sort-toolbar clearfix float-left">
-                <span class="title"><b><?=__('Generating CSR')?></b></span>
                   <?php
                     if (!empty($_SESSION['error_msg'])) {
                       echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
@@ -40,12 +39,12 @@
                         </table>
                     </td>
                     <td class="data-dotted">
-                        <table>
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
+                                <td class="step-top">
+                                    <span class="page-title"><?=__('Generating CSR')?></span>
+                                </td>
                             </tr>
-                        </table>
-                        <table class="data-col2">
                             <tr>
                                 <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>

web/templates/admin/list_packages.html

@@ -12,7 +12,7 @@
         <table>
           <tr>
             <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Package Name')?> <i class="fas fa-sort-amount-down"></i></b></span>
+                <?=__('sort by');?>: <span><b><?=__('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
             </td>
             <td>
               <form action="/bulk/package/" method="post" id="objects">

web/templates/admin/list_ssl.html

@@ -1,16 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-sort-toolbar clearfix float-left">
-                <span class="title"><b><?=__('Generating CSR')?></b></span>
-                  <?php
-                    if (!empty($_SESSION['error_msg'])) {
-                      echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                    } else {
-                      if (!empty($_SESSION['ok_msg'])) {
-                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                      }
-                    }
-                  ?>
+
         </div>
       </div>
     </div>
@@ -41,6 +32,25 @@
                     </td>
                     <td class="data-dotted">
                         <table class="data-col2">
+                            <tr>
+                                <td class="step-top">
+                                    <span class="page-title"><?=__('Generating CSR')?></span>
+                                </td>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                          echo "<span class=\"vst-error\"><i class=\"fas fa-exclamation-circle status-icon red\"></i> ".$_SESSION['error_msg']."</span>";
+                                        } else {
+                                          if (!empty($_SESSION['ok_msg'])) {
+                                            echo "<span class=\"vst-ok\"><i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                          }
+                                        }
+                                    ?>
+                                </td>
+
+                            </tr>
+                            </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 12px 0 0 0;"><?php print __('SSL Certificate');?>
                                 </td>

web/templates/admin/list_user.html

@@ -3,10 +3,10 @@
         <div class="l-unit-toolbar__buttonstrip">
         <?php
           if ($user == 'admin') {
-            echo '<a href="/add/user/" id="btn-create" class="ui-button cancel" title="'.__('Add User').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add User').'</a>&nbsp;';
-            echo '<a href="/list/package/" class="ui-button cancel" title="'.__('Packages').'"><i class="fas fa-box-open status-icon orange"></i>'.__('Packages').'</a>&nbsp;';
+            echo '<a href="/add/user/" id="btn-create" class="ui-button cancel" title="'.__('Add User').'"><i class="fas fa-plus-circle status-icon green"></i> '.__('Add User').'</a>&nbsp;';
+            echo '<a href="/list/package/" class="ui-button cancel" title="'.__('Packages').'"><i class="fas fa-box-open status-icon orange"></i> '.__('Packages').'</a>&nbsp;';
           } else {
-            echo '<a href="/add/web/" id="btn-create" class="ui-button cancel" title="'.__('Add Web Domain').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add Web Domain').'</a>';
+            echo '<a href="/add/web/" id="btn-create" class="ui-button cancel" title="'.__('Add Web Domain').'"><i class="fas fa-plus-circle status-icon green"></i> '.__('Add Web Domain').'</a>';
           }
         ?>
       </div>