Enable table view throughout user interface

This reduces the amount of wasted space throughout the interface and presents information in a cleaner fashion.

web/css/styles.min.css

@@ -750,7 +750,6 @@ body {
 .body-login, .body-reset {
   height: auto;
   padding-top: 10%;
-  /*background: url(/images/edit_bg.png);*/
   background-color: #eee;
 }
 
@@ -781,6 +780,10 @@ a {
   text-align: center;
 }
 
+.text-small {
+  font-size: 0.85em;
+}
+
 .check-label {
   display: inline-block;
   cursor: pointer;
@@ -854,7 +857,7 @@ input[type="checkbox"] {
 }
 
 .l-menu__item.l-menu__item--active a {
-  color: #ff6701;
+  color: #2b72b9;
   font-size: 12px;
   background-color: #fff;
   text-shadow: none;
@@ -883,9 +886,11 @@ input[type="checkbox"] {
   transition: 0.3s;
 }
 .l-menu__item a:active {
+  background-color: #336699;
+  background: linear-gradient(to bottom, rgba(19,135,223,1) 0%,rgba(19,122,207,1) 50%,rgba(14,108,196,1) 51%,rgba(21,82,167,1) 99%,rgba(21,82,167,1) 99%,rgba(13,33,111,1) 100%); 
   color: #fff;
-  text-shadow: 0px 1px rgba(0,0,0,0.35);
-  background-color: #ff6701;
+  text-shadow: 0px -1px rgba(0,0,0,0.35);
+  transition: 0.3s;
 }
 
 .l-menu.active .l-menu__item.focus a {
@@ -929,16 +934,16 @@ input[type="checkbox"] {
 }
 .l-profile__username {
   float: left;
-  color: #d2f0ff;
+  color: #8ed8fd;
   padding: 10px 0 0 10px;
   margin-right: 2px;
   font-weight: 600;
 }
 .l-profile__username:hover {
-  color: #ffd62e;
+  color: #d2f0ff;
 }
 .l-profile__username:active {
-  color: #f79b44;
+  color: #56a9d2;
 }
 
 .l-profile__logout {
@@ -948,10 +953,10 @@ input[type="checkbox"] {
   font-weight: 600;
 }
 .l-profile__logout:hover {
-  color: #ffd62e;
+  color: #f5ffc3 !important;
 }
 .l-profile__logout:active {
-  color: #f79b44;
+  color: #d0e859;
 }
 .lang-cn .l-profile__logout {
   padding: 8px 5px;
@@ -1430,7 +1435,13 @@ div.l-content > div.l-separator:nth-of-type(4) {
   /*color: #92af0b;*/
 }
 
-
+.subtitle {
+  color: #ff6701;
+  font-size: 13px;
+  font-weight: 600;
+  margin: 20px 0 18px 129px;
+  text-transform: uppercase;
+}
 
 .l-select {
   width: 178px;
@@ -1485,13 +1496,17 @@ div.l-content > div.l-separator:nth-of-type(4) {
 
 .l-unit {
   color: #707070;
-  padding: 0 0 0 15px;
+  padding: 0 0 0 24px;
   overflow: hidden;
   font-size: 13px;
 }
+
+.table-header {
+  font-size: 1.05em;
+}
+
 .units .l-unit {
   border-bottom: 1px solid #ddd;
-  border-left: 2px solid #fff;
 }
 .units .l-unit.l-unit--starred {
   border-left: 2px solid #ff6701;
@@ -1613,9 +1628,10 @@ div.l-content > div.l-separator:nth-of-type(4) {
   vertical-align: top;
 }
 .l-unit__col--left {
-  width: 124px;
+  width: 100px;
   padding-right: 10px;
 }
+
 .units.compact .l-unit__col--left {
   vertical-align: top;
 }
@@ -1640,9 +1656,10 @@ div.l-content > div.l-separator:nth-of-type(4) {
 }
 
 .l-unit__date {
-  font-size: 13px;
+  font-size: 11px;
   margin-top: 10px;
   padding-bottom: 30px;
+  text-transform: uppercase;
 }
 
 .l-unit__suspended {
@@ -1734,6 +1751,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 .l-unit__stats {
   margin-bottom: 50px;
 }
+
 .l-unit__stats table {
   width: 100%;
   table-layout: fixed;
@@ -1745,13 +1763,16 @@ div.l-content > div.l-separator:nth-of-type(4) {
 }
 .l-unit__stat-col--left {
   float: left;
-  width: 124px;
+  width: 110px;
 }
 .l-unit__stat-col--left.compact {
   width: 70px;
 }
 .l-unit__stat-col--left.compact-2 {
-  width: 95px;
+  width: 80px;
+}
+.l-unit__stat-col--left.compact-3 {
+  width: 90px;
 }
 .l-unit__stat-col--left.wide {
   width: 190px;
@@ -1766,6 +1787,9 @@ div.l-content > div.l-separator:nth-of-type(4) {
   width: 550px;
 }
 
+.l-unit__stat-col--left.wide-5 {
+  width: 330px;
+}
 
 .l-unit__stat-col--left.small-2 {
   line-height: 11px;
@@ -2283,6 +2307,9 @@ body.mobile .l-unit-toolbar__col--right {
   background-position: -78px -482px;
 }
 
+.icon-pad-right {
+  margin-right: 5px;
+}
 
 .l-icon-up-arrow, .l-icon-down-arrow, .l-icon-star, .l-icon-to-top, .l-icon-shortcuts, .l-icon-star-orange, .l-icon-star-blue {
   display: inline-block;
@@ -3099,13 +3126,24 @@ a.button.cancel {
 
 .login {
   background-color: #fff;
-  box-shadow: 0 2px 8px rgba(100, 100, 100, 0.3);
+  box-shadow: 0px 9px 35px rgba(70, 70, 70, 0.7);
   font-family: 'Exo 2', Arial, Helvetica,sans-serif;
   margin: 0;
   padding: 0;
   text-align: left;
   vertical-align: top;
   width: 500px;
+  border-radius: 5px;
+}
+
+.qr-code {
+  border: 1px solid #cfcfcf;
+  border-radius: 4px;
+  box-shadow: 0px 1px 4px rgba(0,0,0,0.15);
+}
+
+.password-option {
+  margin-top: 15px;
 }
 
 .login a.error {
@@ -3241,11 +3279,20 @@ form#vstobjects.suspended {
   background-color: #3BF0E6 !important;
 }
 
+.l-sort__create-btn:active #tooltip {
+  background-color: #54a6e5;
+}
 
+.status-icon-red {
+  color: #ff3333;
+}
 
+.status-icon-green {
+  color: #53ba55;
+}
 
-.l-sort__create-btn:active #tooltip {
-  background-color: #54a6e5;
+.status-icon-orange {
+  color: #faab00;
 }
 
 .noselect {
@@ -3318,29 +3365,36 @@ form#vstobjects.suspended {
 }
 
 .shortcuts {
-  background: rgba(50, 50, 50, 0.9);
+  background: rgba(20, 20, 20, 0.92);
   display: inline-block;
   position: fixed;
   left: 50%;
   bottom: 0;
   color: #eee;
   width: 800px;
-  border: 1px solid #333;
-  font-size: 13px;
+  border: 1px solid rgba(255,255,255,0.7);
+  border-bottom: 0px;
+  font-size: 12px;
   z-index: 120;
   transform: translate(-50%, 0);
+  border-top-left-radius: 6px;
+  border-top-right-radius: 6px;
+  box-shadow: 0px 3px 40px rgba(0,0,0,0.6);
 }
 .shortcuts .header {
   border-bottom: 1px solid #333;
   height: 43px;
 }
+
 .shortcuts .title {
   text-transform: uppercase;
   color: #ffcc00;
   padding: 7px 0 7px 14px;
   display: inline-block;
   float: left;
-  font-size: 12px;
+  font-size: 14px;
+  letter-spacing: -0.01em;
+
 }
 .shortcuts .close {
   background: url("/images/sprite.png?1446554103") repeat scroll -408px -469px;
@@ -3468,10 +3522,30 @@ form#vstobjects.suspended {
   font-size: 13px;
 }
 
+.ui-dialog {
+  font-family: 'Exo 2', Arial, Helvetica, sans-serif !important;
+  font-weight: 500 !important;
+  background-color: rgba(245,245,245,0.87) !important;
+  box-shadow: 0 8px 50px 0 rgba(0, 0, 0, 0.55) !important;
+  border-radius: 6px !important;
+  border: 1px solid rgba(255,255,255,0.9) !important;
+  text-align: center !important;
+}
+
 .ui-dialog .ui-dialog-content {
+  color: #121212 !important;
   padding: 10px 26px 30px !important;
 }
 
+.ui-dialog-buttonpane {
+  border-color: #aaaaaa !important;
+}
+
+.ui-widget-overlay {
+  opacity: 0.8 !important;
+  background: rgba(10,10,10,0.9) !important;
+}
+
 .helper-container {
   float: right;
   height: 293px;

web/templates/admin/edit_mail.html

@@ -58,27 +58,27 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ($v_antispam == 'yes') echo "checked=yes"; ?>> <?php print __('AntiSpam Support');?></label>
+                                    <?php print __('Catchall email');?>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text input-label">
-                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ($v_antivirus == 'yes') echo "checked=yes"; ?>> <?php print __('AntiVirus Support');?></label>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_catchall" value="<?=htmlentities(trim($v_catchall, "'"))?>" > <?php /*'*/ ?>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if ($v_dkim == 'yes') echo "checked=yes"; ?>> <?php print __('DKIM Support');?></label>
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ($v_antispam == 'yes') echo "checked=yes"; ?>> <?php print __('AntiSpam Support');?></label>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Catchall email');?>
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ($v_antivirus == 'yes') echo "checked=yes"; ?>> <?php print __('AntiVirus Support');?></label>
                                 </td>
                             </tr>
                             <tr>
-                                <td>
-                                    <input type="text" size="20" class="vst-input" name="v_catchall" value="<?=htmlentities(trim($v_catchall, "'"))?>" >
+                                <td class="vst-text input-label">
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if ($v_dkim == 'yes') echo "checked=yes"; ?>> <?php print __('DKIM Support');?></label>
                                 </td>
                             </tr>
                         </table>

web/templates/admin/edit_mail_acc.html

@@ -204,10 +204,10 @@
                             <td><div><?=__('Normal password')?></div></td>
                         </tr>
                         <?
-                          list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                          $webmail = "http://".$http_host."/webmail/";
-                          if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
-                          ?>
+                            list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
+                            $webmail = "http://".$http_host."/webmail/";
+                            if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+                        ?>
                         <tr>
                             <td><?=__('Webmail URL')?>:</td>
                             <td><div><a class="vst" href="<?=$webmail?>" target="_blank"><?=$webmail?> <i></i></a></div></td>

web/templates/admin/edit_user.html

@@ -67,17 +67,13 @@
                                     <input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities(trim($v_password, "'"))?>">
                                 </td>
                             </tr>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('2 Factor Authentication');?>
-                                </td>
-                            </tr>
                             <tr>
                                 <td>
-                                    <label><input type="checkbox" class="vst-checkbox" name="v_twofa" <?php if(!empty($v_twofa)) echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_twofa(this)"> <?php print __('Enable 2FA');?></label>
+                                    <label><input type="checkbox" class="vst-checkbox password-option" name="v_twofa" <?php if(!empty($v_twofa)) echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_twofa(this)"> <?php print __('Enable 2FA');?></label>
                                     <?php if (!empty($v_twofa)) { ?>
+                                    <p><?php echo __('2FA Reset Code:').' '.$v_twofa; ?></br></p>
                                     <p><?php echo __('Please scan the code below in your 2FA application:'); ?></p>
-                                    <img src="<?php echo $v_qrcode; ?>">
+                                    <div><img class="qr-code" src="<?php echo $v_qrcode; ?>"></div>
                                     <?php } ?>
                                 </td>
                             </tr>
@@ -265,4 +261,4 @@
                 </tr>
             </table>
         </form>
-    </div>
+    </div>

web/templates/admin/list_backup.html

@@ -41,6 +41,21 @@
 
 
     <div class="l-center units animated fadeIn">
+        <div class="l-unit header">
+            <div class="l-unit__col l-unit__col--left clearfix">
+              <div class="text-center jump-small-top"></div>
+            </div>
+      
+            <div class="l-unit__col l-unit__col--right step-top table-header">
+              <div style="margin-bottom: 40px;">
+                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('File Name');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('Date');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Size');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Type');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Runtime');?></b></div>
+              </div>
+             </div>
+          </div>
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -62,10 +77,6 @@
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--outdated';?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="backup[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
@@ -92,58 +103,29 @@
         </div>
         <!-- /.l-unit-toolbar -->
 
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?=__('outdated')?></div>
-        </div>
-        <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate">
-            <?=$key?>
-          </div>
-
-          <div class="l-unit__stats">
-            <table>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backup Size')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=humanize_usage_size($data[$key]['SIZE'])?></b> <?=humanize_usage_measure($data[$key]['SIZE'])?>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Type')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['TYPE']?></b>
+            <div class="l-unit__col l-unit__col--right">
+              <div style="margin-bottom: 50px;">
+                  <div class="clearfix l-unit__stat-col--left">
+                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="backup[]" value="<?php echo $key ?>">
+                      <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Run Time')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=humanize_time($data[$key]['RUNTIME'])?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-            </table>
-          </div>
-          <!-- /.l-unit__stats -->
-        </div>
-        <!-- /.l-unit__col -->
-      </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div -->
-      <!-- /.l-separator -->
-      <? } ?>
+                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center wide"><b><?=translate_date($data[$key]['DATE'])?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_usage_size($data[$key]['SIZE'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['SIZE'])?></span></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['TYPE']?></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><?=humanize_time($data[$key]['RUNTIME'])?></div>
+               </div>
+             </div>
+           <!-- /.l-unit__col -->
+         </div>
+         <!-- /.l-unit -->
+         <!--div class="l-separator"></div-->
+         <!-- /.l-separator -->
+         <?}?>
+       </div>
+
+
 
-    </div>
 
 
 

web/templates/admin/list_db.html

@@ -78,10 +78,24 @@
 
     <div class="l-separator"></div>
     <!-- /.l-separator -->
-
-
-
     <div class="l-center units animated fadeIn">
+        <div class="l-unit header">
+            <div class="l-unit__col l-unit__col--left clearfix">
+              <div class="text-center jump-small-top"></div>
+            </div>
+      
+            <div class="l-unit__col l-unit__col--right step-top table-header">
+              <div style="margin-bottom: 40px;">
+                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Database');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Type');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('Username');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Hostname');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Disk');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Charset');?></b></div>
+              </div>
+             </div>
+          </div>
+          
       <?
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         foreach ($data as $key => $value) {
@@ -109,10 +123,6 @@
 sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
 sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" sort-star="<? if($_SESSION['favourites']['DB'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
@@ -143,89 +153,29 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
           <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
-
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?=__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
-        </div>
-        <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate">
-            <?=$key?>
-          </div>
-          <!-- /.l-unit__name -->
-          <div class="l-unit__stats">
-            <table>
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix graph">
-                    <div class="l-unit__stat-col l-unit__stat-col--left">
-                      <?=__('Disk')?>
-                    </div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
-                      <b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
+            <div class="l-unit__col l-unit__col--right">
+              <div style="margin-bottom: 50px;">
+                  <div class="clearfix l-unit__stat-col--left">
+                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
+                      <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                  </div>
-                  <div class="l-percent">
-                    <div class="l-percent__fill" style="width: <?=get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA'])?>%"></div>
-                  </div>
-                  <!-- /.percent -->
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('User')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['DBUSER']?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                    <div class="l-unit__stat-cols clearfix last">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Host')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=$data[$key]['HOST']?></b>
-                      </div>
-                    </div>
-                </td>
-              </tr>
-              <tr>
-                <td></td>
-                <td>
-                    <div class="l-unit__stat-cols clearfix">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Charset')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=$data[$key]['CHARSET']?></b>
-                      </div>
-                    </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Type')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['TYPE']?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-            </table>
-          </div>
-          <!-- /.l-unit__stats -->
-        </div>
+                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['TYPE']?></div>
+                  <div class="clearfix l-unit__stat-col--left text-center wide"><b><?=$data[$key]['DBUSER']?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['HOST']?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['CHARSET']?></div>
+               </div>
+            </div>
+
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <!-- div class="l-separator"></div-->
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
-
     </div>
 
-
     <div id="vstobjects">
       <div class="l-separator"></div>
       <div class="l-center">

web/templates/admin/list_dns.html

@@ -51,6 +51,23 @@
 
 
     <div class="l-center units animated fadeIn">
+        <div class="l-unit header">
+            <div class="l-unit__col l-unit__col--left clearfix">
+              <div class="text-center jump-small-top"></div>
+            </div>
+      
+            <div class="l-unit__col l-unit__col--right step-top table-header">
+              <div style="margin-bottom: 40px;">
+                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Domain');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Records');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Template');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('TTL');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('SOA');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Expiration Date');?></b></div>
+              </div>
+             </div>
+          </div>
+
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -69,10 +86,6 @@
 v_section="dns" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
 sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$key]['RECORDS']?>" sort-star="<?if($_SESSION['favourites']['DNS'][$key] == 1) echo '1'; else echo '0';?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
@@ -105,104 +118,28 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
           <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
-
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?=__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
-
-        </div>
-        <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate">
-            <?=$key?> <? if(!empty($data[$key]['SRC'])) echo "<span>⇢ ".$data[$key]['SRC']."</span>&nbsp; &nbsp; ";  if($data[$key]['RECORDS']) echo '<span>/ '.$data[$key]['RECORDS'].'</span>';?>
-          </div>
-          <!--div class="l-unit__ip">
-            <?=str_replace('.', '<span>.</span>', $data[$key]['IP'])?> <b class="step-left"><?=$data[$key]['SOA']?></b>
-          </div -->
-          <!-- /.l-unit__ip -->
-
-          <div class="l-unit__stats">
-            <table>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols display-ip clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=str_replace('.', '<span>.</span>', $data[$key]['IP'])?></div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('TTL')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['TTL']?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Template')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['TPL']?></b>
+            <div class="l-unit__col l-unit__col--right">
+              <div style="margin-bottom: 50px;">
+                  <div class="clearfix l-unit__stat-col--left">
+                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
+                      <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                  </div>
-                </td>
-               </tr>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><b><?=$data[$key]['SOA']?></b></div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Serial')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['SERIAL']?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Expire')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['EXP']?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-
-              <!-- tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left "><?=$data[$key]['SOA']?></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=translate_date($data[$key]['EXP'])?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-              </tr-->
-            </table>
+                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><? if(!empty($data[$key]['SRC'])) echo "<span>⇢ ".$data[$key]['SRC']."</span>&nbsp; &nbsp; ";  if($data[$key]['RECORDS']) echo '<span>'.$data[$key]['RECORDS'].'</span>';?></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['TPL']?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['TTL']?></div>
+                  <div class="clearfix l-unit__stat-col--left text-center wide"><?=$data[$key]['SOA']?></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['EXP']?></b></div>
+               </div>
+             </div>
           </div>
-          <!-- /.l-unit__stats -->
-        </div>
         <!-- /.l-unit__col -->
-      </div>
       <!-- /.l-unit -->
-      <!-- div class="l-separator"></div-->
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
-      <? } ?>
-
+      <?}?>
     </div>
 
-
-
     <div id="vstobjects">
       <div class="l-separator"></div>
       <div class="l-center">

web/templates/admin/list_dns_rec.html

@@ -54,7 +54,7 @@
         <div class="text-center jump-small-top"></div>
       </div>
 
-      <div class="l-unit__col l-unit__col--right step-top">
+      <div class="l-unit__col l-unit__col--right step-top table-header">
         <div style="margin-bottom: 40px;">
           <div class="clearfix l-unit__stat-col--left small"><b><?php print __('Record');?></b></div>
           <div class="clearfix l-unit__stat-col--left compact"><b><?php print __('Type');?></b></div>

web/templates/admin/list_firewall.html

@@ -58,13 +58,13 @@
               <div class="text-center jump-small-top"></div>
             </div>
       
-            <div class="l-unit__col l-unit__col--right step-top">
+            <div class="l-unit__col l-unit__col--right step-top table-header">
               <div style="margin-bottom: 40px;">
-                  <div class="clearfix l-unit__stat-col--left"><b><?php print __('Action');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact"><b><?php print __('Protocol');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Port');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left"><b><?php print __('IP address');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Comment');?></b></div>   
+                  <div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Action');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-1 text-center"><b><?php print __('Comment');?></b></div>   
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Protocol');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-2 text-center"><b><?php print __('Port');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('IP address');?></b></div>
               </div>
             </div>
           </div>
@@ -87,10 +87,6 @@
 sort-action="<?=$data[$key]['ACTION']?>" sort-protocol="<?=$data[$key]['PROTOCOL']?>" sort-port="<?=$data[$key]['PORT']?>"
 sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$key]['COMMENT']?>" sort-star="<? if($_SESSION['favourites']['FIREWALL'][$key] == 1) echo '1'; else echo '2'; ?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="rule[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
@@ -123,20 +119,38 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
         </div>
         <!-- /.l-unit-toolbar -->
 
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__suspended"><?=__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
-        </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
-            <div class="clearfix l-unit__stat-col--left"><b><?=__($data[$key]['ACTION'])?></b></div>
-            <div class="clearfix l-unit__stat-col--left compact"><b><?=__($data[$key]['PROTOCOL'])?></b></div>
-            <div class="clearfix l-unit__stat-col--left wide"><b><?=$data[$key]['PORT']?></b></div>
-            <div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['IP']?></b></div>
-            <div class="clearfix l-unit__stat-col--left wide-2"><? if(!empty($data[$key]['COMMENT'])) echo '' . $data[$key]['COMMENT']; else echo "&nbsp;"; ?></div>
+              <div class="clearfix l-unit__stat-col--left">
+                  <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="rule[]" value="<?php echo $key ?>">
+                  <label for="check<?php echo $i ?>" class="check-label"></label>
+                </div>
+            <div class="clearfix l-unit__stat-col--left wide"><b>
+
+                <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
+
+                  <? if ($data[$key]['ACTION'] == 'DROP') { ?>
+                    <i class="fas fa-minus-circle status-icon-red icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
+                  <? } else {?>
+                    <i class="fas fa-check-circle status-icon-green icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
+                  <? } ?>
+                  
+                <? } else {?>
+
+                  <? if ($data[$key]['ACTION'] == 'DROP') { ?>
+                    <i class="fas fa-minus-circle icon-pad-right" style=""></i> <?=__($data[$key]['ACTION'])?>
+                  <? } else {?>
+                    <i class="fas fa-check-circle icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
+                  <? } ?>
+
+                <? } ?>
+
+            </b></div>
+            <div class="clearfix l-unit__stat-col--left wide-1 text-center"><b><? if(!empty($data[$key]['COMMENT'])) echo '' . $data[$key]['COMMENT']; else echo "&nbsp;"; ?></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center"><b><?=__($data[$key]['PROTOCOL'])?></b></div>
+            <div class="clearfix l-unit__stat-col--left wide-2 text-center"><b><?=$data[$key]['PORT']?></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['IP']?></div>
           </div>
           <!-- /.l-unit__stats -->
         </div>

web/templates/admin/list_firewall_banlist.html

@@ -39,6 +39,21 @@
 
 
     <div class="l-center units animated fadeIn">
+        <div class="l-unit header">
+            <div class="l-unit__col l-unit__col--left clearfix">
+              <div class="text-center jump-small-top"></div>
+            </div>
+      
+            <div class="l-unit__col l-unit__col--right step-top table-header">
+              <div style="margin-bottom: 40px;">
+                  <div class="clearfix l-unit__stat-col--left"><b><?php print __('Date');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left"><b><?php print __('Time');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide text-center"><b><?php print __('Comment');?></b></div>   
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('IP address');?></b></div>
+              </div>
+            </div>
+          </div>
+
       <?php
         foreach ($data as $key => $value) {
           ++$i;
@@ -77,10 +92,10 @@
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
-            <div class="clearfix l-unit__stat-col--left wide"><b><?=$data[$key]['DATE']?></b> &nbsp; <?=$data[$key]['TIME']?> </div>
-            <div class="clearfix l-unit__stat-col--left"></div>
-            <div class="clearfix l-unit__stat-col--left wide-3"><b><?=__($value['CHAIN'])?></b></div>
-            <div class="clearfix l-unit__stat-col--left"><b><?=$ip?></b></div>
+              <div class="clearfix l-unit__stat-col--left"><b><?=__($data[$key]['DATE'])?></b></div>
+              <div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['TIME']?></b></div>
+              <div class="clearfix l-unit__stat-col--left wide text-center"><b><?=__($value['CHAIN'])?></b></div>
+              <div class="clearfix l-unit__stat-col--left text-center"><?=$ip?></div>
           </div>
           <!-- /.l-unit__stats -->
         </div>

web/templates/admin/list_ip.html

@@ -51,6 +51,25 @@
 
 
     <div class="l-center units animated fadeIn">
+        <div class="l-unit header">
+            <div class="l-unit__col l-unit__col--left clearfix">
+              <div class="text-center jump-small-top"></div>
+            </div>
+      
+            <div class="l-unit__col l-unit__col--right step-top table-header">
+              <div style="margin-bottom: 40px;">
+                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('IP Address');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Netmask');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Interface');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Status');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Domains');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Owner');?></b></div>
+              </div>
+            </div>
+          </div>
+
+
+
       <?php
         foreach ($data as $key => $value) {
            ++$i;
@@ -61,10 +80,7 @@ v_section="ip" sort-ip="<?=str_replace('.', '', $key)?>" sort-date="<?=strtotime
 sort-netmask="<?=str_replace('.', '', $data[$key]['NETMASK'])?>" sort-interface="<?=$data[$key]['INTERFACE']?>" sort-domains="<?=$data[$key]['U_WEB_DOMAINS']?>"
 sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites']['IP'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ip[]" value="<?=$key?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
+
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
@@ -86,86 +102,31 @@ sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites'][
         </div>
         <!-- /.l-unit-toolbar -->
 
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?=__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
-        </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate">
-            <?=$key?>
+           <!-- <?=$key?>
                 <?php if (!empty($data[$key]['NAT'])) echo ' → <b>' . $data[$key]['NAT'] . '</b>'; ?>
                 <span><?=str_replace(',', ', ', $data[$key]['NAME'])?></span>
           </div>
 
+        -->
 
-
-          <div class="l-unit__stats">
-            <table>
-
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><b><?=$data[$key]['NETMASK']?></b></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact-2"><?=__('Domains')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['U_WEB_DOMAINS']?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact-2"><?=__('Owner')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['OWNER']?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><b><?=$data[$key]['INTERFACE']?></b></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact-2"><?=__('Status')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['STATUS'])?></b>
+          <div class="l-unit__col l-unit__col--right">
+              <div style="margin-bottom: 50px;">
+                  <div class="clearfix l-unit__stat-col--left">
+                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ip[]" value="<?=$key?>">
+                      <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact-2"><?=__('Users')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=str_replace(',', ', ', $data[$key]['U_SYS_USERS'])?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-
-
+                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['NETMASK']?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['INTERFACE']?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=__($data[$key]['STATUS'])?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['U_WEB_DOMAINS']?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['OWNER']?></b></div>
+              </div>
+            </div>
 
 
-            </table>
           </div>
           <!-- /.l-unit__stats -->
         </div>

web/templates/admin/list_log.html

@@ -1,17 +1,22 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-sort-toolbar clearfix">
-          <table>
-            <tr>
-              <td class="l-sort-toolbar__search-box">
-                <form action="/search/" method="get">
-                  <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
-                  <input type="text" name="q" class="search-input" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" />
-                  <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
-                </form>
-              </td>
-            </tr>
-          </table>
+
+
+            <div class="l-unit table-header" style="padding-top: 6px;">
+                <div class="l-unit__col l-unit__col--left clearfix">
+                  <div class="text-center jump-small-top"></div>
+                </div>
+          
+                <div class="l-unit__col l-unit__col--right">
+                    <div class="clearfix l-unit__stat-col--left small"><b><?=__('Date')?></b></div>
+                    <div class="clearfix l-unit__stat-col--left compact"><b><?=__('Time')?></b></div>
+                    <div class="clearfix l-unit__stat-col--left wide-4"><b><?=__('Value')?></b></div>
+                </div>
+             </div>
+
+
+
         </div>
       </div>
       <!-- /.l-sort -->
@@ -22,44 +27,25 @@
 
 
     <div class="l-center units animated fadeIn">
+
       <?php
         foreach ($data as $key => $value) {
            ++$i;
       ?>
 
-
-      <div class="l-unit">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
+      <div class="l-unit header">
+          <div class="l-unit__col l-unit__col--left clearfix">
+            <div class="text-center jump-small-top"></div>
           </div>
-          <!-- l-unit-toolbar__col -->
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
-            <div class="actions-panel clearfix">
+    
+          <div class="l-unit__col l-unit__col--right step-top">
+            <div style="margin-bottom: 40px;">
+              <div class="clearfix l-unit__stat-col--left small"><b><?=translate_date($data[$key]['DATE'])?></b></div>
+              <div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
+              <div class="clearfix l-unit__stat-col--left wide-4"><?=$data[$key]['CMD']?></div>
             </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
-        </div>
-        <!-- /.l-unit-toolbar -->
-
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__date">
-            <?=$data[$key]['TIME']?>
-          </div>
-        </div>
-        <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name small">
-            <?=$data[$key]['CMD']?>
           </div>
 
-          <!-- div class="l-unit__stats">
-          </div -->
-          <!-- /.l-unit__stats -->
-        </div>
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
@@ -67,7 +53,7 @@
       <!-- /.l-separator -->
       <?}?>
 
-    </div>
+    </div>-->
 
     <div id="vstobjects">
         <div class="l-separator"></div>

web/templates/admin/list_mail.html

@@ -60,6 +60,23 @@
 
 
     <div class="l-center units animated fadeIn">
+            <div class="l-unit header">
+                <div class="l-unit__col l-unit__col--left clearfix">
+                  <div class="text-center jump-small-top"></div>
+                </div>
+          
+                <div class="l-unit__col l-unit__col--right step-top table-header">
+                  <div style="margin-bottom: 40px;">
+                      <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Domain');?></b></div>
+                      <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Accounts');?></b></div>
+                      <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Disk');?></b></div>
+                      <div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?php print __('Antivirus');?></b></div>
+                      <div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?php print __('AntiSpam');?></b></div>
+                      <div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?php print __('DKIM');?></b></div>
+                  </div>
+                </div>
+              </div>
+
       <?
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         $webmail = "http://".$http_host."/webmail/";
@@ -86,10 +103,7 @@
 sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
 sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favourites']['MAIL'][$key] == 1) echo "1"; else echo "0"; ?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
+
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
@@ -124,91 +138,49 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
           <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
-
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?=__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
-        </div>
-        <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate">
-            <?=$key?> <? if($data[$key]['ACCOUNTS']) echo '<span>/ '.$data[$key]['ACCOUNTS'].'</span>';?>
-          </div>
-          <!-- /.l-unit__name -->
-          <div class="l-unit__stats">
-            <table>
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix graph">
-                    <div class="l-unit__stat-col l-unit__stat-col--left">
-                      <?=__('Disk')?>
-                    </div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
-                      <b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
+            <div class="l-unit__col l-unit__col--right">
+              <div style="margin-bottom: 50px;">
+                  <div class="clearfix l-unit__stat-col--left">
+                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
+                      <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
+                  <div class="clearfix l-unit__stat-col--left wide-3"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b>
+                    <? if($data[$key]['ACCOUNTS']) { echo '<span>'.$data[$key]['ACCOUNTS'].'</span>'; ?>
+                    <? } else {?>
+                      <span>0</span>
+                    <? } ?>
+                    </b>
                   </div>
-                  <div class="l-percent">
-                    <div class="l-percent__fill" style="width: <?=get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA'])?>%"></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b>
+                    <?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span>
                   </div>
-                  <!-- /.percent -->
-                </td>
-                <td>
-                  <? if($data[$key]['ANTIVIRUS'] == 'no'){ ?>
-                    <div class="l-unit__stat-cols clearfix disabled"><?=__('AntiVirus Support')?></div>
-                  <? } else {?>
-                    <div class="l-unit__stat-cols clearfix">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('AntiVirus Support')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=__($data[$key]['ANTIVIRUS'])?></b>
-                      </div>
-                    </div>
-                  <? } ?>
-                </td>
-                <td>
-                  <? if($data[$key]['ANTISPAM'] == 'no'){ ?>
-                    <div class="l-unit__stat-cols clearfix disabled"><?=__('AntiSpam Support')?></div>
-                  <? } else {?>
-                    <div class="l-unit__stat-cols clearfix">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('AntiSpam Support')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=__($data[$key]['ANTISPAM'])?></b>
-                      </div>
-                    </div>
-                  <? } ?>
-                </td>
-              </tr>
-              <tr>
-                <td></td>
-                <td>
-                  <? if($data[$key]['DKIM'] == 'no'){ ?>
-                    <div class="l-unit__stat-cols clearfix disabled"><?=__('DKIM Support')?></div>
-                  <? } else {?>
-                    <div class="l-unit__stat-cols clearfix">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('DKIM Support')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=__($data[$key]['DKIM'])?></b>
-                      </div>
-                    </div>
-                  <? } ?>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Catchall email')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['CATCHALL']?></b>
-                    </div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact-3"><b>
+                      <? if($data[$key]['ANTIVIRUS'] == 'no'){ ?>
+                        <i class="fas fa-times-circle" style="color: red;"></i>
+                      <? } else {?>
+                        <i class="fas fa-check-circle status-icon-green"></i>
+                      <? } ?>
+                    </b>
                   </div>
-                </td>
-              </tr>
-            </table>
-          </div>
-          <!-- /.l-unit__stats -->
-        </div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact-3"><b>
+                      <? if($data[$key]['ANTISPAM'] == 'no'){ ?>
+                        <i class="fas fa-times-circle" style="color: red;"></i>
+                      <? } else {?>
+                        <i class="fas fa-check-circle status-icon-green"></i>
+                      <? } ?>
+                    </b>
+                  </div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact-3"><b>
+                      <? if($data[$key]['DKIM'] == 'no'){ ?>
+                        <i class="fas fa-times-circle" style="color: red;"></i>
+                      <? } else {?>
+                        <i class="fas fa-check-circle status-icon-green"></i>
+                      <? } ?>
+                    </b>
+                  </div>
+              </div>
+            </div>
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->

web/templates/admin/list_mail_acc.html

@@ -13,7 +13,7 @@
               <td class="step-right">
                 <?
                   list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                  $webmail = "http://".$http_host."/webmail/";
+                  $webmail = "http://mail.".$http_host."/";
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
                 <a class="vst" href="<?=$webmail?>" target="_blank"><?=__('open webmail')?> <i></i></a>
@@ -55,13 +55,24 @@
 
     <div class="l-separator"></div>
     <!-- /.l-separator -->
-
-
-
     <div class="l-center units animated fadeIn">
-      <div class="l-unit header">
-        <div class="subtitle"><?=__('Listing')?>  <?=htmlentities($_GET['domain'])?></div>
-      </div>
+        <div class="l-unit header">
+            <div class="l-unit__col l-unit__col--left clearfix">
+              <div class="text-center jump-small-top"></div>
+            </div>
+      
+            <div class="l-unit__col l-unit__col--right step-top table-header">
+              <div style="margin-bottom: 40px;">
+                  <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Username');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Disk');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Quota');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Aliases');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Forwarding');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Autoreply');?></b></div>
+              </div>
+            </div>
+          </div>
+
 
       <?
         foreach ($data as $key => $value) {
@@ -82,11 +93,6 @@
  v_unit_id="<?=$key."@".$_GET['domain']?>" v_section="mail_acc" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?$data[$key]['U_DISK']?>"
 sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="account[]" value="<?php echo $key ?>">
-            <input type="hidden" value="<?php echo $_GET['domain'] ?>" name="domain" />
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
@@ -117,85 +123,74 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
           <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
-
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?=__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
-        </div>
-        <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate">
-            <?=$key."@".$_GET['domain']?> <span><?=str_replace(',', ', ', $data[$key]['ALIAS'])?></span>
-          </div>
-          <!-- /.l-unit__name -->
-          <div class="l-unit__stats">
-            <table>
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix graph">
-                    <div class="l-unit__stat-col l-unit__stat-col--left">
-                      <?=__('Disk')?>
+            <div class="l-unit__col l-unit__col--right">
+              <div style="margin-bottom: 50px;">
+                  <div class="clearfix l-unit__stat-col--left">
+                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="account[]" value="<?php echo $key ?>">
+                      <input type="hidden" value="<?php echo $_GET['domain'] ?>" name="domain" />
+                      <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
-                      <b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
-                    </div>
-                  </div>
-                  <div class="l-percent">
-                    <div class="l-percent__fill" style="width: <?=get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA'])?>%"></div>
+                  <div class="clearfix l-unit__stat-col--left wide-3"><b><?=$key."@".$_GET['domain']?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=__(humanize_usage_size($data[$key]['QUOTA'])) ?></b> <span class="text-small"><?=__(humanize_usage_measure($data[$key]['QUOTA'])) ?></span></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b>
+                      <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
+                          <? if($data[$key]['ALIAS'] == ''){ ?>
+                            0
+                          <? } else {?>
+                            <i class="fas fa-check-circle status-icon-green"></i>
+                          <? } ?>
+                      <? } else {?>
+                        <? if($data[$key]['ALIAS'] == ''){ ?>
+                          0
+                        <? } else {?>
+                          <i class="fas fa-check-circle"></i>
+                        <? } ?>
+                      <? } ?>
+                    </b>
                   </div>
-                  <!-- /.percent -->
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Quota')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__(humanize_usage_size($data[$key]['QUOTA'])) ?></b> <?=__(humanize_usage_measure($data[$key]['QUOTA'])) ?>
-                    </div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b>
+                      <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
+                          <? if($data[$key]['FWD'] == ''){ ?>
+                            <i class="fas fa-minus-circle"></i>
+                          <? } else {?>
+                            <i class="fas fa-check-circle status-icon-green"></i>
+                          <? } ?>
+                      <? } else {?>
+                          <? if($data[$key]['FWD'] == ''){ ?>
+                            <i class="fas fa-minus-circle"></i>
+                          <? } else {?>
+                            <i class="fas fa-check-circle"></i>
+                          <? } ?>
+                       <? } ?>
+                    </b>
                   </div>
