tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3241-Etiqueta_en_el_Menu_de_la_metaconsola' into 'develop' 

Fixed Label in the Console Menu

See merge request artica/pandorafms!2123

Former-commit-id: ec997b149c6c480f74cb4fd71b7bc600cec40c19
This commit is contained in:
Alejandro Fraguas 2019-02-11 14:58:05 +01:00
parent e51864ac6f b96bf0e4b0
commit 2ebbaf83c5
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pandora_console/general/main_menu.php
View File

@ -320,6 +320,23 @@ $(document).ready( function() {
} }
else { else {
$('div#title_menu').hide(); $('div#title_menu').hide();
if(!click_display){
$('#menu').mouseenter(function() {
handsInMenu = 1;
openTimeMenu = new Date().getTime();
$('ul.submenu').css('left', '44px');
}).mouseleave(function() {
handsInMenu = 0;
setTimeout(function() {
openedMenu = new Date().getTime() - openTimeMenu;
if(openedMenu > 1000 && handsInMenu == 0) {
$('li.menu_icon').removeClass( " no_hidden_menu");
$('li.menu_icon').find('li').removeClass( " no_hidden_menu" );
$('ul.submenu').css('left', '44px');
}
}, 2500);
});
}
} }
}); });
/* ]]> */ /* ]]> */
@ -332,7 +349,6 @@ $(document).ready( function() {
handsIn2 = 0; handsIn2 = 0;
if(!click_display){ if(!click_display){
if (autohidden_menu) {
$('.menu_icon').mouseenter(function() { $('.menu_icon').mouseenter(function() {
table_hover = $(this); table_hover = $(this);
handsIn = 1; handsIn = 1;
@ -352,7 +368,6 @@ $(document).ready( function() {
} }
}, 2500); }, 2500);
}); });
}
}else{ }else{
$(document).ready(function() { $(document).ready(function() {
if (autohidden_menu) { if (autohidden_menu) {

2
pandora_console/include/functions_menu.php
View File

@ -372,7 +372,7 @@ function menu_print_menu(&$menu)
} }
// Print out the first level // Print out the first level
$output .= '<li title="'.ucwords(str_replace(['oper-', 'god-'], '', $id)).'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">'; $output .= '<li title="'.$main['text'].'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">';
// onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">'; // onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">';
$length = strlen(__($main['text'])); $length = strlen(__($main['text']));
$padding_top = ( $length >= 18) ? 6 : 12; $padding_top = ( $length >= 18) ? 6 : 12;