Table view code cleanup

web/css/styles.min.css

@@ -1565,6 +1565,8 @@ div.l-content > div.l-separator:nth-of-type(4) {
   overflow: hidden;
   font-size: 0.8rem;
   border-radius: 0;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
 
 .table-header {

web/templates/admin/generate_ssl.html

@@ -16,7 +16,6 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
       <?php

web/templates/admin/list_backup.html

@@ -29,11 +29,9 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center units animated fadeIn">
         <div class="header table-header">
@@ -71,61 +69,42 @@
       ?>
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--outdated';?>">
-        <div class="l-unit-toolbar clearfix">
-        </div>
-        <!-- /.l-unit-toolbar -->
-
             <div class="l-unit__col l-unit__col--right">
               <div>
                   <div class="clearfix l-unit__stat-col--left super-compact">
-                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="backup[]" value="<?php echo $key ?>">
-                      
-                    </div>
+                    <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="backup[]" value="<?php echo $key ?>">
+                  </div>
                   <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$key?></a></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-4 text-right"><b>
-                      <!-- START QUICK ACTION TOOLBAR AREA -->
-        
-                        <!-- l-unit-toolbar__col -->
-                        <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                            <div class="actions-panel clearfix">
-                              <div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-file-download status-icon-lightblue status-icon-dim"></i></a></div>
-
-                              <div class="actions-panel__col actions-panel__list shortcut-d" key-action="href"><a href="/list/backup/?backup=<?=$key?>"><i class="fas fa-undo status-icon-green status-icon-dim"></i></a></div>
-
-                              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                                  <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
-                                  <input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                                  <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                                    <p class="confirmation"><?=__('DELETE_BACKUP_CONFIRMATION',$key)?></p>
-                                  </div>
-                                </a>
-                              </div>
-                
+                  <!-- START QUICK ACTION TOOLBAR AREA -->
+                  <div class="clearfix l-unit__stat-col--left compact-4 text-right">
+                    <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                      <div class="actions-panel clearfix">
+                        <div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-file-download status-icon-lightblue status-icon-dim"></i></a></div>
+                        <div class="actions-panel__col actions-panel__list shortcut-d" key-action="href"><a href="/list/backup/?backup=<?=$key?>"><i class="fas fa-undo status-icon-green status-icon-dim"></i></a></div>
+                        <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                          <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                            <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                            <input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                            <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                              <p class="confirmation"><?=__('DELETE_BACKUP_CONFIRMATION',$key)?></p>
                             </div>
-                            <!-- /.actiona-panel -->
-                          </div>
-                        <!-- END QUICK ACTION TOOLBAR AREA -->
-                    </b></div>
+                          </a>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <!-- END QUICK ACTION TOOLBAR AREA -->
                   <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 id="vstobjects">
       <div class="l-separator"></div>
       <div class="l-center">

web/templates/admin/list_backup_detail.html

@@ -34,12 +34,9 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center units animated fadeIn">
     <div class="l-unit header">
@@ -60,22 +57,13 @@
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="web[]" 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">
             <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix"></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>
@@ -88,16 +76,10 @@
               </tr>
             </table>
           </div>
-          <!-- /.l-unit__stats -->
         </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
-      <? }} ?>
-
 
+      <? }} ?>
 
       <?
         $mail = explode(',',$data[$backup]['MAIL']);
@@ -111,17 +93,12 @@
             <input id="check2<?=$i?>" type="checkbox" name="mail[]" value="<?=$key?>">
             <label for="check2<?=$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__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=mail&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
             <table>
@@ -135,17 +112,10 @@
               </tr>
             </table>
           </div>
-          <!-- /.l-unit__stats -->
         </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
-      <? }} ?>
-
-
 
+      <? }} ?>
 
       <?
         $dns = explode(',',$data[$backup]['DNS']);
@@ -159,17 +129,12 @@
             <input id="check3<?=$i?>" type="checkbox" name="dns[]" value="<?=$key?>">
             <label for="check3<?=$i++?>" class="check-label"></label>
           </div>
-          <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
             <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=dns&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
             <table>
@@ -183,16 +148,10 @@
               </tr>
             </table>
           </div>
-          <!-- /.l-unit__stats -->
         </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
-      <? }} ?>
-
 
+      <? }} ?>
 
       <?
         $db = explode(',',$data[$backup]['DB']);
@@ -206,17 +165,11 @@
             <input id="check4<?=$i?>" type="checkbox" name="db[]" value="<?=$key?>">
             <label for="check4<?=$i++?>" class="check-label"></label>
           </div>
-          <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
             <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=db&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
-
         <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
             <table>
@@ -230,17 +183,10 @@
               </tr>
             </table>
           </div>
-          <!-- /.l-unit__stats -->
         </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
-      <? }} ?>
-
-
 
+      <? }} ?>
 
       <?
         $backup = $_GET['backup'];
@@ -254,17 +200,12 @@
             <input id="check5<?=$i?>" type="checkbox" name="check" value="<?=$key?>">
             <label for="check5<?=$i++?>" class="check-label"></label>
           </div>
-          <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
             <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=cron&object=records"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
             <table>
@@ -278,18 +219,10 @@
               </tr>
             </table>
           </div>
-          <!-- /.l-unit__stats -->
         </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
       <? }} ?>
 
-
-
-
       <?
         $udir = explode(',',$data[$backup]['UDIR']);
         foreach ($udir as $key) {
@@ -302,17 +235,12 @@
             <input id="check6<?=$i?>" type="checkbox" name="udir[]" value="<?=$key?>">
             <label for="check6<?=$i++?>" class="check-label"></label>
           </div>
-          <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
             <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=udir&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
             <table>
@@ -326,13 +254,8 @@
               </tr>
             </table>
           </div>
-          <!-- /.l-unit__stats -->
         </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div-->
-      <!-- /.l-separator -->
       <? }} ?>
 
       <div class="l-unit">
@@ -341,17 +264,12 @@
             <input id="check7<?=$i?>" type="checkbox" name="cron" value="<?=$i?>">
             <label for="check7<?=$i++?>" class="check-label"></label>
           </div>
-          <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
             <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=cron"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
             <table>
@@ -365,17 +283,10 @@
               </tr>
             </table>
           </div>
-          <!-- /.l-unit__stats -->
         </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_backup_exclusions.html

@@ -18,12 +18,9 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center units animated fadeIn">
       <?
@@ -34,26 +31,11 @@
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
           </div>
-          <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <!-- div class="actions-panel__col actions-panel__delete">
-              <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                <?=__('delete')?> <i class="do_delete"></i>
-                <input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                  <p class="confirmation"><?=__('DELETE_BACKUP_CONFIRMATION',$key)?></p>
-                </div>
-              </a>
-            </div-->
-
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
             <table>
@@ -74,25 +56,16 @@
               </tr>
             </table>
           </div>
-          <!-- /.l-unit__stats -->
         </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">
         <div class="l-unit-ft">
           <table class='data'></table>