-                </td>
-                <td>
-                  <? if($data[$key]['AUTOREPLY'] == 'no'){ ?>
-                    <div class="l-unit__stat-cols clearfix disabled"><?=__('Autoreply')?></div>
-                  <? } else {?>
-                    <div class="l-unit__stat-cols clearfix">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Autoreply')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=__($data[$key]['AUTOREPLY'])?></b>
-                      </div>
-                    </div>
-                  <? } ?>
-                </td>
-              </tr>
-              <tr>
-                <td></td>
-                <td colspan="2">
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Forward to')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right wide">
-                      <b><?=str_replace(',', ', ', $data[$key]['FWD'])?></b>
-                    </div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b>
+                      <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
+                          <? if($data[$key]['AUTOREPLY'] == 'no'){ ?>
+                            <i class="fas fa-minus-circle"></i>
+                          <? } else {?>
+                            <i class="fas fa-check-circle status-icon-green"></i>
+                          <? } ?>
+                      <? } else {?>
+                          <? if($data[$key]['AUTOREPLY'] == 'no'){ ?>
+                            <i class="fas fa-minus-circle"></i>
+                          <? } else {?>
+                            <i class="fas fa-check-circle"></i>
+                          <? } ?>
+                          <? } ?>
+                    </b>
                   </div>
