From db6360922f5e934fcd621169d6c9a5d69e904382 Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Mon, 12 Jun 2023 15:38:39 +0200
Subject: [PATCH] UI performance fix 5

---
 web/inc/main.php                            |  2 +-
 web/js/fix.js                               | 19 ++++--------------
 web/templates/admin/list_backup_detail.html | 20 ++++++++++++-------
 web/templates/admin/panel.html              |  6 ++++--
 web/templates/header.html                   | 22 ++++++++++++++++++++-
 web/templates/right.html                    | 19 +++++++-----------
 web/templates/scripts.html                  |  2 +-
 web/templates/user/panel.html               |  4 ++--
 8 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/web/inc/main.php b/web/inc/main.php
index 34483025..26df863e 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -8,7 +8,7 @@ if (file_exists("/usr/local/vesta/web/inc/switch_to_vesta_port") && isset($_SERV
 session_start();
 
 define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/');
-define('JS_LATEST_UPDATE', '1491697870');
+define('JS_LATEST_UPDATE', '1491697871');
 
 $i = 0;
 
diff --git a/web/js/fix.js b/web/js/fix.js
index e1bdbb34..aaf0fa05 100644
--- a/web/js/fix.js
+++ b/web/js/fix.js
@@ -54,15 +54,13 @@ function hideIoLog(animate){
         $(".to-top").css("right", 85);
         $(".to-shortcuts").css("right", 130);
         $(".right_sidebar").css("right", -200);
-        //$(".io-log2").css("right", -200);
-        $("#myvesta_float").css("margin-right", 100);
+        //$("#myvesta_float").css("margin-right", 100);
     } else {
         $(".l-content .l-center").animate({"margin-right": 40});
         $(".to-top").animate({"right": 85});
         $(".to-shortcuts").animate({"right": 130});
         $(".right_sidebar").animate({"right": -200});
-        //$(".io-log2").animate({"right": -200});
-        $("#myvesta_float").animate({"margin-right": 100});
+        //$("#myvesta_float").animate({"margin-right": 100});
     }
 }
 
@@ -91,25 +89,16 @@ var iohtml = '<div class="io-box clearfix">\n' +
 $(document).ready(function(){
     //var sys_height=$(".io-log").height();
     //$(".io-log2").css("top", sys_height+50);
+    /*
     setTimeout(function() {
         iolog = getCookie("iolog");
-        /* //console.log('cookie: "'+iolog+'"');
-        if (iolog === '1') {
-            showIoLog(0);
-            return 1;
-        }*/
         if (iolog === '0') {
             //setCookie("iolog", 0, 365);
             hideIoLog(0);
             return 0;
         }
-        /*if (iolog == '') {
-            //console.log('cookie is empty');
-            //setCookie("iolog", 1, 365);
-            showIoLog(0);
-            return '';
-        }*/
     }, 1);
+    */
 
     //if (GLOBAL.CURRENT_USER_FINAL == 'admin') $(".body-user .l-content > .l-center.units").first().prepend( iohtml );
 
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
index 289d9b2f..0d583536 100644
--- a/web/templates/admin/list_backup_detail.html
+++ b/web/templates/admin/list_backup_detail.html
@@ -3,6 +3,12 @@ input[type="checkbox"] {
   display: block;
   margin-top: 26px;
 }
+
+.backup-items {
+    background-color: #f8f8f8;
+    margin: 10px 33px;
+    border-radius: 10px;
+}
 </style>
 <br /><br />
 <form action="/bulk/restore/" method="post" id="objects">
@@ -48,7 +54,7 @@ input[type="checkbox"] {
             ++$i;
       ?>
 
-      <div>
+      <div class="backup-items">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left" style="margin-left: 15px;">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="web[]" value="<?=$key?>">
@@ -99,7 +105,7 @@ input[type="checkbox"] {
           if (!empty($key)) {
       ?>
 
-      <div>
+      <div class="backup-items">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left" style="margin-left: 15px;">
             <input id="check2<?=$i?>" type="checkbox" name="mail[]" value="<?=$key?>">
@@ -147,7 +153,7 @@ input[type="checkbox"] {
           if (!empty($key)) {
       ?>
 
-      <div>
+      <div class="backup-items">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left" style="margin-left: 15px;">
             <input id="check3<?=$i?>" type="checkbox" name="dns[]" value="<?=$key?>">
@@ -194,7 +200,7 @@ input[type="checkbox"] {
           if (!empty($key)) {
       ?>
 
-      <div>
+      <div class="backup-items">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left" style="margin-left: 15px;">
             <input id="check4<?=$i?>" type="checkbox" name="db[]" value="<?=$key?>">
@@ -242,7 +248,7 @@ input[type="checkbox"] {
           if (!empty($key)) {
       ?>
 
-      <div>
+      <div class="backup-items">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left" style="margin-left: 15px;">
             <input id="check5<?=$i?>" type="checkbox" name="check" value="<?=$key?>">
@@ -290,7 +296,7 @@ input[type="checkbox"] {
           if (!empty($key)) {
       ?>
 
-      <div>
+      <div class="backup-items">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left" style="margin-left: 15px;">
             <input id="check6<?=$i?>" type="checkbox" name="udir[]" value="<?=$key?>">
@@ -329,7 +335,7 @@ input[type="checkbox"] {
       <!-- /.l-separator -->
       <? }} ?>
 
-      <div>
+      <div class="backup-items">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left" style="margin-left: 15px;">
             <input id="check7<?=$i?>" type="checkbox" name="cron" value="<?=$i?>">
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index 7eb5bab1..c181903b 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -1,8 +1,8 @@
   <div class="hidden" id="token" token="<?=$_SESSION['token']?>"></div>
-  <a href="#" class="to-top">
+  <a href="#" class="to-top" style="right: <?=$GLOBALS['to_top_right']?>px;">
     <i class="l-icon-to-top"></i>
   </a>
-  <a href="#" class="to-shortcuts">
+  <a href="#" class="to-shortcuts" style="right: <?=$GLOBALS['to_shortcuts_right']?>px;">
     <i class="l-icon-shortcuts"></i>
   </a>
 
@@ -129,9 +129,11 @@ $debian_ver=file_get_contents('/etc/debian_version');
             <span style="font-weight: bold;">Build date:</span> <?php echo $vesta_build_date;?><br />
             <span style="font-weight: bold;">Debian </span> <?php echo $debian_ver;?><br />
         </div>
+        <!--
         <div style="display: block; padding: 30px 0 0 19px; color: #b9bcbd;">
             <a href="https://forum.myvestacp.com/viewtopic.php?f=23&t=819" target="_blank" style="text-decoration: underline; font-weight: bold;">Need urgent assistance?</a>
         </div>
+        -->
       </div>
       <!-- /.l-stats -->
     </div>
diff --git a/web/templates/header.html b/web/templates/header.html
index 848f9a64..810657d8 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -16,6 +16,23 @@
     <?php
         $CURRENT_USER_FINAL=$_SESSION['user'];
         if (isset($_SESSION['look']) && $_SESSION['look']!='') $CURRENT_USER_FINAL=$_SESSION['look'];
+        
+        $right_sidebar_right=0;
+        $content_margin_right=240;
+        $content_margin_right=240;
+        $to_top_right=285;
+        $to_shortcuts_right=330;
+        if (isset($_COOKIE['iolog']) && $_COOKIE['iolog']=='0') {
+            $right_sidebar_right=-200;
+            $content_margin_right=40;
+            $to_top_right=85;
+            $to_shortcuts_right=130;
+        }
+        
+        $GLOBALS['CURRENT_USER_FINAL']=$CURRENT_USER_FINAL;
+        $GLOBALS['right_sidebar_right']=$right_sidebar_right;
+        $GLOBALS['to_top_right']=$to_top_right;
+        $GLOBALS['to_shortcuts_right']=$to_shortcuts_right;
     ?>
     var GLOBAL = {};
     GLOBAL.FTP_USER_PREFIX  = 'admin_';
@@ -23,8 +40,11 @@
     GLOBAL.DB_DBNAME_PREFIX = 'admin_';
     GLOBAL.CURRENT_USER = '<?=$_SESSION['user']?>';
     GLOBAL.CURRENT_USER_LOOK = '<?=$_SESSION['look']?>';
-    GLOBAL.CURRENT_USER_FINAL = '<?=$CURRENT_USER_FINAL?>';
+    GLOBAL.CURRENT_USER_FINAL = '<?=$GLOBALS['CURRENT_USER_FINAL']?>';
     GLOBAL.AJAX_URL = '';
   </script>
+  <style>
+    .l-content .l-center {margin-right: <?=$content_margin_right?>px}
+  </style>
 </head>
 <body class="body-<?=strtolower($TAB)?> lang-<?=$_SESSION['language']?>">
diff --git a/web/templates/right.html b/web/templates/right.html
index 2a699668..88e1f5f0 100644
--- a/web/templates/right.html
+++ b/web/templates/right.html
@@ -1,20 +1,15 @@
-<?php
-    $CURRENT_USER_FINAL=$_SESSION['user'];
-    if (isset($_SESSION['look']) && $_SESSION['look']!='') $CURRENT_USER_FINAL=$_SESSION['look'];
-?>
-
-<div class="right_sidebar" style="width: 240px; position: fixed; display: block; z-index: 98; top: 50px; right: 0px; box-sizing: border-box; height: 100%; background: #fff; border-left: 1px solid #dee5e8;">
+<div class="right_sidebar" style="width: 240px; position: fixed; display: block; z-index: 98; top: 50px; right: <?=$GLOBALS['right_sidebar_right']?>px; box-sizing: border-box; height: 100%; background: #fff; border-left: 1px solid #dee5e8;">
 <div class="io-log">
   <h2 class="io-log-h2" id="iologbutton">
     <?php
-    if ($CURRENT_USER_FINAL=='admin') echo __('Server');
+    if ($GLOBALS['CURRENT_USER_FINAL']=='admin') echo __('Server');
     else echo __('Account');
     ?>
   </h2>
     <div>
 
 <?php
-    if ($CURRENT_USER_FINAL=='admin') {
+    if ($GLOBALS['CURRENT_USER_FINAL']=='admin') {
         $sysload=sys_getloadavg();
         $sysload[0]=number_format((float)$sysload[0], 2, '.', '');
         $sysload[1]=number_format((float)$sysload[1], 2, '.', '');
@@ -67,11 +62,11 @@
           <div>
             <?php
                 $output='';
-                exec (VESTA_CMD . "v-list-user ".$CURRENT_USER_FINAL." json", $output, $return_var);
+                exec (VESTA_CMD . "v-list-user ".$GLOBALS['CURRENT_USER_FINAL']." json", $output, $return_var);
                 $data = json_decode(implode('', $output), true);
                 $data = array_reverse($data,true);
                 //print_r($data); exit;
-                $key=$CURRENT_USER_FINAL;
+                $key=$GLOBALS['CURRENT_USER_FINAL'];
                 if ($data[$key]['DISK_QUOTA']=='unlimited') echo __('unlimited');
                 else echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']).' %';
             ?>
@@ -80,7 +75,7 @@
       </div>
 <?php
     }
-    if ($CURRENT_USER_FINAL=='admin') {
+    if ($GLOBALS['CURRENT_USER_FINAL']=='admin') {
         $output='';
         exec ("df -h | grep '^/dev'", $output, $return_var);
         foreach($output as $line) {
@@ -128,7 +123,7 @@
     <div>
 <?php
 $output='';
-exec (VESTA_CMD."v-list-user-log ".$CURRENT_USER_FINAL." json 25", $output, $return_var);
+exec (VESTA_CMD."v-list-user-log ".$GLOBALS['CURRENT_USER_FINAL']." json 25", $output, $return_var);
 check_error($return_var);
 $data = json_decode(implode('', $output), true);
 foreach ($data as $key => $value) {
diff --git a/web/templates/scripts.html b/web/templates/scripts.html
index 8082dc93..b1d58e3d 100644
--- a/web/templates/scripts.html
+++ b/web/templates/scripts.html
@@ -8,7 +8,7 @@
   <script type="text/javascript" src="/js/i18n.js.php?<?=JS_LATEST_UPDATE?>"></script>
   <script type="text/javascript" src="/js/templates.js?<?=JS_LATEST_UPDATE?>"></script>
   <script type="text/javascript" src="/js/jquery.finder.js?<?=JS_LATEST_UPDATE?>"></script>
-  <script type="text/javascript" src="/js/fix.js?v=4"></script>
+  <script type="text/javascript" src="/js/fix.js?v=<?=JS_LATEST_UPDATE?>"></script>
 
   <script>
     hover_menu = function() {}
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html
index 8ac8ea51..2bff9b62 100644
--- a/web/templates/user/panel.html
+++ b/web/templates/user/panel.html
@@ -1,8 +1,8 @@
   <div class="hidden" id="token" token="<?=$_SESSION['token']?>"></div>
-  <a href="#" class="to-top">
+  <a href="#" class="to-top" style="right: <?=$GLOBALS['to_top_right']?>px;">
     <i class="l-icon-to-top"></i>
   </a>
-  <a href="#" class="to-shortcuts">
+  <a href="#" class="to-shortcuts" style="right: <?=$GLOBALS['to_shortcuts_right']?>px;">
     <i class="l-icon-shortcuts"></i>
   </a>
   <div class="l-header">