-          <!-- /form -->
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right total clearfix">
           </div>

web/templates/admin/list_cron.html

@@ -47,11 +47,9 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center units animated fadeIn">
         <div class="header table-header">
@@ -85,72 +83,55 @@
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['CRON'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="cron"
 sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>"
 sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo '0';  ?>">
-        <div class="l-unit-toolbar clearfix">
-        </div>
-        <!-- /.l-unit-toolbar -->
       <div class="l-unit__col l-unit__col--right">
-          <div>
-              <div class="clearfix l-unit__stat-col--left super-compact">
-                  <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
+        <div class="clearfix l-unit__stat-col--left super-compact">
+          <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
+        </div>
+        <div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b></div>
+        <!-- START QUICK ACTION TOOLBAR AREA -->
+        <div class="clearfix l-unit__stat-col--left compact-2 text-right">
+          <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+            <div class="actions-panel clearfix">
+              <div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+                <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
+                  <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
+                    <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                    <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
+                    <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
+                      <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
+                    </div>
+                  </a>
                 </div>
-              <div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b></div>
-              <div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>
-                  <!-- START QUICK ACTION TOOLBAR AREA -->
-    
-                    <!-- l-unit-toolbar__col -->
-                    <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                        <div class="actions-panel clearfix">
-                          <div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
-                          <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
-                              <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                                <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
-                                <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
-                                <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
-                                  <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
-                                </div>
-                              </a>
-                            </div>
-                          <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                            <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                              <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
-                              <input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
-                              <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                                <p class="confirmation"><?=__('DELETE_CRON_CONFIRMATION',$key)?></p>
-                              </div>
-                            </a>
-                          </div>
-            
-                        </div>
-                        <!-- /.actiona-panel -->
-                      </div>
-                    <!-- END QUICK ACTION TOOLBAR AREA -->
-                </b></div>
-              <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['MIN']?></div>
-              <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['HOUR']?></div>
-              <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['DAY']?></div>
-              <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['MONTH']?></div>
-              <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['WDAY']?></div>
-           </div>
-         </div>
-       <!-- /.l-unit__col -->
-     </div>
-     <!-- /.l-unit -->
-     <!--div class="l-separator"></div-->
-     <!-- /.l-separator -->
-
-
-      <?}?>
-
-    </div>
-
+                <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                  <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                    <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                    <input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
+                    <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                      <p class="confirmation"><?=__('DELETE_CRON_CONFIRMATION',$key)?></p>
+                    </div>
+                  </a>
+                </div>
+              </div>
+             </div>
+            </div>
+            <!-- END QUICK ACTION TOOLBAR AREA -->
+            <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['MIN']?></div>
+            <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['HOUR']?></div>
+            <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['DAY']?></div>
+            <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['MONTH']?></div>
+            <div class="clearfix l-unit__stat-col--left compact-3 text-center"><?=$data[$key]['WDAY']?></div>
+          </div>
+        </div>
+    <?}?>
+  </div>
 
-    <div id="vstobjects">
-      <div class="l-separator"></div>
-      <div class="l-center">
-        <div class="l-unit-ft">
-          <table class='data'></table>
-          <div class="l-unit__col l-unit__col--left clearfix"></div>
-          <div class="data-count l-unit__col l-unit__col--right clearfix">
+  <div id="vstobjects">
+    <div class="l-separator"></div>
+    <div class="l-center">
+      <div class="l-unit-ft">
+        <table class='data'></table>
+        <div class="l-unit__col l-unit__col--left clearfix"></div>
+        <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
               if ( $i == 1) {
                 echo __('1 cron job');
@@ -158,7 +139,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
                 echo __('%s cron jobs',$i);
               }
             ?>
-          </div>
         </div>
       </div>
     </div>
+  </div>

web/templates/admin/list_db.html

@@ -68,14 +68,12 @@
               </td>
             </tr>
           </table>
-          <!--  -->
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
+
     <div class="l-center units animated fadeIn">
         <div class="header table-header">
             <div class="l-unit__col l-unit__col--right step-top">
@@ -118,21 +116,14 @@
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['DB'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="db"
 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>
-        <!-- /.l-unit-toolbar -->
             <div class="l-unit__col l-unit__col--right">
               <div>
-                  <div class="clearfix l-unit__stat-col--left super-compact">
-                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
-                      
-                    </div>
-                  <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/db/?database=<?=$key?>"><?=$key?></a></b></div>
-
-                  <div class="clearfix l-unit__stat-col--left text-right compact-2"><b>
-                    <!-- START QUICK ACTION TOOLBAR AREA -->
-
-                      <!-- l-unit-toolbar__col -->
+                <div class="clearfix l-unit__stat-col--left super-compact">
+                  <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
+                </div>
+                <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/db/?database=<?=$key?>"><?=$key?></a></b></div>
+                <!-- START QUICK ACTION TOOLBAR AREA -->
+                <div class="clearfix l-unit__stat-col--left text-right compact-2">
                       <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                           <div class="actions-panel clearfix">
                             <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/db/?database=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
@@ -156,12 +147,9 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                             </div>
               
                           </div>
-                          <!-- /.actiona-panel -->
                         </div>
-
-                      <!-- END QUICK ACTION TOOLBAR AREA -->
-                  </b></div>
-
+                  </div>
+                  <!-- END QUICK ACTION TOOLBAR AREA -->
                   <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>
@@ -169,12 +157,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                   <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-->
-      <!-- /.l-separator -->
       <?}?>
     </div>
 

web/templates/admin/list_dns.html

@@ -41,12 +41,9 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center units animated fadeIn">
         <div class="header table-header">
@@ -81,66 +78,49 @@
       <div class="l-unit <? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>"
 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">
-          <!-- l-unit-toolbar__col -->
-        </div>
-        <!-- /.l-unit-toolbar -->
             <div class="l-unit__col l-unit__col--right">
-              <div>
-                  <div class="clearfix l-unit__stat-col--left super-compact">
-                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
-                      
-                    </div>
-                  <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/list/dns/?domain=<?=$key?>"><?=$key?></a></b></div>
+              <div class="clearfix l-unit__stat-col--left super-compact">
+                <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
+              </div>
+              <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/list/dns/?domain=<?=$key?>"><?=$key?></a></b></div>
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left text-right">
+                  <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                  <div class="actions-panel clearfix">
 
-                  <div class="clearfix l-unit__stat-col--left text-right"><b>
-                    <!-- START QUICK ACTION TOOLBAR AREA -->
+                    <div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=$key?>"><i class="fas fa-plus-circle status-icon-green status-icon-dim"></i></a></div>
+                    <div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=$key?>"><i class="fas fa-list status-icon-lightblue status-icon-dim"></i></div>
+                    <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
 