-                </td>
-              </tr>
-            </table>
-          </div>
-          <!-- /.l-unit__stats -->
-        </div>
+               </div>
+             </div>
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
       <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
-
     </div>
 
-
     <div id="vstobjects">
       <div class="l-separator"></div>
       <div class="l-center">

web/templates/admin/list_rrd.html

@@ -77,13 +77,6 @@
         <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__date">
-            <?=$data[$key]['TIME']?>
-          </div>
-
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">

web/templates/admin/list_ssl.html

@@ -42,32 +42,32 @@
                     <td class="data-dotted">
                         <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 24px 0 0 0;">
-                                    <?php print __('SSL CSR');?>
+                                <td class="vst-text" style="padding: 12px 0 0 0;"><?php print __('SSL Certificate');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <textarea size="20" class="vst-textinput" name="v_csr"><?php print $v_csr ?> </textarea>
+                                    <textarea size="20" class="vst-textinput" name="v_crt"><?php print $v_crt ?> </textarea>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;"><?php print __('SSL Certificate');?>
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                    <?php print __('SSL Key');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <textarea size="20" class="vst-textinput" name="v_crt"><?php print $v_crt ?> </textarea>
+                                    <textarea size="20" class="vst-textinput" name="v_key"><?php print $v_key ?> </textarea>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 12px 0 0 0;">
-                                    <?php print __('SSL Key');?>
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
+                                    <?php print __('SSL CSR');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <textarea size="20" class="vst-textinput" name="v_key"><?php print $v_key ?> </textarea>
+                                    <textarea size="20" class="vst-textinput" name="v_csr"><?php print $v_csr ?> </textarea>
                                 </td>
                             </tr>
                         </table>

