Przeglądaj źródła

Merge branch 'winterfell-quickactions' into webui-refresh-winterfell

Kristan Kenney 6 lat temu
rodzic
commit
3e66d104c8

+ 34 - 0
bin/v-delete-user-log

@@ -0,0 +1,34 @@
+#!/bin/bash
+# info: Delete log file for user
+#
+# The function for deleting a users log file
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument definition
+user=$1
+date=$(date "+%F %T")
+
+# Includes
+source $HESTIA/func/main.sh
+source $HESTIA/conf/hestia.conf
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Remove log file
+if [ -z $user ]; then
+    echo "Error: no user specified."
+elif [ ! -f "$HESTIA/data/users/$user/history.log" ]; then
+    echo "Error: no history log found for $user."
+else
+    rm -f $HESTIA/data/users/$user/history.log
+fi
+
+log_history "======== Log for $user cleared on $date ========"
+log_event "$OK" "$ARGUMENTS"
+
+exit

+ 80 - 427
web/css/styles.min.css

@@ -823,9 +823,6 @@ a {
   z-index: 99;
 }
 
-input[type="checkbox"] {
-  display: none;
-}
 .clicked-on.check-label:before,
 .selected .check-label:before {
   content: '';
@@ -1396,7 +1393,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
 
 .l-sort-toolbar td:nth-of-type(2) {
 /* ///  padding-right: 60px;*/
-  padding-right: 20px;
 }
 .l-sort-toolbar td:last-of-type {
 /* ///  padding-left: 40px; */
@@ -1558,7 +1554,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 
 .l-unit {
   color: #707070;
-  padding: 0 0 0 24px;
+  padding: 0 0 0 14px;
   overflow: hidden;
   font-size: 0.8rem;
   border-radius: 0;
@@ -1706,7 +1702,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
   background-color: #d1eddc;
 }
 .l-unit-toolbar{
-  height: 39px;
+  display: none;
 }
 
 .l-unit label {
@@ -1718,8 +1714,9 @@ div.l-content > div.l-separator:nth-of-type(4) {
 }
 .l-unit__col {
   display: table-cell;
-  padding-top: 1px;
+  padding-top: 15px;
   vertical-align: top;
+  padding-bottom: 15px;
 }
 .l-unit__col--left {
   width: 100px;
@@ -1843,7 +1840,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 }
 
 .l-unit__stats {
-  margin-bottom: 50px;
+  margin-bottom: 10px;
 }
 
 .l-unit__stats table {
@@ -1866,7 +1863,21 @@ div.l-content > div.l-separator:nth-of-type(4) {
   float: left;
   width: 110px;
 }
+
+
+.l-unit__stat-col--left.border {
+  border-left: 1px solid #ebebeb;
+}
+.l-unit__stat-col--left.border-clear {
+  border-left: 1px solid transparent;
+}
+.l-unit__stat-col--left.super-compact {
+  width: 50px;
+}
 .l-unit__stat-col--left.compact {
+  width: 60px;
+}
+.l-unit__stat-col--left.compact-1 {
   width: 70px;
 }
 .l-unit__stat-col--left.compact-2 {
@@ -1875,6 +1886,12 @@ div.l-content > div.l-separator:nth-of-type(4) {
 .l-unit__stat-col--left.compact-3 {
   width: 90px;
 }
+.l-unit__stat-col--left.compact-4 {
+  width: 130px;
+}
+.l-unit__stat-col--left.compact-5 {
+  width: 160px;
+}
 .l-unit__stat-col--left.wide {
   width: 190px;
 }
@@ -1887,10 +1904,12 @@ div.l-content > div.l-separator:nth-of-type(4) {
 .l-unit__stat-col--left.wide-4 {
   width: 550px;
 }
-
 .l-unit__stat-col--left.wide-5 {
   width: 330px;
 }
+.l-unit__stat-col--left.wide-6 {
+  width: 440px;
+}
 
 .l-unit__stat-col--left.small-2 {
   line-height: 11px;
@@ -1919,11 +1938,11 @@ div.l-content > div.l-separator:nth-of-type(4) {
   padding-top: 15px;
   width: 30px;
   cursor: pointer;
+  display: none;
 }
 
 .l-unit-toolbar__col--right {
   float: right;
-  display: none;
 }
 
 body.mobile .l-unit-toolbar__col--right {
@@ -1972,440 +1991,34 @@ body.mobile .l-unit-toolbar__col--right {
 }
 
 .actions-panel__col {
-  float: left;
-  min-width: 95px;
-  min-height: 31px;
-  text-transform: uppercase;
-  background-color: #dfdedd;
-  border-right: 1px solid #d8d7d7;
-  position: relative;
-}
-.selected .actions-panel__col {
-  -webkit-filter: contrast(80%);
-  filter: contrast(80%);
-}
-.actions-panel__col i {
   display: inline-block;
-  float: right;
-  content: '';
-  width: 31px;
-  height: 31px;
-  position: absolute;
-  top: 0;
-  right: 0;
+  min-width: 18px;
+  text-transform: uppercase;
 }
+
 .actions-panel__col a {
-  line-height: 31px;
   color: #777;
   font-weight: 600;
-  font-size: 0.8rem;
-  padding-left: 13px;
-  display: block;
+  font-size: 0.9rem;
+  display: inline-block;
   cursor: pointer;
-  position: relative;
-  padding-right: 36px;
 }
+
 .lang-ru .actions-panel__col a {
-  font-size: 0.8rem;
+  font-size: 0.9rem;
   padding-top: 1px;
 }
 .lang-tw .actions-panel__col a {
-  font-size: 0.85rem;
+  font-size: 0.9rem;
   font-weight: normal;
   line-height: 29px;
 }
 .lang-ar .actions-panel__col a {
-  font-size: 0.85rem;
+  font-size: 0.9rem;
   font-weight: normal;
   line-height: 31px;
 }
 
-
-.actions-panel__favorite a {
-  background-color: #afafac;
-  color: #fff;
-}
-.actions-panel__favorite i {
-  background-position: -39px -85px;
-}
-
-.actions-panel__edit i {
-  background-position: -1px -169px;
-}
-.actions-panel__edit:hover a {
-  background-color: #3b9de8;
-  color: #fff;
-}
-.actions-panel__edit:active a {
-  background-color: #54a6e5;
-  color: #4b4b4b;
-}
-.actions-panel__edit:hover a i {
-  background-position: -41px -169px;
-}
-.actions-panel__edit:active a i {
-  background-position: -81px -169px;
-}
-.actions-panel__edit--active a {
-  background-color: #54a6e5;
-  color: #fff;
-}
-.actions-panel__edit--active i {
-  background-position: -78px -169px;
-}
-
-.actions-panel__restart i {
-  background-position: -1px -520px;
-}
-.actions-panel__restart:hover a {
-  background-color: #3b9de8;
-  color: #fff;
-}
-.actions-panel__restart:active a {
-  background-color: #54a6e5;
-  color: #4b4b4b;
-}
-.actions-panel__restart:hover a i {
-  background-position: -41px -520px;
-}
-.actions-panel__restart:active a i {
-  background-position: -81px -520px;
-}
-.actions-panel__restart--active a {
-  background-color: #54a6e5;
-  color: #fff;
-}
-.actions-panel__restart--active i {
-  background-position: -78px -520px;
-}
-
-.actions-panel__add i {
-  background-position: -1px -285px;
-}
-.actions-panel__add:hover a {
-  background-color: #3b9de8;
-  color: #fff;
-}
-.actions-panel__add:active a {
-  background-color: #54a6e5;
-  color: #4b4b4b;
-}
-.actions-panel__add:hover a i {
-  background-position: -41px -285px;
-}
-.actions-panel__add:active a i {
-  background-position: -81px -285px;
-}
-
-.actions-panel__add--active a {
-  background-color: #54a6e5;
-  color: #fff;
-}
-.actions-panel__add--active i {
-  background-position: -78px -285px;
-}
-
-.actions-panel__update i {
-  background-position: -1px -481px;
-}
-.actions-panel__update:hover a {
-  background-color: #3b9de8;
-  color: #fff;
-}
-.actions-panel__update:active a {
-  background-color: #54a6e5;
-  color: #4b4b4b;
-}
-.actions-panel__update:hover a i {
-  background-position: -41px -481px;
-}
-.actions-panel__update:active a i {
-  background-position: -81px -481px;
-}
-.actions-panel__update--active a {
-  background-color: #54a6e5;
-  color: #fff;
-}
-.actions-panel__update--active i {
-  background-position: -78px -481px;
-}
-
-.actions-panel__logs i {
-  background-position: -2px -130px;
-}
-.actions-panel__logs:hover a {
-  background-color: #afafac;
-  color: #fff;
-}
-.actions-panel__logs:active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__logs:hover a i {
-  background-position: -42px -130px;
-}
-.actions-panel__logs:active a i {
-  background-position: -82px -130px;
-}
-.actions-panel__logs--active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__logs--active i {
-  background-position: -79px -130px;
-}
-
-.actions-panel__db i {
-  background-position: -2px -363px;
-}
-.actions-panel__db:hover a {
-  background-color: #afafac;
-  color: #fff;
-}
-.actions-panel__db:active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__db:hover a i {
-  background-position: -42px -363px;
-}
-.actions-panel__db:active a i {
-  background-position: -82px -363px;
-}
-.actions-panel__db--active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__db--active i {
-  background-position: -79px -362px;
-}
-
-.actions-panel__suspend i {
-  background-position: -1px -51px;
-}
-.actions-panel__suspend:hover a {
-  background-color: #afafac;
-  color: #fff;
-}
-.actions-panel__suspend:active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__suspend:hover a i {
-  background-position: -41px -51px;
-}
-.actions-panel__suspend:active a i {
-  background-position: -81px -51px;
-}
-.actions-panel__suspend--active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__suspend--active i {
-  background-position: -78px -51px;
-}
-
-.actions-panel__unsuspend i {
-  background-position: -1px -12px;
-}
-.actions-panel__unsuspend:hover a {
-  background-color: #afafac;
-  color: #fff;
-}
-.actions-panel__unsuspend:active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__unsuspend:hover a i {
-  background-position: -41px -12px;
-}
-.actions-panel__unsuspend:active a i {
-  background-position: -81px -12px;
-}
-.actions-panel__unsuspend--active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__unsuspend--active i {
-  background-position: -78px -12px;
-}
-
-
-.actions-panel__loginas i {
-  background-position: -1px -245px;
-}
-.actions-panel__loginas:hover a {
-  background-color: #afafac;
-  color: #fff;
-}
-.actions-panel__loginas:active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__loginas:hover a i {
-  background-position: -41px -245px;
-}
-.actions-panel__loginas:active a i {
-  background-position: -81px -245px;
-}
-.actions-panel__loginas--active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__loginas--active i {
-  background-position: -78px -245px;
-}
-
-.actions-panel__download i {
-  background-position: -1px -402px;
-}
-.actions-panel__download:hover a {
-  background-color: #3b9de8;
-  color: #fff;
-}
-.actions-panel__download:active a {
-  background-color: #54a6e5;
-  color: #4b4b4b;
-}
-.actions-panel__download:hover a i {
-  background-position: -41px -402px;
-}
-.actions-panel__download:active a i {
-  background-position: -81px -402px;
-}
-.actions-panel__download--active a {
-  background-color: #54a6e5;
-  color: #fff;
-}
-.actions-panel__download--active i {
-  background-position: -78px -402px;
-}
-
-.actions-panel__configure i {
-  background-position: -1px -442px;
-}
-.actions-panel__configure:hover a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__configure:active a {
-  background-color: #afafac;
-  color: #fff;
-}
-.actions-panel__configure:hover a i {
-  background-position: -81px -442px;
-}
-.actions-panel__configure:active a i {
-  background-position: -41px -442px;
-}
-.actions-panel__configure--active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__configure--active i {
-  background-position: -78px -442px;
-}
-
-.actions-panel__.l-icon-starmail i {
-  background-position: -1px -324px;
-}
-.actions-panel__mail:hover a {
-  background-color: #afafac;
-  color: #fff;
-}
-.actions-panel__mail:active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__mail:hover a i {
-  background-position: -41px -324px;
-}
-.actions-panel__mail:active a i {
-  background-position: -81px -324px;
-}
-.actions-panel__mail--active a {
-  background-color: #55c9c0;
-  color: #fff;
-}
-.actions-panel__mail--active i {
-  background-position: -78px -324px;
-}
-
-.actions-panel__delete i {
-  background-position: -1px -207px;
-}
-.actions-panel__delete:hover a {
-  background-color: #ff3438;
-  color: #fff;
-}
-.actions-panel__delete:active a {
-  background-color: #ff5f5f;
-  color: #fff;
-}
-.actions-panel__delete:hover a i {
-  background-position: -41px -207px;
-}
-.actions-panel__delete:active a i {
-  background-position: -81px -207px;
-}
-.actions-panel__delete--active a {
-  background-color: #ff5f5f;
-  color: #fff;
-}
-.actions-panel__delete--active i {
-  background-position: -78px -207px;
-}
-
-.actions-panel__stop i {
-  background-position: -1px -561px;
-}
-.actions-panel__stop:hover a {
-  background-color: #ff3438;
-  color: #fff;
-}
-.actions-panel__stop:active a {
-  background-color: #ff5f5f;
-  color: #fff;
-}
-.actions-panel__stop:hover a i {
-  background-position: -41px -561px;
-}
-.actions-panel__stop:active a i {
-  background-position: -81px -561px;
-}
-.actions-panel__stop--active a {
-  background-color: #ff5f5f;
-  color: #fff;
-}
-.actions-panel__stop--active i {
-  background-position: -78px -561px;
-}
-
-.actions-panel__start i {
-  background-position: -1px -482px;
-}
-.actions-panel__start:hover a {
-  background-color: #3b9de8;
-  color: #fff;
-}
-.actions-panel__start:active a {
-  background-color: #54a6e5;
-  color: #4b4b4b;
-}
-.actions-panel__start:hover a i {
-  background-position: -41px -482px;
-}
-.actions-panel__start:active a i {
-  background-position: -81px -482px;
-}
-.actions-panel__start--active a {
-  background-color: #54a6e5;
-  color: #fff;
-}
-.actions-panel__start--active i {
-  background-position: -78px -482px;
-}
-
 .icon-pad-right {
   margin-right: 5px;
 }
@@ -2715,10 +2328,10 @@ body.mobile .l-icon-shortcuts {
   cursor: pointer;
 }
 .step-top {
-  padding-top: 24px;
+  padding-top: 18px;
 }
 .step-top-small {
-  padding-top: 18px;
+  padding-top: 14px;
 }
 .jump-top {
   margin-top: -60px;
@@ -3060,6 +2673,7 @@ td.hint {
   box-shadow: 0px 1px 3px rgba(0,0,0,0.15),
               inset 0px 0px 1px #fff,
               inset 0px 0px 6px rgba(255,255,255,0.6) !important;
+  transition: 0.2s;
 }
 .ui-button:focus,.ui-button:active,
 .button:active,.button:focus,.ui-button.cancel:focus,.ui-button.cancel:active,
@@ -3123,6 +2737,29 @@ a.button.cancel {
 }
 */
 
+/*
+.ui-button.danger, .button.danger {
+  background: linear-gradient(to bottom, #fbf1ef 0%,#f7c5bf 50%,#f5ada5 51%,#fde2df 100%) !important;
+  color: #F4301A !important;
+  text-shadow: 0px 1px rgba(255,255,255,0.5) !important;
+  border: 1px solid #F4968B !important;
+}
+*/
+
+.ui-button.danger:hover, .button.danger:hover {
+  background: linear-gradient(to bottom, #fbf2f1 0%,#f7cac5 50%,#f6b4ac 51%,#fde6e3 100%) !important;
+  color: #F4301A !important;
+  text-shadow: 0px 1px rgba(255,255,255,0.5) !important;
+  border: 1px solid #F27E71 !important;
+}
+
+.ui-button.danger:active, .button.danger:active, .ui-button.danger:focus, .button.danger:focus {
+  background: linear-gradient(to bottom, #f9e3df 0%,#f5a69d 50%,#f48578 51%,#fcd0ca 100%) !important; 
+  color: #fff !important;
+  text-shadow: 0px -1px 1px rgba(0,0,0,0.3) !important;
+  border: 1px solid #F4301A !important;
+}
+
 .ui-button span {
   color: #fff;
 }
@@ -3812,6 +3449,22 @@ form#vstobjects.suspended {
   filter: none;
 }
 
+.server-info {
+  padding-left: 110px;
+}
+.server-info-data {
+  margin-left: 100px; 
+  margin-top: -20px;
+}
+.server-info-name {
+  margin-top: 10px;
+}
+.icon-server-info {
+  font-size: 5.2em;
+  float: left;
+  margin-right: 32px;
+}
+
 @media screen and (max-width: 950px) {
   .helper-container {
     display: none;

+ 6 - 6
web/inc/i18n/en.php

@@ -29,7 +29,7 @@ $LANG['en'] = array(
     'RESET PASSWORD'  => 'RESET PASSWORD',
     'SEARCH'  => 'SEARCH',
     'PACKAGE'  => 'PACKAGE',
-    'RRD'  => 'RRD',
+    'RRD'  => 'TASK MONITOR',
     'STATS'  => 'STATS',
     'LOG'  => 'LOGS',
     'UPDATES'  => 'UPDATES',
@@ -50,7 +50,7 @@ $LANG['en'] = array(
     'Add Mail Domain'  => 'Add Mail Domain',
     'Add Mail Account'  => 'Add Mail Account',
     'Add Database'  => 'Add Database',
-    'Add Cron Job'  => 'Add Task',
+    'Add Cron Job'  => 'Add Job',
     'Create Backup'  => 'Create Backup',
     'Configure'  => 'Configure',
     'Restore All'  => 'Restore All',
@@ -107,8 +107,8 @@ $LANG['en'] = array(
     'reread IP' => 'Verify IP address',
     'enable autoupdate' => 'Automatic Updates: Off',
     'disable autoupdate' => 'Automatic Updates: On',
-    'turn on notifications' => 'Enable Notifications',
-    'turn off notifications' => 'Disable Notifications',
+    'turn on notifications' => 'Turn on notifications',
+    'turn off notifications' => 'Turn off notifications',
     'configure' => 'Configure',
 
     'Adding User'  => 'Add User',
@@ -124,8 +124,8 @@ $LANG['en'] = array(
     'Adding Mail Account'  => 'Add Mail Account',
     'Editing Mail Account'  => 'Edit Mail Account',
     'Adding database'  => 'Add Database',
-    'Editing Cron Job'  => 'Edit Task',
-    'Adding Cron Job'  => 'Add Task',
+    'Editing Cron Job'  => 'Edit Job',
+    'Adding Cron Job'  => 'Add Job',
     'Editing Database'  => 'Edit Database',
     'Adding Package'  => 'Add Package',
     'Editing Package'  => 'Edit Package',

+ 34 - 33
web/templates/admin/list_backup.html

@@ -39,16 +39,15 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
 
-
     <div class="l-center units animated fadeIn">
         <div class="l-unit 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 style="margin-bottom: 40px;">
+              <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-5"><b><?php print __('File Name');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left compact-3 text-right"><b>&nbsp;</b></div>
                   <div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('Date');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Size');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Type');?></b></div>
@@ -77,39 +76,41 @@
 
       <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 class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('download')?> <i></i></a><span class="shortcut">&nbsp;D</span></div>
-              <div class="actions-panel__col actions-panel__configure shortcut-enter" key-action="href"><a href="/list/backup/?backup=<?=$key?>"><?=__('configure restore settings')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <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>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-            </div>
-            <!-- /.actions-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
 
             <div class="l-unit__col l-unit__col--right">
-              <div style="margin-bottom: 50px;">
-                  <div class="clearfix l-unit__stat-col--left">
+              <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 ?>">
-                      <label for="check<?php echo $i ?>" class="check-label"></label>
+                      
                     </div>
-                  <div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$key?></a></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$key?></a></b></div>
+                  <div class="clearfix l-unit__stat-col--left compact-3 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>
+                
+                            </div>
+                            <!-- /.actiona-panel -->
+                          </div>
+                        <!-- END QUICK ACTION TOOLBAR AREA -->
+                    </b></div>
                   <div class="clearfix l-unit__stat-col--left text-center wide"><b><?=translate_date($data[$key]['DATE'])?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_usage_size($data[$key]['SIZE'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['SIZE'])?></span></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['TYPE']?></div>

+ 1 - 1
web/templates/admin/list_backup_detail.html

@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" href="/list/mail/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
+          <a class="ui-button cancel" href="/list/backup/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
           <a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="ui-button cancel" title="<?=__('Restore All')?>"><i class="fas fa-undo status-icon-green"></i> <?=__('Restore All')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">

+ 67 - 72
web/templates/admin/list_cron.html

@@ -4,9 +4,9 @@
           <a href="/add/cron/" class="ui-button cancel" title="<?=__('Add Cron Job')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Cron Job')?></a>
           <?
             if($panel[$user]['CRON_REPORTS'] == 'yes') {
-              echo '<a class="ui-button cancel" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell-slash status-icon-orange"></i> '.__('turn off notifications').'</a>';
+              echo '<a class="ui-button cancel" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell status-icon-orange"></i> '.__('turn off notifications').'</a>';
             } else {
-              echo '<a class="ui-button cancel" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell status-icon-orange"></i> '.__('turn on notifications').'</a>';
+              echo '<a class="ui-button cancel" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell-slash status-icon-orange"></i> '.__('turn on notifications').'</a>';
             }
           ?>
         </div>
@@ -57,9 +57,21 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
 
-
-
     <div class="l-center units animated fadeIn">
+        <div class="l-unit 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-6"><b><?php print __('Cron Job');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>&nbsp;</b></div>
+                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Min')?></b></div>
+                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Hour')?></b></div>
+                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day')?></b></div>
+                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Month')?></b></div>
+                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day of week')?></b></div>
+             </div>
+          </div>
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -78,76 +90,59 @@
 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 class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
-          <!-- l-unit-toolbar__col -->
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <div class="actions-panel clearfix">
-              <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></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?>">
-                  <?=__($spnd_action)?> <i class="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>
-                <span class="shortcut">&nbsp;S</span>
-              </div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="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>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-
-
-            </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- 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="job[]" value="<?php echo $key ?>">
+                </div>
+              <div class="clearfix l-unit__stat-col--left wide-6"><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 class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?=__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
-        </div>
-        <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate small-2">
-            <a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a>
-          </div>
-          <!-- /.l-unit__name -->
-          <div class="l-unit__stats separate">
-            <div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Min')?><br><b><?=$data[$key]['MIN']?></b></div>
-            <div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Hour')?><br><b><?=$data[$key]['HOUR']?></b></div>
-            <div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Day')?><br><b><?=$data[$key]['DAY']?></b></div>
-            <div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Month')?><br><b><?=$data[$key]['MONTH']?></b></div>
-            <div class="l-unit__stat-col l-unit__stat-col--left tiny"><?=__('Day of week')?><br><b><?=$data[$key]['WDAY']?></b></div>
-          </div>
-
-          <div class="l-unit__stats">
-          </div>
-          <!-- /.l-unit__stats -->
 
-        </div>
-        <!-- /.l-unit__col -->
-      </div>
-      <!-- /.l-unit -->
-      <!--div class="l-separator"></div-->
-      <!-- /.l-separator -->
       <?}?>
 
     </div>
@@ -162,9 +157,9 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
               if ( $i == 1) {
-                echo __('1 task');
+                echo __('1 cron job');
               } else {
-                echo __('%s tasks',$i);
+                echo __('%s cron jobs',$i);
               }
             ?>
           </div>

+ 43 - 43
web/templates/admin/list_db.html

@@ -50,10 +50,6 @@
                   <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
                 </form>
               </td>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td>
                 <form action="/bulk/db/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -82,19 +78,17 @@
     <!-- /.l-separator -->
     <div class="l-center units animated fadeIn">
         <div class="l-unit 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 style="margin-bottom: 40px;">
-                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Database');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left 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-5"><b><?php print __('Database');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-right compact-2"><b>&nbsp;</b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Type');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('Username');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Hostname');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Disk');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Charset');?></b></div>
-              </div>
              </div>
           </div>
           
@@ -125,43 +119,49 @@
 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">
-          <!-- 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 shortcut-enter" key-action="href"><a href="/edit/db/?database=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></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?>">
-                  <?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
-                  <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/db/?database=<?=$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>
-                <span class="shortcut">&nbsp;S</span>
-              </div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="do_delete"></i>
-                  <input type="hidden" name="delete_url" value="/delete/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                  <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                    <p class="confirmation"><?=__('DELETE_DATABASE_CONFIRMATION',$key)?></p>
-                  </div>
-                </a>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-            </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
             <div class="l-unit__col l-unit__col--right">
-              <div style="margin-bottom: 50px;">
-                  <div class="clearfix l-unit__stat-col--left">
+              <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 ?>">
-                      <label for="check<?php echo $i ?>" class="check-label"></label>
+                      
                     </div>
-                  <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/db/?database=<?=$key?>"><?=$key?></a></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-5"><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="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>
+                            <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?>/db/?database=<?=$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/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                                <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                                  <p class="confirmation"><?=__('DELETE_DATABASE_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 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>

+ 46 - 44
web/templates/admin/list_dns.html

@@ -21,10 +21,6 @@
                   <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
                 </form>
               </td>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td>
                 <form action="/bulk/dns/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -54,19 +50,17 @@
 
     <div class="l-center units animated fadeIn">
         <div class="l-unit 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 style="margin-bottom: 40px;">
-                  <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Domain');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left 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-5"><b><?php print __('Domain');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-right"><b>&nbsp;</b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Records');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Template');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('TTL');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center wide"><b><?php print __('SOA');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Expiration Date');?></b></div>
-              </div>
              </div>
           </div>
 
@@ -89,44 +83,52 @@ v_section="dns" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date
 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 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-l" key-action="href"><a href="/list/dns/?domain=<?=$key?>"><?=__('list records',$data[$key]['RECORDS'])?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-              <div class="actions-panel__col actions-panel__add shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=$key?>"><?=__('add record')?> <i></i></a><span class="shortcut">&nbsp;N</span></div>
-              <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></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?>">
-                  <?=__($spnd_action)?> <i class="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>
-                <span class="shortcut">&nbsp;S</span>
-              </div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="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>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-            </div>
-            <!-- /.actions-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
             <div class="l-unit__col l-unit__col--right">
-              <div style="margin-bottom: 50px;">
-                  <div class="clearfix l-unit__stat-col--left">
+              <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 ?>">
-                      <label for="check<?php echo $i ?>" class="check-label"></label>
+                      
                     </div>
-                  <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/list/dns/?domain=<?=$key?>"><?=$key?></a></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/list/dns/?domain=<?=$key?>"><?=$key?></a></b></div>
+
+                  <div class="clearfix l-unit__stat-col--left 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-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-alt 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>
+              
+                          </div>
+                          <!-- /.actiona-panel -->
+                        </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>

+ 27 - 25
web/templates/admin/list_dns_rec.html

@@ -14,10 +14,6 @@
                   <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
                 </form>
               </td>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td>
                 <form action="/bulk/dns/" method="post" id="objects">
                 <input type="hidden" name="domain" value="<?=htmlentities($_GET['domain'])?>" />
@@ -54,8 +50,9 @@
       </div>
 
       <div class="l-unit__col l-unit__col--right step-top">
-        <div style="margin-bottom: 40px;">
+        <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"><b><?php print __('Priority');?></b></div>
           <div class="clearfix l-unit__stat-col--left wide-4"><b><?php print __('IP or Value');?></b></div>
@@ -85,25 +82,6 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
             <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>
-          <!-- 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 shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="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_RECORD_CONFIRMATION',$data[$key]['RECORD'])?></p>
-                  </div>
-                </a>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-
-            </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
 
@@ -117,7 +95,31 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
             <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"><b><?=$data[$key]['TYPE']?></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>
+                      </div>
+        
+                    </div>
+                    <!-- /.actiona-panel -->
+                  </div>
+
+                <!-- END QUICK ACTION TOOLBAR AREA -->
+            </b></div>
+            <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>

+ 45 - 45
web/templates/admin/list_firewall.html

@@ -18,10 +18,6 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td class="sort-by">
                   <?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
                 </td>
@@ -47,17 +43,17 @@
     <!-- /.l-separator -->
 
     <div class="l-center units compact animated fadeIn">         
-          <div class="l-unit 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 header table-header">     
             <div class="l-unit__col l-unit__col--right step-top">
-              <div style="margin-bottom: 40px;">
-                  <div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Action');?></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-2"><b><?php print __('Action');?></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 wide-1 text-center"><b><?php print __('Comment');?></b></div>   
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Protocol');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left wide-2 text-center"><b><?php print __('Port');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-5 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>
@@ -81,46 +77,16 @@
 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">
-          <!-- 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 shortcut-enter" key-action="href"><a href="/edit/firewall/?rule=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <div class="actions-panel__col actions-panel__<?=$spnd_action?> shortcut-s" key-action="js">
-                <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
-                  <?=__($spnd_action)?> <i class="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>
-                <span class="shortcut">&nbsp;S</span>
-              </div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="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>
-                <span class="shortcut delete">&nbsp;Del</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 class="l-unit__stats">
-              <div class="clearfix l-unit__stat-col--left">
+              <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 ?>">
-                  <label for="check<?php echo $i ?>" class="check-label"></label>
                 </div>
-            <div class="clearfix l-unit__stat-col--left wide"><b><a href="/edit/firewall/?rule=<?=$key?>">
+            <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') { ?>
                     <i class="fas fa-minus-circle status-icon-red icon-pad-right"></i> <?=__($data[$key]['ACTION'])?>
@@ -136,9 +102,43 @@ 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>
+                        
+                        <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>
+                      <!-- /.actiona-panel -->
+                    </div>
+  
+                  <!-- END QUICK ACTION TOOLBAR AREA -->
+              </b></div>
             <div class="clearfix l-unit__stat-col--left wide-1 text-center"><b><? if(!empty($data[$key]['COMMENT'])) echo '' . $data[$key]['COMMENT']; else echo "&nbsp;"; ?></b></div>
             <div class="clearfix l-unit__stat-col--left text-center"><b><?=__($data[$key]['PROTOCOL'])?></b></div>
-            <div class="clearfix l-unit__stat-col--left wide-2 text-center"><b><?=$data[$key]['PORT']?></b></div>
+            <div class="clearfix l-unit__stat-col--left wide-5 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 -->

+ 33 - 34
web/templates/admin/list_firewall_banlist.html

@@ -7,10 +7,6 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all"  onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td>
                 <form action="/bulk/firewall/banlist/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,17 +30,16 @@
 
 
     <div class="l-center units animated fadeIn">
-        <div class="l-unit 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 style="margin-bottom: 40px;">
+              <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"><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 compact-4 text-center"><b><?php print __('Comment');?></b></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 wide text-center"><b><?php print __('Comment');?></b></div>   
-                  <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('IP address');?></b></div>
               </div>
             </div>
           </div>
@@ -58,28 +53,10 @@
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
         <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
+          <div class="l-unit-toolbar__col l-unit-toolbar__col--left super-compact">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $value['CHAIN'] ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
-          <!-- l-unit-toolbar__col -->
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <div class="actions-panel clearfix">
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="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>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-
-            </div>
-            <!-- /.actiona-panel -->
+            
           </div>
-          <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
 
@@ -87,10 +64,32 @@
         <!-- /.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 compact-4 text-center"><?=$ip?></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__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>
+                        </div>
+          
+                      </div>
+                      <!-- /.actiona-panel -->
+                    </div>
+  
+                  <!-- END QUICK ACTION TOOLBAR AREA -->
+              </b></div>
+              <div class="clearfix l-unit__stat-col--left wide text-center"><b><?=__($value['CHAIN'])?></b></div>
               <div class="clearfix l-unit__stat-col--left"><b><?=__($data[$key]['DATE'])?></b></div>
               <div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['TIME']?></b></div>
-              <div class="clearfix l-unit__stat-col--left wide text-center"><b><?=__($value['CHAIN'])?></b></div>
-              <div class="clearfix l-unit__stat-col--left text-center"><?=$ip?></div>
           </div>
           <!-- /.l-unit__stats -->
         </div>

+ 31 - 34
web/templates/admin/list_ip.html

@@ -16,10 +16,6 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td class="sort-by">
                   <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
                 </td>
@@ -45,14 +41,14 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
     <div class="l-center units animated fadeIn">
-      <div class="l-unit 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 header table-header">     
         <div class="l-unit__col l-unit__col--right step-top">
-          <div style="margin-bottom: 40px;">
-            <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('IP Address');?></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-5"><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"><b><?php print __('Interface');?></b></div>
             <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Status');?></b></div>
@@ -72,36 +68,37 @@ v_section="ip" sort-ip="<?=str_replace('.', '', $key)?>" sort-date="<?=strtotime
 sort-netmask="<?=str_replace('.', '', $data[$key]['NETMASK'])?>" sort-interface="<?=$data[$key]['INTERFACE']?>" sort-domains="<?=$data[$key]['U_WEB_DOMAINS']?>"
 sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites']['IP'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
-
-          <!-- 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 shortcut-enter" key-action="href"><a href="/edit/ip/?ip=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="do_delete"></i>
-                  <input type="hidden" name="delete_url" value="/delete/ip/?ip=<?=$key?>&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>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-            </div>
-            <!-- /.actions-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
 
         <!-- /.l-unit__col -->
           <div class="l-unit__col l-unit__col--right">
-            <div style="margin-bottom: 50px;">
-              <div class="clearfix l-unit__stat-col--left">
+            <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?>">
-                <label for="check<?php echo $i ?>" class="check-label"></label>
+                
               </div>
-              <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/ip/?ip=<?=$key?>"><?=$key?></a></b></div>
+              <div class="clearfix l-unit__stat-col--left wide-5"><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 -->
+                    <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>
+                          <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/ip/?ip=<?=$key?>&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>
+                          </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 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>

+ 1 - 1
web/templates/admin/list_log.html

@@ -34,7 +34,7 @@
         </div>
   
         <div class="l-unit__col l-unit__col--right step-top">
-          <div style="margin-bottom: 40px;">
+          <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>

+ 49 - 51
web/templates/admin/list_mail.html

@@ -27,10 +27,6 @@
                   <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
                 </form>
               </td>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -57,25 +53,20 @@
 
     <div class="l-separator"></div>
     <!-- /.l-separator -->
-
-
-
     <div class="l-center units animated fadeIn">
             <div class="l-unit 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 style="margin-bottom: 40px;">
-                      <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Domain');?></b></div>
+                      <div class="clearfix l-unit__stat-col--left 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-5"><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>
 
@@ -105,48 +96,55 @@
 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">
-
-          <!-- 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-l" key-action="href"><a href="?domain=<?=$key?>"><?=__('list accounts',$data[$key]['ACCOUNTS'])?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-              <div class="actions-panel__col actions-panel__add shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>"><?=__('add account')?> <i></i></a><span class="shortcut">&nbsp;N</span></div>
-              <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></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?>">
-                  <?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
-                  <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?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>
-                <span class="shortcut">&nbsp;S</span>
-              </div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="do_delete"></i>
-                  <input type="hidden" name="delete_url" value="/delete/mail/?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>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-
-
-            </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
             <div class="l-unit__col l-unit__col--right">
-              <div style="margin-bottom: 50px;">
-                  <div class="clearfix l-unit__stat-col--left">
+              <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 ?>">
-                      <label for="check<?php echo $i ?>" class="check-label"></label>
+                      
                     </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 wide-5"><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 -->
+                      <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>
+                            <div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>"><i class="fas fa-users status-icon-blue status-icon-dim"></i></div>
+                            <div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=$key?>/" target="_blank"><i class="fas fa-paper-plane status-icon-lightblue status-icon-dim"></i></div>
+                            <div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?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?>/mail/?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/mail/?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>
+
+                      <!-- END QUICK ACTION TOOLBAR AREA -->
+                  </b></div>
+
+
                   <div class="clearfix l-unit__stat-col--left text-center compact-2"><b>
                     <? if($data[$key]['ACCOUNTS']) { echo '<span>'.$data[$key]['ACCOUNTS'].'</span>'; ?>
                     <? } else {?>

+ 48 - 43
web/templates/admin/list_mail_acc.html

@@ -27,10 +27,6 @@
                   <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
                 </form>
               </td>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -58,14 +54,14 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
     <div class="l-center units animated fadeIn">
-        <div class="l-unit 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 header table-header">     
             <div class="l-unit__col l-unit__col--right step-top">
-              <div style="margin-bottom: 40px;">
-                  <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Username');?></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-5"><b><?php print __('Username');?></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"><b><?php print __('Disk');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Quota');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Aliases');?></b></div>
@@ -95,44 +91,53 @@
  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">
-          <!-- 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 shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></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?>">
-                  <?=__($spnd_action)?> <i class="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>
-                <span class="shortcut">&nbsp;S</span>
-              </div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="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>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-            </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
         </div>
         <!-- /.l-unit-toolbar -->
             <div class="l-unit__col l-unit__col--right">
-              <div style="margin-bottom: 50px;">
-                  <div class="clearfix l-unit__stat-col--left">
+              <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" />
-                      <label for="check<?php echo $i ?>" class="check-label"></label>
                     </div>
-                  <div class="clearfix l-unit__stat-col--left wide-3"><b><?=$key."@".$_GET['domain']?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-5"><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 -->
+
+                      <!-- 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>
+
+                            <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>
+
+                      <!-- END QUICK ACTION TOOLBAR AREA -->
+                  </b></div>
+
+
                   <div class="clearfix l-unit__stat-col--left text-center compact"><b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?=__(humanize_usage_size($data[$key]['QUOTA'])) ?></b> <span class="text-small"><?=__(humanize_usage_measure($data[$key]['QUOTA'])) ?></span></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b>

+ 1 - 1
web/templates/admin/list_packages.html

@@ -61,7 +61,7 @@ sort-star="<?if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo '1'; else ec
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="package[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
+            
           </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">

+ 47 - 94
web/templates/admin/list_services.html

@@ -7,14 +7,11 @@
           <a href="/list/ip/" class="ui-button cancel" title="<?=__('IP')?>"><i class="fas fa-ethernet status-icon-blue"></i> <?=__('IP')?></a>
           <?php if ((isset($_SESSION['FIREWALL_SYSTEM'])) && (!empty($_SESSION['FIREWALL_SYSTEM']))) {?><a href="/list/firewall/" class="ui-button cancel" title="<?=__('Firewall')?>"><i class="fas fa-shield-alt status-icon-red"></i> <?=__('Firewall')?></a><?php }?>
           <a href="/list/updates/" class="ui-button cancel" title="<?=__('Updates')?>"><i class="fas fa-sync status-icon-green"></i> <?=__('Updates')?></a>
+          <a href="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>" class="ui-button danger cancel" title="<?=__('Restart')?>"><i class="fas fa-undo status-icon-red"></i> <?=__('Restart')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td>
                 <form action="/bulk/service/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -40,39 +37,24 @@
 
 
     <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 class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check0" class="ch-toggle" type="checkbox" name="srv[]" value="<?php echo $sys['sysinfo']['HOSTNAME'] ?>">
-            <label for="check0" class="check-label"></label>
-          </div>
-          <!-- l-unit-toolbar__col -->
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <div class="actions-panel clearfix">
-              <div class="actions-panel__col actions-panel__configure shortcut-enter" key-action="href"><a href="/edit/server/"><?=__('configure')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <div class="actions-panel__col actions-panel__restart shortcut-r" key-action="href"><a href="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>"><?=__('restart')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-            </div>
-            <!-- /.actions-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
-        </div>
+         </div>
         <!-- /.l-unit-toolbar -->
 
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__suspended"><?__('suspended')?></div>
-          <!-- div class="l-unit__date">
-          </div-->
-        </div>
         <!-- /.l-unit__col -->
-        <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate">
-            <?=$sys['sysinfo']['HOSTNAME']?>
-          </div>
-
-
-          <div class="l-unit__stats">
+        <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>
+          <div class="l-unit__stats server-info-data">
             <table>
-
                <tr>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
@@ -97,15 +79,27 @@
                 </td>
               </tr>
 
-            </table>
-          </div>
+             </table>
+           </div>
           <!-- /.l-unit__stats -->
-        </div>
+         </div>
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-
-
+          <div class="l-unit table-header">
+              <div class="l-unit__col l-unit__col--right">
+                    <div class="clearfix l-unit__stat-col--left">
+                        <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"><b><?php print __('Service');?></b></div>
+                      <div class="clearfix l-unit__stat-col--left text-right compact">&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) {
@@ -125,74 +119,33 @@
 
 
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="service[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
-          <!-- l-unit-toolbar__col -->
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <div class="actions-panel clearfix">
-              <div class="actions-panel__col actions-panel__configure shortcut-enter" key-action="href"><a href="/edit/server/<? echo $key ?>/"><?=__('configure')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <div class="actions-panel__col actions-panel__<?=$action?> shortcut-s" key-action="href"><a href="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__($action)?> <i></i></a><span class="shortcut">&nbsp;S</span></div>
-              <div class="actions-panel__col actions-panel__restart shortcut-r" key-action="href"><a href="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('restart')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-            </div>
-            <!-- /.actions-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
-        </div>
-        <!-- /.l-unit-toolbar -->
 
-        <div class="l-unit__col l-unit__col--left clearfix step-left">
-          <!-- div class="l-unit__date">
-          </div-->
-        </div>
-        <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name small-2">
-            <?=$key?>
-          </div>
-
-
-          <div class="l-unit__stats">
-            <table>
+        <div class="clearfix l-unit__stat-col--left">
+          <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="service[]" value="<?php echo $key ?>">
+        </div>
 
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><b><?=__($data[$key]['SYSTEM'])?></b></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right"></div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('CPU')?>: <b><?=$cpu?></b></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right"><?=__('Memory')?>: <b><?=$data[$key]['MEM']?> <?=__('mb')?></b></div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Uptime')?>: <b><?=humanize_time($data[$key]['RTIME'])?></b></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right"></div>
-                  </div>
-                </td>
-              </tr>
+        <div class="clearfix l-unit__stat-col--left wide"><b><a href="/edit/server/<? echo $key ?>/"><?=$key?></a></b></div>
+        <div class="clearfix l-unit__stat-col--left text-center compact">
+            <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>
+        <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>
 
-            </table>
+            </div>
           </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-separator visible"></div>
       <div class="l-center">
         <div class="l-unit-ft">
           <div class="l-unit__col l-unit__col--left clearfix"></div>

+ 8 - 9
web/templates/admin/list_updates.html

@@ -38,13 +38,12 @@
 
 
     <div class="l-center units animated fadeIn">
-        <div class="l-unit 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 header table-header">    
             <div class="l-unit__col l-unit__col--right step-top">
-              <div style="margin-bottom: 40px;">
+              <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"><b><?php print __('Package');?></b></div>
                   <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Description');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Version');?></b></div>
@@ -83,10 +82,10 @@
         <!-- /.l-unit-toolbar -->
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
-            <div style="margin-bottom: 50px;">
-                <div class="clearfix l-unit__stat-col--left">
+            <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 ?>">
-                  <label for="check<?php echo $i ?>" class="check-label"></label>
+                  
                 </div>
               <div class="clearfix l-unit__stat-col--left wide"><b><?=$key?></b></div>
               <div class="clearfix l-unit__stat-col--left wide-5"><b><?=__($data[$key]['DESCR'])?></b></div>

+ 85 - 243
web/templates/admin/list_user.html

@@ -19,10 +19,6 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td class="sort-by">
                   <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
                 </td>
@@ -55,10 +51,31 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
+    <!-- /.l-separator --> 
     <div class="l-center units animated fadeIn">
+        <div class="l-unit 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-3"><b><?php print __('Name');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left"><b>&nbsp;</b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?php print __('Package');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('IPs');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Disk');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Bandwidth');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Web');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Mail');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('DNS');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('DB');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Jobs');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center compact"><b><?php print __('Backups');?></b></div>
+             </div>
+          </div>
+
       <?php
         foreach ($data as $key => $value) {
           ++$i;
@@ -76,251 +93,76 @@
       <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'; ?>">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="user[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
-          </div>
-          <!-- l-unit-toolbar__col -->
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <div class="actions-panel clearfix">
-            <?
-              if ($key == $user) {
-            ?>
-                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-<?php
-              } else {
-?>
-                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('login as').' '.$key?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-              <?}?>
-              <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></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?>">
-                  <?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
-                  <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/user/?user=<?=$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>
-                <span class="shortcut">&nbsp;S</span>
-              </div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="do_delete"></i>
-                  <input type="hidden" name="delete_url" value="/delete/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                  <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                    <p class="confirmation"><?=__('DELETE_USER_CONFIRMATION',$key)?></p>
-                  </div>
-                </a>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-            </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- l-unit-toolbar__col -->
-        </div>
-        <!-- /.l-unit-toolbar -->
-
-        <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
-          </div>
-          <div class="l-unit__suspended"><?=__('suspended')?></div>
-          <div class="text-center">
-            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
-          </div>
-        </div>
-        <!-- /.l-unit__col -->
+      
+<!-- /.l-unit-toolbar -->
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name">
-            <?=$key?>
+          <div class="clearfix l-unit__stat-col--left super-compact">
+            <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
           </div>
-
-          <div class="l-unit__ip">
-            <?=$data[$key]['FNAME']?> <?=$data[$key]['LNAME']?>
+              <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$data[$key]['FNAME']?> <?=$data[$key]['LNAME']?> <span style="font-weight: normal !important;">(<?=$key?>)</span></b></a><br /><span style="font-size: 0.75rem;"><?=str_replace(',', '<br />',$data[$key]['NS'])?></span></div>
+              <div class="clearfix l-unit__stat-col--left 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">
+                            <?
+                            if ($key == $user) {
+                            ?>
+                            <?php
+                              } else {
+                              ?>
+                              <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?>">
+                              <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?>/user/?user=<?=$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/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                              <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                                <p class="confirmation"><?=__('DELETE_USER_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 compact-3"><b><?=$data[$key]['PACKAGE']?></b></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['IP_OWNED']?></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 compact"><?=$data[$key]['U_WEB_DOMAINS']?></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_MAIL_DOMAINS']?></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_DNS_DOMAINS']?></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_DATABASES']?></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_CRON_JOBS']?></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_BACKUPS']?></div>
           </div>
-
-          <div class="l-unit__stats">
-            <table>
-
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                  <div class="l-unit__stat-cols clearfix graph">
-                    <div class="l-unit__stat-col l-unit__stat-col--left">
-                      <?=__('Bandwidth')?>
-                    </div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
-                      <b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
-                    </div>
-                  </div>
-                  <div class="l-percent">
-                    <div class="l-percent__fill" style="width: <?=get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH'])?>%"></div>
-                  </div>
-                  <!-- /.percent -->
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Web Domains')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['U_WEB_DOMAINS']?></b> / <?=$data[$key]['WEB_DOMAINS']?>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Email')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['CONTACT']?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('DNS Domains')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['U_DNS_DOMAINS']?></b> / <?=$data[$key]['DNS_DOMAINS']?>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Package')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['PACKAGE']?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix graph">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
-                      <b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
-                    </div>
-                  </div>
-                  <div class="l-percent">
-                    <div class="l-percent__fill" style="width: <?=get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA'])?>%"></div>
-                  </div>
-                  <!-- /.percent -->
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Mail Domains')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['U_MAIL_DOMAINS']?></b> / <?=$data[$key]['MAIL_DOMAINS']?>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('SSH Access')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['SHELL']?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix tiny">
-                    <div class="l-unit__stat-col l-unit__stat-col--left">
-                      <?=__('Web')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_WEB'])?>
-                    </div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <?=__('Databases')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DB'])?>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Databases')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['U_DATABASES']?></b> / <?=$data[$key]['DATABASES']?>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('IP Addresses')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['IP_OWNED']?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-              <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix tiny">
-                    <div class="l-unit__stat-col l-unit__stat-col--left">
-                      <?=__('Mail')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_MAIL'])?>
-                    </div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <?=__('User Directories')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DIRS'])?>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Cron Jobs')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['U_CRON_JOBS']?></b> / <?=$data[$key]['CRON_JOBS']?>
-                    </div>
-                  </div>
-                </td>
-                <td>
-              </tr>
-
-              <tr>
-                <td>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backups')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['U_BACKUPS']?></b> / <?=$data[$key]['BACKUPS']?>
-                    </div>
-                  </div>
-                </td>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Name Servers')?>:</div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=str_replace(',', '<br>',$data[$key]['NS'])?></b>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-            </table>
-          </div>
-          <!-- /.l-unit__stats -->
-        </div>
-        <!-- /.l-unit__col -->
-      </div>
-      <!-- /.l-unit -->
-      <!-- div class="l-separator"></div-->
-      <!-- /.l-separator -->
+         </div>
+       <!-- /.l-unit__col -->
+     <!-- /.l-unit -->
+     <!--div class="l-separator"></div-->
+     <!-- /.l-separator -->
       <?}?>
 
     </div>
 
     <div id="vstobjects">
-        <div class="l-separator"></div>
+        <div class="l-separator visible"></div>
     <div class="l-center">
         <div class="l-unit-ft">
           <table class='data'></table>

+ 49 - 53
web/templates/admin/list_web.html

@@ -21,10 +21,6 @@
                   <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
                 </form>
               </td>
-              <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
-              </td>
               <td>
                 <form action="/bulk/web/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -52,14 +48,14 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
     <div class="l-center units narrow animated fadeIn">
-        <div class="l-unit 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 header table-header">      
             <div class="l-unit__col l-unit__col--right step-top">
-              <div style="margin-bottom: 40px;">
-                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Domain');?></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-6"><b><?php print __('Domain');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left 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>
@@ -135,52 +131,52 @@ 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">
-
-          <!-- 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 shortcut-enter" key-action="href"><a href="/edit/web/?domain=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></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#"><?=__('view logs')?> <i></i></a><span class="shortcut">&nbsp;L</span></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"><?=__('open webstats')?> <i></i></a><span class="shortcut">&nbsp;W</span></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?>">
-                  <?=__($spnd_action)?> <i class="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>
-                <span class="shortcut">&nbsp;S</span>
-              </div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                  <?=__('delete')?> <i class="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>
-                <span class="shortcut delete">&nbsp;Del</span>
-              </div>
-
-            </div>
-            <!-- /.actiona-panel -->
-          </div>
-          <!-- 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<?=$i?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?=$key?>">
+              </div>
+                  <div class="clearfix l-unit__stat-col--left wide-6"><b><a href="/edit/web/?domain=<?=$key?>" alt="<?=__('Edit')?>"><?=$key?></a></b></div>
+                  <div class="clearfix l-unit__stat-col--left 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 -->
 
 
-            <div class="l-unit__col l-unit__col--right">
-                <div style="margin-bottom: 50px;">
-              <div class="clearfix l-unit__stat-col--left">
-                <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?=$key?>">
-                <label for="check<?=$i?>" class="check-label"></label>
-              </div>
-                  <div class="clearfix l-unit__stat-col--left wide-5"><b><a href="/edit/web/?domain=<?=$key?>" alt="<?=__('Edit')?>"><?=$key?></a></b></div>
+                      <!-- 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>

+ 1 - 1
web/templates/user/list_cron.html

@@ -79,7 +79,7 @@ sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-nam
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
+            
           </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">

+ 1 - 1
web/templates/user/list_db.html

@@ -110,7 +110,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
+            
           </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">

+ 1 - 1
web/templates/user/list_dns.html

@@ -69,7 +69,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
+            
           </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">

+ 1 - 1
web/templates/user/list_dns_rec.html

@@ -48,7 +48,7 @@
     </div>
 
     <div class="l-unit__col l-unit__col--right step-top table-header">
-      <div style="margin-bottom: 40px;">
+      <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"><b><?php print __('Type');?></b></div>
         <div class="clearfix l-unit__stat-col--left compact"><b><?php print __('Priority');?></b></div>

+ 1 - 1
web/templates/user/list_mail.html

@@ -85,7 +85,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
+            
           </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">

+ 1 - 1
web/templates/user/list_mail_acc.html

@@ -82,7 +82,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="check" value="check<?php echo $i ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
+            
           </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">

+ 1 - 1
web/templates/user/list_user.html

@@ -81,7 +81,7 @@ sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<?if($_SESSION['favourites']['
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label>
+            
           </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">