-                      <!-- l-unit-toolbar__col -->
-                      <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                          <div class="actions-panel clearfix">
-
-                              <div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=$key?>"><i class="fas fa-plus-circle status-icon-green status-icon-dim"></i></a></div>
-                            <div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=$key?>"><i class="fas fa-list status-icon-lightblue status-icon-dim"></i></div>
-                            <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
-
-                            <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
-                              <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                                <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
-                                <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                                <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
-                                  <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
-                                </div>
-                              </a>
-                            </div>
-                            <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                              <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                                <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
-                                <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                                <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                                  <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
-                                </div>
-                              </a>
+                    <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
+                      <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
+                        <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                        <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                        <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
+                          <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
+                        </div>
+                      </a>
+                    </div>
+                    <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                      <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                        <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                          <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                            <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                              <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
                             </div>
-              
-                          </div>
-                          <!-- /.actiona-panel -->
+                          </a>
                         </div>
-
-                      <!-- END QUICK ACTION TOOLBAR AREA -->
-                  </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__col -->
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
+                    </div>
+                  </div>
+                </div>
+              <!-- END QUICK ACTION TOOLBAR AREA -->
+              <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>
 

web/templates/admin/list_dns_rec.html

@@ -32,32 +32,22 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
-
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
-
-
 
     <div class="l-center units animated fadeIn">
-
-    <div class="header table-header">
-      <div class="l-unit__col l-unit__col--left clearfix">
-        <div class="text-center jump-small-top"></div>
-      </div>
-
-      <div class="l-unit__col l-unit__col--right step-top">
-        <div>
+      <div class="header table-header">
+        <div class="l-unit__col l-unit__col--right step-top">
+          <div class="clearfix l-unit__stat-col--left super-compact">
+            <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
+          </div>
           <div class="clearfix l-unit__stat-col--left small"><b><?php print __('Record');?></b></div>
           <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
-          <div class="clearfix l-unit__stat-col--left compact"><b><?php print __('Type');?></b></div>
+          <div class="clearfix l-unit__stat-col--left compact text-center"><b><?php print __('Type');?></b></div>
           <div class="clearfix l-unit__stat-col--left compact"><b><?php print __('Priority');?></b></div>
           <div class="clearfix l-unit__stat-col--left wide-4"><b><?php print __('IP or Value');?></b></div>
         </div>
-      </div>
     </div>
 
       <?php
@@ -74,62 +64,38 @@
           }
       ?>
 
-
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS_REC'][$key] == 1) echo ' l-unit--starred';?>"
 v_unit_id="<?=$key?>" v_section="dns_rec">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?=$data[$key]['ID']?>" class="ch-toggle" type="checkbox" name="record[]" value="<?=$data[$key]['ID']?>">
-            <label for="check<?=$data[$key]['ID']?>" class="check-label"></label>
-          </div>
-        </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 jump-small-top">
-            <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 super-compact">
+              <input id="check<?=$data[$key]['ID']?>" class="ch-toggle" type="checkbox" name="record[]" value="<?=$data[$key]['ID']?>">
+            </div>
             <div class="clearfix l-unit__stat-col--left small"><b><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>"><? echo substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?></a></b></div>
-
-            <div class="clearfix l-unit__stat-col--left compact text-right"><b>
-              <!-- START QUICK ACTION TOOLBAR AREA -->
-
-                <!-- l-unit-toolbar__col -->
-                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                    <div class="actions-panel clearfix">
-                      <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
-                      <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                        <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                          <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
-                          <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" />
-                          <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                            <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
-                          </div>
-                        </a>
+            <!-- START QUICK ACTION TOOLBAR AREA -->
+            <div class="clearfix l-unit__stat-col--left compact text-right">
+              <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                <div class="actions-panel clearfix">
+                  <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+                  <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                    <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                      <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                      <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" />
+                      <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                        <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
                       </div>
-        
-                    </div>
-                    <!-- /.actiona-panel -->
+                    </a>
                   </div>
-
-                <!-- END QUICK ACTION TOOLBAR AREA -->
-            </b></div>
+                </div>
+              </div>
+            </div>
+            <!-- END QUICK ACTION TOOLBAR AREA -->
             <div class="clearfix l-unit__stat-col--left compact text-center"><b><?=$data[$key]['TYPE']?></b></div>
             <div class="clearfix l-unit__stat-col--left compact"><?=$data[$key]['PRIORITY']?>&nbsp;</div>
-            <div class="clearfix l-unit__stat-col--left wide-4"><?=htmlspecialchars($data[$key]['VALUE'], ENT_QUOTES, 'UTF-8')?></div>
+            <div class="clearfix l-unit__stat-col--left wide-4" style="font-family: 'Inconsolata', monospace;"><?=htmlspecialchars($data[$key]['VALUE'], ENT_QUOTES, 'UTF-8')?></div>
           </div>
-          <!-- /.l-unit__stats -->
         </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div-->
-      <!-- /.l-separator -->
       <?}?>
 
     </div>
@@ -139,7 +105,6 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
     <div class="l-center">
         <div class="l-unit-ft">
           <table class='data'></table>
-          <!-- /form -->
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right total clearfix">
             <?php

web/templates/admin/list_firewall.html

@@ -45,7 +45,6 @@
     <div class="l-center units compact animated fadeIn">         
           <div class="header table-header">     
             <div class="l-unit__col l-unit__col--right step-top">
-              <div>
                   <div class="clearfix l-unit__stat-col--left super-compact">
                       <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                   </div>
@@ -55,7 +54,6 @@
                   <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-3 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>
 
@@ -76,16 +74,11 @@
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['FIREWALL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="firewall"
 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>
-        <!-- /.l-unit-toolbar -->
-
-        <!-- /.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 super-compact">
-                  <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="rule[]" value="<?php echo $key ?>">
-                </div>
+                <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="rule[]" value="<?php echo $key ?>">
+              </div>
             <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/firewall/?rule=<?=$key?>">
                 <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
                   <? if ($data[$key]['ACTION'] == 'DROP') { ?>
@@ -102,52 +95,41 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
                 <? } ?>
               </a></b>
             </div>
-
-            <div class="clearfix l-unit__stat-col--left compact text-right"><b>
-                <!-- START QUICK ACTION TOOLBAR AREA -->
-  
-                  <!-- l-unit-toolbar__col -->
-                  <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                      <div class="actions-panel clearfix">
-                        <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/firewall/?rule=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+            <!-- START QUICK ACTION TOOLBAR AREA -->
+            <div class="clearfix l-unit__stat-col--left compact text-right">
+              <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                <div class="actions-panel clearfix">
+                  <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/firewall/?rule=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
                         
-                        <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
-                            <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                              <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
-                              <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                              <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
-                                <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
-                              </div>
-                            </a>
-                        </div>
-                        <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                          <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                            <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
-                            <input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                            <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                              <p class="confirmation"><?=__('DELETE_RULE_CONFIRMATION',$key)?></p>
-                            </div>
-                          </a>
-                        </div>
-          
+                  <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
+                    <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
+                      <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                      <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                      <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
+                        <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
                       </div>
-                      <!-- /.actiona-panel -->
-                    </div>
-  
-                  <!-- END QUICK ACTION TOOLBAR AREA -->
-              </b></div>
+                    </a>
+                  </div>
+                  <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                    <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                      <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                      <input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                      <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                        <p class="confirmation"><?=__('DELETE_RULE_CONFIRMATION',$key)?></p>
+                      </div>
+                    </a>
+                  </div>
+                 </div>
+              </div>
+            </div>
+            <!-- END QUICK ACTION TOOLBAR AREA -->
             <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-3 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>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div-->
-      <!-- /.l-separator -->
       <?}?>
 
     </div>