web/templates/admin/list_updates.html

@@ -44,6 +44,21 @@
 
 
     <div class="l-center units animated fadeIn">
+        <div class="l-unit header">
+            <div class="l-unit__col l-unit__col--left clearfix">
+              <div class="text-center jump-small-top"></div>
+            </div>
+      
+            <div class="l-unit__col l-unit__col--right step-top table-header">
+              <div style="margin-bottom: 40px;">
+                  <div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Package');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Description');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Version');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Release');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Status');?></b></div>
+              </div>
+            </div>
+          </div>
       <?php
         foreach ($data as $key => $value) {
           ++$i;
@@ -57,16 +72,8 @@
           }
 
       ?>
-
-
-
-
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--outdated';?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="pkg[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
@@ -80,50 +87,32 @@
           <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
-
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=__($upd_status)?>
-          </div>
-        </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate">
-            <?=$key?>
-          </div>
-
-
-
-          <div class="l-unit__stats">
-            <table>
-
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><b><?=__($data[$key]['DESCR'])?></b></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Version')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['VERSION'] ?></b> (<?=$data[$key]['ARCH']?>)
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Release')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['RELEASE']?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-            </table>
+            <div style="margin-bottom: 50px;">
+                <div class="clearfix l-unit__stat-col--left">
+                  <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="pkg[]" value="<?php echo $key ?>">
+                  <label for="check<?php echo $i ?>" class="check-label"></label>
+                </div>
+              <div class="clearfix l-unit__stat-col--left wide"><b><?=$key?></b></div>
+              <div class="clearfix l-unit__stat-col--left wide-5"><b><?=__($data[$key]['DESCR'])?></b></div>
+              <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['VERSION'] ?> (<?=$data[$key]['ARCH']?>)</div>
+              <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['RELEASE']?></div>
+              <div class="clearfix l-unit__stat-col--left text-center"><b>
+                
+                  <? if ($data[$key]['UPDATED'] == 'no') {
+                    echo '
+                    <i class="fas fa-exclamation-triangle" style="color: orange;"></i>
+                    ';
+                  }
+                  ?>
+                  <? if ($data[$key]['UPDATED'] == 'yes') {
+                    echo '
+                    <i class="fas fa-check-circle status-icon-green"></i></i>
+                    ';
+                  }
+                  ?>
+              </b></div>
           </div>
           <!-- /.l-unit__stats -->
         </div>

