From 1e1ae95635935e7d95fba52bf5b22867c62de0f2 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Thu, 10 Feb 2022 10:28:43 +0100
Subject: [PATCH] Fix issue with collapse icon

---
 pandora_console/general/main_menu.php   | 25 +++++++++++++++----------
 pandora_console/include/styles/menu.css |  7 +++----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 1462c717d7..c2bf7f8fb5 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -35,11 +35,11 @@ if (isset($config['id_user']) === false) {
 ?>
 <script type="text/javascript" language="javascript">
 
-$(document).ready(function(){    
+$(document).ready(function(){
     var menuType_value = "<?php echo $_SESSION['menu_type']; ?>";
 
     if (menuType_value === '' || menuType_value === 'classic') {
-        $('ul.submenu').css('left', '214px');    
+        $('ul.submenu').css('left', '214px');
     }
     else{
         $('ul.submenu').css('left', '59px');
@@ -107,7 +107,12 @@ echo '</a></div>';
 require 'operation/menu.php';
 require 'godmode/menu.php';
 
-echo sprintf('<div id="button_collapse" class="button_%s button_collapse"></div>', $menuTypeClass);
+html_print_div(
+    [
+        'id'    => 'button_collapse',
+        'class' => sprintf('button_collapse button_%s', $menuTypeClass),
+    ]
+);
 
 echo '</div>';
 // Menu_container.
@@ -122,7 +127,7 @@ if (isset($config['fixed_header']) === true) {
 <script type="text/javascript" language="javascript">
 /* <![CDATA[ */
 
-$('#button_collapse').on('click', function() { 
+$('#button_collapse').on('click', function() {
 
     if($('#menu_full').hasClass('menu_full_classic')){
         localStorage.setItem("menuType", "collapsed");
@@ -155,7 +160,7 @@ $('#button_collapse').on('click', function() {
 
     $('.logo_full').toggle();
     $('.logo_icon').toggle();
-    $('#menu_full').toggleClass('menu_full_classic menu_full_collapsed');    
+    $('#menu_full').toggleClass('menu_full_classic menu_full_collapsed');
     $('#button_collapse').toggleClass('button_classic button_collapsed');
     $('div#title_menu').toggleClass('title_menu_classic title_menu_collapsed');
     $('div#page').toggleClass('page_classic page_collapsed');
@@ -389,9 +394,9 @@ $(document).ready(function() {
         if( typeof(table_hover) != 'undefined')
             $("ul#sub"+table_hover[0].id).hide();
         if( typeof(table_hover2) != 'undefined')
-            $("ul#sub"+table_hover2[0].id).hide();               
-    });    
-        
+            $("ul#sub"+table_hover2[0].id).hide();
+    });
+
     $('div.menu>ul>li>ul>li>ul>li>a').click(function() {
         openTime = 4000;
         if( typeof(table_hover) != 'undefined')
@@ -399,7 +404,7 @@ $(document).ready(function() {
         if( typeof(table_hover2) != 'undefined')
             $("ul#sub"+table_hover2[0].id).hide();
     });
-    
+
 });
-    
+
 </script>
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index d514771eea..ebf201c761 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -389,7 +389,7 @@ ul li {
 
 .button_collapse {
   margin-top: auto;
-  height: 38px;
+  min-height: 38px;
   background-color: #505050;
   text-align: center;
   color: #fff;
@@ -427,7 +427,6 @@ ul li {
 }
 
 .button_classic {
-  width: 215px;
   background-image: url(../../images/button_collapse_menu.png);
   background-repeat: no-repeat;
   background-position: center;
@@ -440,7 +439,7 @@ ul li {
 }
 
 /* Menu height: 601px, 720px, 735px */
-@media screen and (max-height: 720px) {
+@media screen and (max-height: 750px) {
   .menu li,
   .menu li a,
   .menu li div {
@@ -448,7 +447,7 @@ ul li {
   }
 }
 
-@media screen and (max-height: 735px) {
+@media screen and (max-height: 750px) {
   .operation {
     padding-top: 10px;
   }