@@ -157,7 +139,6 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
     <div class="l-center">
         <div class="l-unit-ft">
           <table class='data'></table>
-          <!-- /form -->
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php

web/templates/admin/list_firewall_banlist.html

@@ -22,12 +22,10 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
+  
     <div class="l-center units animated fadeIn">
           <div class="header table-header">
               <div class="l-unit__col l-unit__col--right step-top">
@@ -50,48 +48,36 @@
       ?>
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
-        <!-- /.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 super-compact">
                   <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $value['CHAIN'] ?>">
                 </div>
               <div class="clearfix l-unit__stat-col--left wide-3"><b><?=$ip?></b></div>
-              <div class="clearfix l-unit__stat-col--left compact-4"><b>
-                  <!-- START QUICK ACTION TOOLBAR AREA -->
-    
-                    <!-- l-unit-toolbar__col -->
-                    <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                        <div class="actions-panel clearfix">
-                          <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                            <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                              <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
-                              <input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>" />
-                              <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                                <p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>
-                              </div>
-                            </a>
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left compact-4">
+                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                    <div class="actions-panel clearfix">
+                      <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                        <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                          <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                          <input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>" />
+                          <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                            <p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>
                           </div>
-            
-                        </div>
-                        <!-- /.actiona-panel -->
+                        </a>
                       </div>
-    
-                    <!-- END QUICK ACTION TOOLBAR AREA -->
-                </b></div>
-              <div class="clearfix l-unit__stat-col--left text-center compact-5"><?=__($data[$key]['DATE'])?></div>
-              <div class="clearfix l-unit__stat-col--left text-center compact-5"><?=$data[$key]['TIME']?></div>
-              <div class="clearfix l-unit__stat-col--left text-center wide"><b><?=__($value['CHAIN'])?></b></div>
-          </div>
-          <!-- /.l-unit__stats -->
+                    </div>
+                  </div>
+                </div>
+                <!-- END QUICK ACTION TOOLBAR AREA -->
+                <div class="clearfix l-unit__stat-col--left text-center compact-5"><?=__($data[$key]['DATE'])?></div>
+                <div class="clearfix l-unit__stat-col--left text-center compact-5"><?=$data[$key]['TIME']?></div>
+                <div class="clearfix l-unit__stat-col--left text-center wide"><b><?=__($value['CHAIN'])?></b></div>
+            </div>
         </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div-->
-      <!-- /.l-separator -->
       <?}?>
-
     </div>
 
     <div id="vstobjects">

web/templates/admin/list_ip.html

@@ -35,11 +35,10 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
+
     <div class="l-center units animated fadeIn">
       <div class="header table-header">     
         <div class="l-unit__col l-unit__col--right step-top">
@@ -49,7 +48,7 @@
             </div>           
             <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('IP Address');?></b></div>
             <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</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 compact-5"><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>
@@ -67,21 +66,14 @@
 v_section="ip" sort-ip="<?=str_replace('.', '', $key)?>" sort-date="<?=strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] )?>"
 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>
-        <!-- /.l-unit-toolbar -->
 
-        <!-- /.l-unit__col -->
           <div class="l-unit__col l-unit__col--right">
-            <div>
               <div class="clearfix l-unit__stat-col--left super-compact">
                 <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ip[]" value="<?=$key?>">
-                
               </div>
               <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/ip/?ip=<?=$key?>"><?=$key?></a></b></div>
-              <div class="clearfix l-unit__stat-col--left compact text-right"><b>
-                  <!-- START QUICK ACTION TOOLBAR AREA -->
-                    <!-- l-unit-toolbar__col -->
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left compact text-right">
                     <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                         <div class="actions-panel clearfix">
                           <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/ip/?ip=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
@@ -95,21 +87,16 @@ sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites'][
                             </a>
                           </div>
                         </div>
-                        <!-- /.actiona-panel -->
                       </div>
-                    <!-- END QUICK ACTION TOOLBAR AREA -->
-                </b></div>
-              <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['NETMASK']?></b></div>
+                </div>
+              <!-- END QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left text-center compact-5"><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>
         </div>
-        <!-- /.l-unit__col -->
-      <!-- /.l-unit -->
-      <!-- /.l-separator -->
       <?}?>
     </div>
 
@@ -118,7 +105,6 @@ sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites'][
     <div class="l-center">
         <div class="l-unit-ft">
           <table class='data'></table>
-          <!-- /form -->
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php

web/templates/admin/list_log.html

@@ -5,66 +5,56 @@
       <a href="/delete/log/?token=<?=$_SESSION['token']?>" class="ui-button cancel" title="<?=__('Clear Log')?>"><i class="fas fa-times-circle status-icon-red"></i> <?=__('Delete Log')?></a>
     </div>
     <div class="l-sort-toolbar clearfix">
-      <table>
-      </table>
     </div>
   </div>
-  <!-- /.l-sort -->
 </div>
 
 <div class="l-separator"></div>
-<!-- /.l-separator -->
+
 <div class="l-center units animated fadeIn">
   <div class="header table-header">     
     <div class="l-unit__col l-unit__col--right step-top">
-      <div>
-        <div class="clearfix l-unit__stat-col--left compact">
-        </div>           
-        <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 "><b><?php print __('Value');?></b></div>
-      </div>
+      <div class="clearfix l-unit__stat-col--left super-compact">
+        &nbsp;
+      </div>       
+      <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 "><b><?php print __('Value');?></b></div>
     </div>
- </div>
-
-    <?php
-      foreach ($data as $key => $value) {
-         ++$i;
-    ?>
+  </div>
 
+ <?php
+    foreach ($data as $key => $value) {
+    ++$i;
+  ?>
     <div class="l-unit header">
-        <div class="l-unit__col l-unit__col--right step-top">
-          <div>
-            <div class="clearfix l-unit__stat-col--left small"><b><?=translate_date($data[$key]['DATE'])?></b></div>
-            <div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
-            <div class="clearfix l-unit__stat-col--left wide-4"><?=$data[$key]['CMD']?></div>
-          </div>
+      <div class="l-unit__col l-unit__col--right step-top">
+        <div class="clearfix l-unit__stat-col--left super-compact">
+          <i class="fas fa-comment-dots"></i>
         </div>
-
-      <!-- /.l-unit__col -->
+        <div class="clearfix l-unit__stat-col--left small"><b><?=translate_date($data[$key]['DATE'])?></b></div>
+        <div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
+        <div class="clearfix l-unit__stat-col--left wide-4"><?=$data[$key]['CMD']?></div>
+      </div>
     </div>
-    <!-- /.l-unit -->
-    <!--div class="l-separator"></div-->
-    <!-- /.l-separator -->
-    <?}?>
-
-  </div>
+  <?}?>
+</div>
 