web/templates/admin/list_web.html

@@ -49,13 +49,24 @@
 
     <div class="l-separator"></div>
     <!-- /.l-separator -->
-
-
-
-
-
-
     <div class="l-center units narrow animated fadeIn">
+        <div class="l-unit header">
+            <div class="l-unit__col l-unit__col--left clearfix">
+              <div class="text-center jump-small-top"></div>
+            </div>
+      
+            <div class="l-unit__col l-unit__col--right step-top table-header">
+              <div style="margin-bottom: 40px;">
+                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Domain');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('IP address');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Disk');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Bandwidth');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('SSL');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Statistics');?></b></div>
+              </div>
+             </div>
+          </div>
+
                 <?php
                     foreach ($data as $key => $value) {
                         ++$i;
@@ -122,10 +133,7 @@ id="web-unit-<?=$i?>"  sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>"
 sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
 sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<? if($_SESSION['WEB'][$key] == 1) echo '1'; else echo '0';?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?=$key?>">
-            <label for="check<?=$i?>" class="check-label"></label>
-          </div>
+
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
@@ -162,182 +170,59 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
         </div>
         <!-- /.l-unit-toolbar -->
 
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?=__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
-        </div>
-        <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name" u_name="<?=$key?>">
-            <?=$key?> <span><?=str_replace(',', ', ', $data[$key]['ALIAS'])?></span>
-          </div>
-          <!-- /.l-unit__name -->
-          <div class="l-unit__ip">
-            <?=empty($ips[$data[$key]['IP']]['NAT']) ? $data[$key]['IP'] : "{$ips[$data[$key]['IP']]['NAT']}"; ?>
-          </div>
-          <!-- /.l-unit__ip -->
-          <div class="l-unit__stats">
-            <table>
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix graph">
-                    <div class="l-unit__stat-col l-unit__stat-col--left">
-                      <?=__('Bandwidth')?>
-                    </div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
-                      <b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
-                    </div>
-                  </div>
-                  <div class="l-percent">
-                    <div class="l-percent__fill" style="width: <?=get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH'])?>%"></div>
-                  </div>
-                  <!-- /.percent -->
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Web Template')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['TPL']?></b>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
-                  <? if($proxy_support == 'no'){ ?>
-                    <div class="l-unit__stat-cols clearfix disabled last"><?=__('Proxy Support')?></div>
-                  <? } else {?>
-                    <div class="l-unit__stat-cols clearfix last">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Proxy Support')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=__($proxy_support)?></b>
-                      </div>
-                    </div>
-                  <? } ?>
-                  <? } ?>
-                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
-                  <? if($backend_support == 'no'){ ?>
-                    <div class="l-unit__stat-cols clearfix disabled last"><?=__('Backend Support')?></div>
-                  <? } else {?>
-                    <div class="l-unit__stat-cols clearfix last">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backend Support')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=__($backend_support)?></b>
-                      </div>
-                    </div>
-                  <? } ?>
-                  <? } ?>
-                </td>
-              </tr>
-              <tr>
-                <td></td>
-                <td>
-                  <? if($data[$key]['SSL'] == 'no'){ ?>
-                    <div class="l-unit__stat-cols clearfix disabled"><?=__('SSL Support')?></div>
-                  <? } else {?>
-                    <div class="l-unit__stat-cols clearfix">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('SSL Support')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b>
-                            <? if($data[$key]['LETSENCRYPT'] == 'yes'){
-                                echo __('Lets Encrypt');
-                            } else {
-                                echo __($data[$key]['SSL']);
-                            }?>
-                        </b>
-                      </div>
-                    </div>
-                  <? } ?>
-                </td>
-                <td>
-                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Proxy Template')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['PROXY']?></b>
-                    </div>
-                  </div>
-                  <? } ?>
-                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backend Template')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['BACKEND']?></b>
-                    </div>
+
+
+            <div class="l-unit__col l-unit__col--right">
+                <div style="margin-bottom: 50px;">
+              <div class="clearfix l-unit__stat-col--left">
+                <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?=$key?>">
+                <label for="check<?=$i?>" class="check-label"></label>
+              </div>
+                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?=$key?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><?=empty($ips[$data[$key]['IP']]['NAT']) ? $data[$key]['IP'] : "{$ips[$data[$key]['IP']]['NAT']}"; ?></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?></span></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b>
+                      <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
+                          <? if($data[$key]['SSL'] == 'no'){ ?>
+                            <i class="fas fa-times-circle status-icon-red"></i>
+                          <? } else {?>
+                            <i class="fas fa-check-circle status-icon-green"></i>
+                          <? } ?>
+                      <? } else {?>
+                          <? if($data[$key]['SSL'] == 'no'){ ?>
+                            <i class="fas fa-times-circle"></i>
+                          <? } else {?>
+                            <i class="fas fa-check-circle"></i>
+                          <? } ?>
+                      <? } ?>
+                      </b>
                   </div>