-  <div id="vstobjects">
-      <div class="l-separator"></div>
+<div id="vstobjects">
+  <div class="l-separator"></div>
   <div class="l-center">
-      <div class="l-unit-ft">
-        <table class='data'></table>
-        <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <div class="data-count l-unit__col l-unit__col--right clearfix">
-          <?
-            if ( $i == 1) {
-              echo __('1 log record');
-            } else {
-              echo __('%s log records',$i);
-            }
-          ?>
-        </div>
+    <div class="l-unit-ft">
+      <table class='data'></table>
+      <div class="l-unit__col l-unit__col--left clearfix"></div>
+      <div class="data-count l-unit__col l-unit__col--right clearfix">
+        <?
+          if ( $i == 1) {
+            echo __('1 log record');
+          } else {
+            echo __('%s log records',$i);
+          }
+        ?>
+      </div>
     </div>
   </div>
 </div>

web/templates/admin/list_mail.html

@@ -39,30 +39,28 @@
 
             </tr>
           </table>
-          <!--  -->
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
+
     <div class="l-center units animated fadeIn">
-            <div class="header table-header">
-                <div class="l-unit__col l-unit__col--right step-top">
-                      <div class="clearfix l-unit__stat-col--left super-compact">
-                        <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                      </div>
-                      <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-right compact-4"><b>&nbsp;</b></div>
-                      <div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?php print __('Accounts');?></b></div>
-                      <div class="clearfix l-unit__stat-col--left text-center compact-2"><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 class="clearfix l-unit__stat-col--left text-center compact-3"><b><?php print __('SSL');?></b></div>
-                </div>
-              </div>
+      <div class="header table-header">
+        <div class="l-unit__col l-unit__col--right step-top">
+            <div class="clearfix l-unit__stat-col--left super-compact">
+              <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
+            </div>
+            <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-right compact-4"><b>&nbsp;</b></div>
+            <div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?php print __('Accounts');?></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center compact-2"><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 class="clearfix l-unit__stat-col--left text-center compact-3"><b><?php print __('SSL');?></b></div>
+          </div>
+        </div>
 
       <?
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
@@ -89,22 +87,14 @@
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="mail"
 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>
-        <!-- /.l-unit-toolbar -->
             <div class="l-unit__col l-unit__col--right">
               <div>
                   <div class="clearfix l-unit__stat-col--left super-compact">
-                      <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
-                      
-                    </div>
+                    <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
+                  </div>
                   <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="?domain=<?=$key?>"><?=$key?></a></b></div>
-
-
-                  <div class="clearfix l-unit__stat-col--left text-right compact-4"><b>
-                    <!-- START QUICK ACTION TOOLBAR AREA -->
-
-                      <!-- l-unit-toolbar__col -->
+                  <!-- START QUICK ACTION TOOLBAR AREA -->
+                  <div class="clearfix l-unit__stat-col--left text-right compact-4">
                       <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                           <div class="actions-panel clearfix">
                             <div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>"><i class="fas fa-plus-circle status-icon-green status-icon-dim"></i></a></div>
@@ -130,15 +120,10 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                                 </div>
                               </a>
                             </div>
-              
                           </div>
-                          <!-- /.actiona-panel -->
                         </div>
-
-                      <!-- END QUICK ACTION TOOLBAR AREA -->
-                  </b></div>
-
-
+                  </div>
+                  <!-- END QUICK ACTION TOOLBAR AREA -->
                   <div class="clearfix l-unit__stat-col--left text-center compact-2"><b>
                     <? if($data[$key]['ACCOUNTS']) { echo '<span>'.$data[$key]['ACCOUNTS'].'</span>'; ?>
                     <? } else {?>
@@ -183,13 +168,8 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                   </div>
               </div>
             </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
       <?}?>
-
     </div>
 
 

web/templates/admin/list_mail_acc.html

@@ -45,14 +45,12 @@
               </td>
             </tr>
           </table>
-          <!--  -->
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
+
     <div class="l-center units animated fadeIn">
         <div class="header table-header">     
             <div class="l-unit__col l-unit__col--right step-top">
@@ -71,7 +69,6 @@
             </div>
           </div>
 
-
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -90,57 +87,47 @@
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo ' l-unit--starred'; ?>"
  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>
-        <!-- /.l-unit-toolbar -->
             <div class="l-unit__col l-unit__col--right">
-              <div>
-                  <div class="clearfix l-unit__stat-col--left super-compact">
-                      <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" />
-                    </div>
-                  <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>"><?=$key."@".$_GET['domain']?></a></b></div>
-
-
-                  <div class="clearfix l-unit__stat-col--left text-right compact-4"><b>
-                    <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left super-compact">
+                <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" />
+              </div>
+              <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>"><?=$key."@".$_GET['domain']?></a></b></div>
 
-                      <!-- l-unit-toolbar__col -->
-                      <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                          <div class="actions-panel clearfix">
-                            <div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>&&_action=login" target="_blank"><i class="fas fa-envelope-open-text status-icon-maroon status-icon-dim"></i></div>
-                            <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left text-right compact-4">
+                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                  <div class="actions-panel clearfix">
+                    <div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>&&_action=login" target="_blank"><i class="fas fa-envelope-open-text status-icon-maroon status-icon-dim"></i></div>
+                    <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
 
-                            <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
-                              <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                                <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
-                                <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?php echo $key ?>&token=<?=$_SESSION['token']?>" />
-                                <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
-                                  <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
-                                </div>
-                              </a>
-                            </div>
-                            <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                              <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                                <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
-                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                                <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                                  <p class="confirmation"><?=__('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key)?></p>
-                                </div>
-                              </a>
-                            </div>
-              
-                          </div>
-                          <!-- /.actiona-panel -->
+                    <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
+                      <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
+                        <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                        <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?php echo $key ?>&token=<?=$_SESSION['token']?>" />
+                        <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
+                          <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
                         </div>
+                      </a>
+                    </div>
+                    <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                    <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                      <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                        <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                        <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                          <p class="confirmation"><?=__('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key)?></p>
+                        </div>
+                      </a>
+                    </div>
+                  </div>
+                </div>
+             </div>
 
-                      <!-- END QUICK ACTION TOOLBAR AREA -->
-                  </b></div>
-
+            <!-- END QUICK ACTION TOOLBAR AREA -->
 
-                  <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>
+            <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
@@ -155,8 +142,8 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                         <? } ?>
                       <? } ?>
                     </b>
-                  </div>
-                  <div class="clearfix l-unit__stat-col--left text-center"><b>
+              </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>
@@ -171,8 +158,8 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                           <? } ?>
                        <? } ?>
                     </b>
-                  </div>
-                  <div class="clearfix l-unit__stat-col--left text-center"><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>
@@ -187,14 +174,9 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                           <? } ?>
                           <? } ?>
                     </b>
-                  </div>
-               </div>
-             </div>
-        <!-- /.l-unit__col -->
+                </div>
+            </div>
       </div>
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
       <?}?>
     </div>
 

web/templates/admin/list_rrd.html

@@ -32,18 +32,10 @@
             </tr>
           </table>
         </div>
-        <!-- div class="l-sort-toolbar clearfix">
-          <table>
-            <tr>
-            </tr>
-          </table>
-        </div -->
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center units animated fadeIn">
       <?php
@@ -56,9 +48,6 @@
         foreach ($data as $key => $value) {
       ?>
 
-
-
-
       <div class="l-unit">
         <div class="l-unit-toolbar clearfix">
          <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
@@ -67,32 +56,21 @@
                 <a href="/list/rrd/image.php?/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>" target="_blank"><?=__('download')?> <i></i></a>
               </div>
             </div>
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
 
-        <div class="l-unit__col l-unit__col--left clearfix">
-        </div>
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__name separate">
             <?= __($data[$key]['TITLE'])?>
           </div>
 
-
-
          <div class="l-unit__stats">
             <img src="/list/rrd/image.php?/rrd/<?=$data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>">
          </div>
-          <!-- /.l-unit__stats -->
+
         </div>
-        <!-- /.l-unit__col -->
+
       </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div -->
-      <!-- /.l-separator -->
       <?}?>
 
     </div>

web/templates/admin/list_services.html

@@ -28,27 +28,13 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
-
-    <div class="l-center units animated fadeIn">
-
-    
-    <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
+  
     <div class="l-center units animated fadeIn">
 
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
-        <div class="l-unit-toolbar clearfix">
-         </div>
-        <!-- /.l-unit-toolbar -->
-
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right server-info">
           <div class="icon-server-info"><i class="fas fa-server"></i></div>
           <div class="l-unit__name separate server-info-name"><?=$sys['sysinfo']['HOSTNAME']?></div>
@@ -77,28 +63,25 @@
                   </div>
                 </td>
               </tr>
-
              </table>
            </div>
-          <!-- /.l-unit__stats -->
          </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-          <div class="table-header"> 
-              <div class="l-unit__col l-unit__col--right">
-                    <div class="clearfix l-unit__stat-col--left super-compact">
-                        <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                      </div>
+
+      <div class="table-header"> 
+        <div class="l-unit__col l-unit__col--right">
+        <div class="clearfix l-unit__stat-col--left super-compact">
+          <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
+        </div>
                     
-                      <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Service');?></b></div>
-                      <div class="clearfix l-unit__stat-col--left text-right compact-2">&nbsp;</div>
-                      <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Description');?></b></div>
-                      <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Uptime');?></b></div>
-                      <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('CPU');?></b></div>
-                      <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Memory');?></b></div>
-               </div>
-            </div>
+        <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Service');?></b></div>
+        <div class="clearfix l-unit__stat-col--left text-right compact-2">&nbsp;</div>
+        <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Description');?></b></div>
+        <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Uptime');?></b></div>
+        <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('CPU');?></b></div>
+        <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Memory');?></b></div>
+      </div>
+    </div>
 
       <?php
         foreach ($data as $key => $value) {
@@ -116,31 +99,24 @@
           if ($cpu == '0.0')  $cpu = 0;
       ?>
 
-
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
-
-        <div class="l-unit__col l-unit__col--right">
-        <div class="clearfix l-unit__stat-col--left super-compact">
-          <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="service[]" value="<?php echo $key ?>">
-        </div>
-
-        <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/server/<? echo $key ?>/"><?=$key?></a></b></div>
-        <div class="clearfix l-unit__stat-col--left text-center compact-2">
-            <b>
-                <a href="/edit/server/<? echo $key ?>/"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim icon-large"></i></a>
-                <a href="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="data-controls fas fa-undo status-icon-highlight status-icon-dim icon-large"></i></a>
-                <a href="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pause status-icon-red status-icon-dim icon-large"></i></a>
-            </b>
+        <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+          <div class="l-unit__col l-unit__col--right">
+          <div class="clearfix l-unit__stat-col--left super-compact">
+            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="service[]" value="<?php echo $key ?>">
           </div>
-        <div class="clearfix l-unit__stat-col--left wide-3"><?=__($data[$key]['SYSTEM'])?></div>
-        <div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_time($data[$key]['RTIME'])?></b></div>
-        <div class="clearfix l-unit__stat-col--left text-center"><b><?=$cpu?></b></div>
-        <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['MEM']?> <?=__('mb')?></b></div>
-
+          <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/server/<? echo $key ?>/"><?=$key?></a></b></div>
+          <div class="clearfix l-unit__stat-col--left text-center compact-2">
+                  <a href="/edit/server/<? echo $key ?>/"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim icon-large"></i></a>
+                  <a href="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="data-controls fas fa-undo status-icon-highlight status-icon-dim icon-large"></i></a>
+                  <a href="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pause status-icon-red status-icon-dim icon-large"></i></a>
             </div>
-          </div>
+          <div class="clearfix l-unit__stat-col--left wide-3"><?=__($data[$key]['SYSTEM'])?></div>
+          <div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_time($data[$key]['RTIME'])?></b></div>
+          <div class="clearfix l-unit__stat-col--left text-center"><b><?=$cpu?></b></div>
+          <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['MEM']?> <?=__('mb')?></b></div>
+        </div>
+      </div>
       <?}?>
-
     </div>
 
     <div id="vstobjects">

web/templates/admin/list_stats.html

@@ -2,8 +2,7 @@
       <div class="l-sort clearfix noselect">
           <div class="l-unit-toolbar__buttonstrip">
               <a class="ui-button cancel" href='/list/stats/'><i class="fas fa-info-circle status-icon-lightblue"></i> <?=__('Overall Statistics')?></a>
-
-            </div>
+          </div>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -31,82 +30,58 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <div class="l-center units narrow animated fadeIn">
-        <div class="header table-header">      
-            <div class="l-unit__col l-unit__col--right step-top">
-                  <div class="clearfix l-unit__stat-col--left super-compact">&nbsp;</div>
-                  <div class="clearfix l-unit__stat-col--left wide-2"><b><i class="fas fa-calendar-alt"></i>&nbsp;&nbsp;&nbsp;<?php print __('Month');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?php print __('IPs');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-hdd"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-exchange-alt"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe-americas"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-link"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-lock"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-atlas"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-mail-bulk"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-inbox"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-database"></i></b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-clock"></i></b></div>
-              </div>
-          </div>
-    <!-- /.l-separator -->
 