-                  <? } ?>
-                </td>
-              </tr>
-                <!--tr>
-                    <td></td>
-                    <td>
-                        <? if(empty($data[$key]['LETSENCRYPT']) || $data[$key]['LETSENCRYPT'] == 'no') { ?>
-                        <div class="l-unit__stat-cols clearfix disabled"><?=__('Lets Encrypt Support')?></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b>
+                      <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
+                          <? if($web_stats == 'no'){ ?>
+                            <i class="fas fa-minus-circle"></i>
+                          <? } else {?>
+                            <i class="fas fa-check-circle status-icon-green"></i>
+                          <? } ?>
+                      <? } else {?>
+                        <? if($web_stats == 'no'){ ?>
+                          <i class="fas fa-minus-circle"></i>
                         <? } else {?>
-                        <div class="l-unit__stat-cols clearfix">
-                            <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Lets Encrypt Support')?>:</div>
-                            <div class="l-unit__stat-col l-unit__stat-col--right">
-                                <b><?=__($data[$key]['LETSENCRYPT'])?></b>
-                            </div>
-                        </div>
+                          <i class="fas fa-check-circle"></i>
                         <? } ?>
-                    </td>
-                </tr-->
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix graph">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
-                      <b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
-                    </div>
+                      <? } ?>
+                      </b>
+                   </div>
                   </div>