+    <div class="l-center units narrow animated fadeIn">
+      <div class="header table-header">      
+        <div class="l-unit__col l-unit__col--right step-top">
+            <div class="clearfix l-unit__stat-col--left super-compact">&nbsp;</div>
+            <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Month');?></b></div>
+            <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?php print __('IPs');?></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-hdd"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-exchange-alt"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe-americas"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-link"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-lock"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-atlas"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-mail-bulk"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-inbox"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-database"></i></b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-clock"></i></b></div>
+         </div>
+        </div>
+      </div>
 
-    <div class="l-center units animated fadeIn">
-      
+    <div class="l-center animated fadeIn">
       <?php
         foreach ($data as $key => $value) {
            ++$i;
       ?>
-
-      <div class="l-unit <? if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="stats-<?=sha1($key)?>">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-          </div>
-          <!-- l-unit-toolbar__col -->
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
-            <div class="actions-panel clearfix">
-            </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
-        </div>
-        <!-- /.l-unit-toolbar -->
-
-        <!-- /.l-unit__col -->
-
-        <div class="l-unit__col l-unit__col--right">
-            <div>
-                <div class="clearfix l-unit__stat-col--left super-compact">&nbsp;</div>
-                <div class="clearfix l-unit__stat-col--left wide-2"><b><i class="fas fa-calendar-alt"></i>&nbsp;&nbsp;&nbsp;<?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?></b></div>
-                <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
-                <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?=$data[$key]['IP_OWNED']?></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 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 super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_WEB_DOMAINS']?></b></span></div>
-                <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_WEB_ALIASES']?></span></div>
-                <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_WEB_SSL']?></b></span></div>
-                <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_DNS_DOMAINS']?></b></span></div>
-                <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_DNS_RECORDS']?></span></div>
-                <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_MAIL_DOMAINS']?></b></span></div>
-                <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_MAIL_ACCOUNTS']?></span></div>
-                <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_DATABASES']?></b></span></div>
-                <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_CRON_JOBS']?></b></span></div>
-          </div>
-          <!-- /.l-unit__stats -->
-        </div>
-        <!-- /.l-unit__col -->
-      </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div -->
-      <!-- /.l-separator -->
+        <div class="l-unit <? if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="stats-<?=sha1($key)?>">
+          <div class="l-unit__col l-unit__col--right">
+            <div class="clearfix l-unit__stat-col--left super-compact"><i class="fas fa-calendar-alt"></i></div>
+            <div class="clearfix l-unit__stat-col--left wide-2"><b><?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?></b></div>
+            <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?=$data[$key]['IP_OWNED']?></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 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 super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_WEB_DOMAINS']?></b></span></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_WEB_ALIASES']?></span></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_WEB_SSL']?></b></span></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_DNS_DOMAINS']?></b></span></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_DNS_RECORDS']?></span></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_MAIL_DOMAINS']?></b></span></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_MAIL_ACCOUNTS']?></span></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_DATABASES']?></b></span></div>
+            <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_CRON_JOBS']?></b></span></div>
+           </div>
+         </div>
       <?}?>
+    </div>
 
     </div>
 
@@ -115,7 +90,6 @@
     <div class="l-center">
         <div class="l-unit-ft">
           <table class='data'></table>
-          <!-- /form -->
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php

web/templates/admin/list_updates.html

@@ -26,12 +26,9 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center units animated fadeIn">
         <div class="header table-header">    
@@ -63,32 +60,20 @@
       ?>
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--outdated';?>">
         <div class="l-unit-toolbar clearfix">
-          <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <div class="actions-panel clearfix">
-              <? if ($data[$key]['UPDATED'] == 'no') {
-                   echo '<div class="actions-panel__col actions-panel__update shortcut-u" key-action="href"><a href="/update/hestia/?pkg='.$key.'&token='.$_SESSION['token'].'">'.__('update').'<i></i></a><span class="shortcut">&nbsp;U</span></div>';
-                 }
-              ?>
-            </div>
-            <!-- /.actiona-panel -->
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
-        <!-- /.l-unit-toolbar -->
-        <!-- /.l-unit__col -->
+
         <div class="l-unit__col l-unit__col--right">
             <div>
                 <div class="clearfix l-unit__stat-col--left super-compact">
                   <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="pkg[]" value="<?php echo $key ?>">
-                  
                 </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>
-                
+              <div class="clearfix l-unit__stat-col--left text-center">
                   <? if ($data[$key]['UPDATED'] == 'no') {
                     echo '
                     <i class="fas fa-exclamation-triangle" style="color: orange;"></i>
@@ -101,16 +86,11 @@
                     ';
                   }
                   ?>
-              </b></div>
+            </div>
           </div>
-          <!-- /.l-unit__stats -->
         </div>
-        <!-- /.l-unit__col -->
       </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div -->
-      <!-- /.l-separator -->
-      <?}?>
+     <?}?>
 
     </div>
 

web/templates/admin/list_user.html

@@ -22,7 +22,7 @@
             <tr>
               <td class="sort-by">
                   <?=__('sort by');?>: <span><b><?=__('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
-                </td>
+              </td>
               <td>
                 <form action="/bulk/user/" method="post" id="objects">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -43,28 +43,23 @@
                   </div>
                   <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
-
             </tr>
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
 
-    <!-- /.l-separator --> 
     <div class="l-center units animated fadeIn">
         <div class="table-header"> 
-      
             <div class="l-unit__col l-unit__col--right">
                   <div class="clearfix l-unit__stat-col--left super-compact">
-                      <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                    </div>
-                  
+                    <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
+                  </div>
                   <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Name');?></b></div>
                   <div class="clearfix l-unit__stat-col--left compact-3"><b>&nbsp;</b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?php print __('Package');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Package');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?php print __('IPs');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-hdd"></i></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-exchange-alt"></i></b></div>
@@ -94,8 +89,6 @@
       <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred';?>" v_section="user"
 v_unit_id="<?=$key?>" 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['favourites']['USER'][$key] == 1) echo '1'; else echo '0'; ?>">
-      
-<!-- /.l-unit-toolbar -->
         <div class="l-unit__col l-unit__col--right">
           <div class="clearfix l-unit__stat-col--left super-compact">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
@@ -104,10 +97,8 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                 <br />
                 <span style="font-size: 0.8rem;"><b><?=__('Email')?>:</b> <?=$data[$key]['CONTACT']?></span>
               </div>
-              <div class="clearfix l-unit__stat-col--left text-right compact-3"><b>
-                  <!-- START QUICK ACTION TOOLBAR AREA -->
-
-                    <!-- l-unit-toolbar__col -->
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left text-right compact-3">
                     <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                         <div class="actions-panel clearfix">
                             <?
@@ -118,7 +109,6 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                               ?>
                               <a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-sign-in-alt status-icon-green status-icon-dim icon-large"></i></a>
                             <?}?>
-                            
                           <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></div>
                           <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
                             <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
@@ -138,14 +128,11 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                               </div>
                             </a>
                           </div>
-            
                         </div>
-                        <!-- /.actiona-panel -->
                       </div>
-                      <!-- l-unit-toolbar__col -->
-                    <!-- END QUICK ACTION TOOLBAR AREA -->
-                </b></div>
-              <div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?=$data[$key]['PACKAGE']?></b></div>
+              </div>
+              <!-- END QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['PACKAGE']?></b></div>
               <div class="clearfix l-unit__stat-col--left text-center super-compact"><?=$data[$key]['IP_OWNED']?></div>
               <div class="clearfix l-unit__stat-col--left text-center super-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 compact"><b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?></span></div>
@@ -157,12 +144,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
               <div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><?=$data[$key]['U_BACKUPS']?></span></div>
           </div>
          </div>
-       <!-- /.l-unit__col -->
-     <!-- /.l-unit -->
-     <!--div class="l-separator"></div-->
-     <!-- /.l-separator -->
       <?}?>
-
     </div>
 
     <div id="vstobjects">
@@ -170,7 +152,6 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
     <div class="l-center">
         <div class="l-unit-ft">
           <table class='data'></table>
-          <!-- /form -->
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php

web/templates/admin/list_web.html

@@ -39,32 +39,27 @@
               </td>
             </tr>
           </table>
-          <!--  -->
         </div>
-        <!-- /.l-sort -->
       </div>
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
+
     <div class="l-center units narrow animated fadeIn">
         <div class="header table-header">      
             <div class="l-unit__col l-unit__col--right step-top">
-              <div>
-                  <div class="clearfix l-unit__stat-col--left super-compact">
-                      <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                    </div>
-                  <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Domain');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-5 text-right"><b>&nbsp;</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 class="clearfix l-unit__stat-col--left super-compact">
+                  <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
+                </div>
+                <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Domain');?></b></div>
+                <div class="clearfix l-unit__stat-col--left compact-5 text-right"><b>&nbsp;</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;
@@ -130,113 +125,100 @@
 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>
-          <div class="l-unit__col l-unit__col--right">
-                <div>
-              <div class="clearfix l-unit__stat-col--left super-compact">
-                <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?=$key?>">
+      <div class="l-unit__col l-unit__col--right">
+          <div class="clearfix l-unit__stat-col--left super-compact">
+              <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?=$key?>">
+          </div>
+          <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/web/?domain=<?=$key?>" alt="<?=__('Edit')?>"><?=$key?></a></b></div>
+          <!-- START QUICK ACTION TOOLBAR AREA -->
+          <div class="clearfix l-unit__stat-col--left compact-5 text-right">
+            <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+              <div class="actions-panel clearfix">
+                <div class="actions-panel__col actions-panel__view" key-action="href"><a href="http://<?=$key?>/" target="_blank"><i class="fas fa-external-link-square-alt status-icon-lightblue status-icon-dim"></i></div>
+                <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/web/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></div>
+                <div class="actions-panel__col actions-panel__logs shortcut-l" key-action="href"><a href="/list/web-log/?domain=<?php echo $key ?>&type=access#"><i class="fas fa-binoculars status-icon-purple status-icon-dim"></i></a></div>
+                <? if (!empty($data[$key]['STATS'])) { ?>
+                  <div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$key?>/vstats/"  target="_blank"><i class="fas fa-chart-bar status-icon-maroon status-icon-dim"></i></a></div>
+                <? } ?>
+                <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
+                  <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
+                    <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
+                    <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                    <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
+                      <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
+                    </div>
+                  </a>
+                </div>
+                <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                  <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                    <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                    <input type="hidden" name="delete_url" value="/delete/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                    <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                      <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
+                    </div>
+                  </a>
+                </div>
               </div>
-                  <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/web/?domain=<?=$key?>" alt="<?=__('Edit')?>"><?=$key?></a></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-5 text-right"><b>
-                    <!-- START QUICK ACTION TOOLBAR AREA -->
-
-                      <!-- l-unit-toolbar__col -->
-                      <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                          <div class="actions-panel clearfix">
-                            <div class="actions-panel__col actions-panel__view" key-action="href"><a href="http://<?=$key?>/" target="_blank"><i class="fas fa-external-link-square-alt status-icon-lightblue status-icon-dim"></i></div>
-                            <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/web/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></div>
-                            <div class="actions-panel__col actions-panel__logs shortcut-l" key-action="href"><a href="/list/web-log/?domain=<?php echo $key ?>&type=access#"><i class="fas fa-binoculars status-icon-purple status-icon-dim"></i></a></div>
-                            <? if (!empty($data[$key]['STATS'])) { ?>
-                                <div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$key?>/vstats/"  target="_blank"><i class="fas fa-chart-bar status-icon-maroon status-icon-dim"></i></a></div>
-                            <? } ?>
-                            <div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
-                              <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                                <i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
-                                <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                                <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
-                                  <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
-                                </div>
-                              </a>
-                            </div>
-                            <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                              <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                                <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
-                                <input type="hidden" name="delete_url" value="/delete/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                                <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                                  <p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
-                                </div>
-                              </a>
-                            </div>
-              
-                          </div>
-                          <!-- /.actiona-panel -->
-                        </div>
-                        <!-- l-unit-toolbar__col -->
-
-
-                      <!-- END QUICK ACTION TOOLBAR AREA -->
-                  </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>
-                  <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 {?>
+            </div>
+          </div>
+          <!-- END QUICK ACTION TOOLBAR AREA -->
+          <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>
+          <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"></i>
+                          <i class="fas fa-check-circle status-icon-green"></i>
                         <? } ?>
+                    <? } else {?>
+                      <? if($web_stats == 'no'){ ?>
+                        <i class="fas fa-minus-circle"></i>
+                      <? } else {?>
+                        <i class="fas fa-check-circle"></i>
                       <? } ?>
-                      </b>
-                   </div>
-                  </div>
-                </div>
-             </div>
-           <!-- /.l-unit__col -->
-         <!-- /.l-unit -->
-         <!--div class="l-separator"></div-->
-         <!-- /.l-separator -->
-         <?}?>
-       </div>
-
-    <div id="vstobjects">
-      <div class="l-separator"></div>
-      <div class="l-center">
-        <div class="l-unit-ft">
-          <table class='data'></table>
-          <div class="l-unit__col l-unit__col--left clearfix"></div>
-          <div class="data-count l-unit__col l-unit__col--right clearfix">
-            <?php
-              if ( $i == 1) {
-                echo __('1 web domain');
-              } else {
-                echo __('%s web domains',$i);
-              }
-            ?>
+                    <? } ?>
+                  </b>
           </div>
-        </div>
       </div>
     </div>
+  <?}?>
+</div>
+
+<div id="vstobjects">
+    <div class="l-separator"></div>
+<div class="l-center">
+    <div class="l-unit-ft">
+      <table class='data'></table>
+      <div class="l-unit__col l-unit__col--left clearfix"></div>
+      <div class="data-count l-unit__col l-unit__col--right clearfix">
+        <?php
+          if ( $i == 1) {
+            echo __('1 month');
+          } else {
+            echo __('%s months',$i);
+          }
+        ?>
+      </div>
+  </div>
+</div>
+</div>