-                  <div class="l-percent">
-                    <div class="l-percent__fill" style="width: <?=get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA'])?>%"></div>
-                  </div>
-                  <!-- /.percent -->
-                </td>
-                <td>
-                  <? if($web_stats == 'no'){ ?>
-                    <div class="l-unit__stat-cols clearfix disabled"><?=__('Web Statistics')?></div>
-                  <? } else {?>
-                    <div class="l-unit__stat-cols clearfix">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Web Statistics')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=__($web_stats)?></b>
-                      </div>
-                    </div>
-                  <? } ?>
-                </td>
-                <td>
-                  <? if($ftp_user == 'no'){ ?>
-                    <div class="l-unit__stat-cols clearfix last disabled"><?=__('Additional FTP Account')?></div>
-                  <? } else {?>
-                    <div class="l-unit__stat-cols clearfix last">
-                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Additional FTP Account')?>:</div>
-                      <div class="l-unit__stat-col l-unit__stat-col--right">
-                        <b><?=$ftp_user?></b>
-                      </div>
-                    </div>
-                  <? } ?>
-                </td>
-              </tr>
-            </table>
-          </div>
-          <!-- /.l-unit__stats -->
-        </div>
-        <!-- /.l-unit__col -->
-      </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div -->
-      <!-- /.l-separator -->
-      <?}?>
-
-    </div>
-
+                </div>
+             </div>
+           <!-- /.l-unit__col -->
+         <!-- /.l-unit -->
+         <!--div class="l-separator"></div-->
+         <!-- /.l-separator -->
+         <?}?>
+       </div>
 
     <div id="vstobjects">
       <div class="l-separator"></div>

web/templates/admin/panel.html

@@ -45,74 +45,91 @@
               <li><?=__('spnd');?>: <span><?=$panel[$user]['SUSPENDED_USERS']?></span></li>
             </ul>
           </a>
-        </div>
-		<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
-	        <div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
-	          <a href="/list/web/">
-	            <div class="l-stat__col-title"><?=__('WEB')?>&nbsp;&nbsp;<i class="fas fa-globe-americas"></i></div>
-	            <ul>
-	              <li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
-	              <li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
-	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
-	            </ul>
-	          </a>
-	        </div>
-		<?php } ?>
-		<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
-	        <div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
-	          <a href="/list/dns/">
-	            <div class="l-stat__col-title"><?=__('DNS')?>&nbsp;&nbsp;<i class="fas fa-at"></i></div>
-	            <ul>
-	              <li><?=__('zones')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
-	              <li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
-	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
-	            </ul>
-	          </a>
-	        </div>
+				</div>
+		<?php if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {?>	
+			<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
+						<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
+							<a href="/list/web/">
+								<div class="l-stat__col-title"><?=__('WEB')?>&nbsp;&nbsp;<i class="fas fa-globe-americas"></i></div>
+								<ul>
+									<li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
+									<li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
+									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
+								</ul>
+							</a>
+						</div>
+			<?php } ?>
+		<?php } ?>	
+
+		<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>			
+			<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
+						<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
+							<a href="/list/dns/">
+								<div class="l-stat__col-title"><?=__('DNS')?>&nbsp;&nbsp;<i class="fas fa-at"></i></div>
+								<ul>
+									<li><?=__('zones')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
+									<li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
+									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
+								</ul>
+							</a>
+						</div>
+			<?php } ?>
 		<?php } ?>
-		<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
-	        <div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
-	          <a href="/list/mail/">
-	            <div class="l-stat__col-title"><?=__('MAIL')?>&nbsp;&nbsp;<i class="fas fa-mail-bulk"></i></div>
-	            <ul>
-	              <li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
-	              <li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
-	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
-	            </ul>
-	          </a>
-	        </div>
+
+		<?php if ((isset($_SESSION['MAIL_SYSTEM'])) && (!empty($_SESSION['MAIL_SYSTEM']))) {?>			
+			<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
+						<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
+							<a href="/list/mail/">
+								<div class="l-stat__col-title"><?=__('MAIL')?>&nbsp;&nbsp;<i class="fas fa-mail-bulk"></i></div>
+								<ul>
+									<li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
+									<li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
+									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
+								</ul>
+							</a>
+						</div>
+			<?php } ?>
 		<?php } ?>
-		<?php if($panel[$user]['DATABASES'] != "0") { ?>
-	        <div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
-	          <a href="/list/db/">
-	            <div class="l-stat__col-title"><?=__('DB')?>&nbsp;&nbsp;<i class="fas fa-database"></i></div>
-	            <ul>
-	              <li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
-	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
-	            </ul>
-	          </a>
-	        </div>
+
+		<?php if ((isset($_SESSION['DB_SYSTEM'])) && (!empty($_SESSION['DB_SYSTEM']))) {?>	
+			<?php if($panel[$user]['DATABASES'] != "0") { ?>
+						<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
+							<a href="/list/db/">
+								<div class="l-stat__col-title"><?=__('DB')?>&nbsp;&nbsp;<i class="fas fa-database"></i></div>
+								<ul>
+									<li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
+									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
+								</ul>
+							</a>
+						</div>
+			<?php } ?>
 		<?php } ?>
-		<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
-	        <div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
-	          <a href="/list/cron/">
-	            <div class="l-stat__col-title"><?=__('CRON')?>&nbsp;&nbsp;<i class="fas fa-clock"></i></div>
-	            <ul>
-	              <li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
-	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
-	            </ul>
-	          </a>
-	        </div>
+
+		<?php if ((isset($_SESSION['CRON_SYSTEM'])) && (!empty($_SESSION['CRON_SYSTEM']))) {?>	
+			<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
+						<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
+							<a href="/list/cron/">
+								<div class="l-stat__col-title"><?=__('CRON')?>&nbsp;&nbsp;<i class="fas fa-clock"></i></div>
+								<ul>
+									<li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
+									<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
+								</ul>
+							</a>
+						</div>
+			<?php } ?>
 		<?php } ?>
-		<?php if($panel[$user]['BACKUPS'] != "0") { ?>
-	        <div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
-	          <a href="/list/backup/">
-	            <div class="l-stat__col-title"><?=__('BACKUP')?>&nbsp;&nbsp;<i class="fas fa-undo"></i></div>
-	            <ul>
-	              <li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
-	            </ul>
-	          </a>
-	        </div>
+
+		<?php if ((isset($_SESSION['BACKUP_SYSTEM'])) && (!empty($_SESSION['BACKUP_SYSTEM']))) {?>	
+			<?php if($panel[$user]['BACKUPS'] != "0") { ?>
+						<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
+							<a href="/list/backup/">
+								<div class="l-stat__col-title"><?=__('BACKUP')?>&nbsp;&nbsp;<i class="fas fa-undo"></i></div>
+								<ul>
+									<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
+								</ul>
+							</a>
+						</div>
+			<?php } ?>
 		<?php } ?>
       </div>
       <!-- /.l-stats -->

web/templates/footer.html

@@ -4,7 +4,7 @@
     <p class="confirmation"><?=__('LEAVE_PAGE_CONFIRMATION')?></p>
   </div>
 
-  <div class="shortcuts" style="display:none">
+  <div class="shortcuts animated fadeIn" style="display:none">
     <div class="header">
       <div class="title"><?=__('Shortcuts')?></div>
       <div class="close"></div>

web/templates/login.html

@@ -5,7 +5,7 @@
                         <table>
                             <tr>
                                 <td style="padding: 0 10px 0 42px; height: 280px; width: 170px;">
-                                    <a href="/"><img border=0 src="/images/logo.png" alt="Hestia Control Panel" style="margin: 0 0 0 0;" /></a>
+                                    <a href="/"><img border=0 src="/images/logo.png" alt="Hestia Control Panel" style="margin: 20px;" /></a>
                                 </td>
                                 <td style="padding: 20px 0 0 0;">
                                     <form method="post" action="/login/" >
@@ -60,7 +60,7 @@
                                             <td style="padding-top: 12px; padding-left:2px;">
                                                 <?php print __('2FA Token');?>
                                                 <span style="padding:0 0 0 10px;">
-                                                    <a tabindex="5" class="vst-advanced" href="/reset/">
+                                                    <a tabindex="5" class="vst-advanced" href="/reset2fa/">
                                                         <?php print __('forgot token');?>
                                                     </a>
                                                 </span>

web/templates/reset2fa.html

@@ -0,0 +1,73 @@
+        <center>
+            <table class="login">
+                <tr>
+                    <td>
+                        <table>
+                            <tr>
+                                <td style="padding: 0 10px 0 42px; height: 280px; width: 170px;">
+                                    <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Hestia Control Panel" /></a>
+                                </td>
+                                <td style="padding: 10px 0 0 0;">
+                                    <?php if ($success) { ?>
+                                    <table class="login-box">
+                                        <tr>
+                                        <td style="padding: 12px 0 0 2px;">
+                                            <?php print __('2FA Reset successfully.'); ?>
+                                        </td>
+                                        </tr>
+                                    </table>
+                                    <?php } else { ?>
+                                    <form method="post" action="/reset2fa/">
+                                        <table class="login-box">
+                                            <tr>
+                                            <td style="padding: 12px 0 0 2px;">
+                                                <?php print __('RESET_NOTICE');?>
+                                            </td>
+                                            </tr>
+                                            <tr>
+                                                <td style="padding: 12px 0 0 2px;">
+                                                    <?php print __('Username');?>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <input tabindex="1" type="text" size="20px" style="width:240px" name="user" class="vst-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td style="padding: 12px 0 0 2px;">
+                                                    <?php print __('2FA Reset Code');?>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <input tabindex="1" type="text" size="20px" style="width:240px" name="twofa" class="vst-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td style="padding: 20px 0 12px 0;">
+                                                    <input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">
+                                                    <input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="location.href='/login/'">
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </form>
+                                    <?php } ?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan=2>
+                                    <div class="login-bottom">
+                                        <div style="height:20px"><?php if (isset($ERROR)) echo $ERROR ?></div>
+                                        <a class="hestiacp" href="https://www.hestiacp.com" >hestiacp.com</a>
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </center>
+    </body>
+</html>
+

web/templates/user/edit_user.html

@@ -7,7 +7,7 @@
                 echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
               } else {
                 if (!empty($_SESSION['ok_msg'])) {
-                  echo "<span class=\"vst-ok\"> → ".htmlentities($_SESSION['ok_msg'])."</span>";
+                  echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                 }
               }
             ?>
@@ -27,7 +27,7 @@
           $back = "location.href='".$back."'";
         }
       ?>
-        <form id="vstobjects" method="post" name="v_edit_user"  class="<?=$v_status?>">
+        <form id="vstobjects" method="post" name="v_edit_user" class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
 
@@ -41,7 +41,7 @@
                                     <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?=$v_status?>"><b><?=__($v_status)?></b></td></tr>
+                            <tr><td class="data-<?=$v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">
@@ -53,8 +53,8 @@
                             </tr>
                             <tr>
                                 <td>
-                                  <input type="text" size="20" class="vst-input" name="v_user" value="<?=htmlentities(trim($v_username, "'"))?>" disabled>
-                                  <input type="hidden" name="v_username" value="<?=htmlentities(trim($v_username, "'"))?>">
+                                    <input type="text" size="20" class="vst-input" name="v_user" value="<?=htmlentities(trim($v_username, "'"))?>" disabled>
+                                    <input type="hidden" name="v_username" value="<?=htmlentities(trim($v_username, "'"))?>">
                                 </td>
                             </tr>
                             <tr>
@@ -62,6 +62,10 @@
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities(trim($v_password, "'"))?>">
+                                </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
@@ -70,18 +74,14 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <label><input type="checkbox" class="vst-checkbox" name="v_twofa" <?php if($v_twofa == 'yes') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_twofa(this)"> <?php print __('Enable 2FA');?></label>
-                                    <?php if($v_twofa == 'yes') { ?>
+                                    <label><input type="checkbox" class="vst-checkbox" name="v_twofa" <?php if(!empty($v_twofa)) echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_twofa(this)"> <?php print __('Enable 2FA');?></label>
+                                    <?php if (!empty($v_twofa)) { ?>
+                                    <p><?php echo __('2FA Reset Code:').' '.$v_twofa; ?></br></p>
                                     <p><?php echo __('Please scan the code below in your 2FA application:'); ?></p>
                                     <img src="<?php echo $v_qrcode; ?>">
                                     <?php } ?>
                                 </td>
                             </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities(trim($v_password, "'"))?>">
-                                </td>
-                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Email');?>
@@ -102,7 +102,7 @@
                                     <select class="vst-list" name="v_language">
                                         <?php
                                             foreach ($languages as $key => $value) {
-                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($value)."\"";
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
                                                 $svalue = "'".$value."'";
                                                 if (( $value == $v_language ) || ( $svalue == $v_language)){
                                                     echo 'selected' ;
@@ -141,20 +141,18 @@
                                     <?php print __('Default Name Servers');?>
                                 </td>
                             </tr>
-
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns1" value="<?=htmlentities(trim($v_ns1, "'"))?>">
-                                                <span class="remove-ns additional-control delete"><?=__('delete')?></span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns2" value="<?=htmlentities(trim($v_ns2, "'"))?>">
-                                                <span class="remove-ns additional-control delete"><?=__('delete')?></span>
-                                            </td>
-                                        </tr>
-
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns1" value="<?=htmlentities(trim($v_ns1, "'"))?>">
+                                    <span class="remove-ns additional-control delete"><?=__('delete')?></span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns2" value="<?=htmlentities(trim($v_ns2, "'"))?>">
+                                    <span class="remove-ns additional-control delete"><?=__('delete')?></span>
+                                </td>
+                            </tr>
                             <?  if($v_ns3)
                                   echo '<tr>
                                     <td>
@@ -203,12 +201,14 @@
                                     </td>
                                 </tr>';
                             ?>
+
                                 <tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
                                     <td class="step-top-small">
                                       <span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
                                     </td>
                                 </tr>
 
+
                         </table>
                         <table class="data-col2">
                             <tr>

web/templates/user/list_dns_rec.html

@@ -47,7 +47,7 @@
       <div class="subtitle"><?=__('Listing')?>  <?=htmlentities($_GET['domain'])?></div>
     </div>
 
-    <div class="l-unit__col l-unit__col--right step-top">
+    <div class="l-unit__col l-unit__col--right step-top table-header">
       <div style="margin-bottom: 40px;">
         <div class="clearfix l-unit__stat-col--left small"><b><?php print __('Record');?></b></div>
         <div class="clearfix l-unit__stat-col--left compact"><b><?php print __('Type');?></b></div>