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

N-ticket integria: 3909 fixed menu autohidden #16

This commit is contained in:
daniel 2016-08-10 11:30:11 +02:00
parent f47ab82765
commit 9ec8858e13
2 changed files with 78 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
pandora_console/general/main_menu.php
View File

@ -244,7 +244,7 @@ $(document).ready( function() {
$('ul.submenu').css('left', '44px'); $('ul.submenu').css('left', '44px');
$('div#title_menu').hide(); $('div#title_menu').hide();
} }
}, 1500); }, 2500);
}); });
}else{ }else{
$(document).ready(function() { $(document).ready(function() {
@ -254,6 +254,7 @@ $(document).ready( function() {
openTimeMenu = new Date().getTime(); openTimeMenu = new Date().getTime();
$('#menu').css('width', '145px'); $('#menu').css('width', '145px');
$('li.menu_icon').addClass( " no_hidden_menu" ); $('li.menu_icon').addClass( " no_hidden_menu" );
$('li.menu_icon').find('li').addClass( " no_hidden_menu" );
$('ul.submenu').css('left', '144px'); $('ul.submenu').css('left', '144px');
}).mouseleave(function() { }).mouseleave(function() {
handsInMenu = 0; handsInMenu = 0;
@ -262,6 +263,7 @@ $(document).ready( function() {
if(openedMenu > 1000 && handsInMenu == 0) { if(openedMenu > 1000 && handsInMenu == 0) {
$('#menu').css('width', '45px'); $('#menu').css('width', '45px');
$('li.menu_icon').removeClass( " no_hidden_menu"); $('li.menu_icon').removeClass( " no_hidden_menu");
$('li.menu_icon').find('li').removeClass( " no_hidden_menu" );
$('ul.submenu').css('left', '44px'); $('ul.submenu').css('left', '44px');
$('div#title_menu').hide(); $('div#title_menu').hide();
} }
@ -304,47 +306,91 @@ $(document).ready( function() {
//Daniel maya 02/06/2016 Display menu with click --INI //Daniel maya 02/06/2016 Display menu with click --INI
if(!click_display){ if(!click_display){
$('.menu_icon').mouseenter(function() { //Daniel barbero 10/08/2016 Display menu with click --INI
table_hover = $(this); if (autohidden_menu) {
handsIn = 1; //Daniel barbero 10/08/2016 Display menu with click --END
openTime = new Date().getTime(); $('.menu_icon').mouseenter(function() {
$("ul#sub"+table_hover[0].id).show();
if( typeof(table_noHover) != 'undefined')
if ( "ul#sub"+table_hover[0].id != "ul#sub"+table_noHover[0].id )
$("ul#sub"+table_noHover[0].id).hide();
}).mouseleave(function() {
table_noHover = $(this);
handsIn = 0;
setTimeout(function() {
opened = new Date().getTime() - openTime;
if(opened > 3000 && handsIn == 0) {
openTime = 4000;
$("ul#sub"+table_hover[0].id).hide();
}
}, 3500);
});
}else{
$(document).ready(function() {
$('.menu_icon').on("click", function() {
if( typeof(table_hover) != 'undefined'){
$("ul#sub"+table_hover[0].id).hide();
}
table_hover = $(this); table_hover = $(this);
handsIn = 1; handsIn = 1;
openTime = new Date().getTime(); openTime = new Date().getTime();
$("ul#sub"+table_hover[0].id).show(); $("ul#sub"+table_hover[0].id).show();
if( typeof(table_noHover) != 'undefined')
if ( "ul#sub"+table_hover[0].id != "ul#sub"+table_noHover[0].id )
$("ul#sub"+table_noHover[0].id).hide();
}).mouseleave(function() { }).mouseleave(function() {
table_noHover = $(this); table_noHover = $(this);
handsIn = 0; handsIn = 0;
setTimeout(function() { setTimeout(function() {
opened = new Date().getTime() - openTime; opened = new Date().getTime() - openTime;
if(opened > 5000 && handsIn == 0) { if(opened > 3000 && handsIn == 0) {
openTime = 6000; openTime = 4000;
$("ul#sub"+table_hover[0].id).hide(); $("ul#sub"+table_hover[0].id).hide();
} }
}, 5500); }, 2500);
}); });
//Daniel barbero 10/08/2016 Display menu with click --INI
} else {
$('.menu_icon').mouseenter(function() {
table_hover = $(this);
handsIn = 1;
openTime = new Date().getTime();
$("ul#sub"+table_hover[0].id).show();
if( typeof(table_noHover) != 'undefined')
if ( "ul#sub"+table_hover[0].id != "ul#sub"+table_noHover[0].id )
$("ul#sub"+table_noHover[0].id).hide();
}).mouseleave(function() {
table_noHover = $(this);
handsIn = 0;
$("ul#sub"+table_hover[0].id).hide();
/*
setTimeout(function() {
opened = new Date().getTime() - openTime;
if(opened > 3000 && handsIn == 0) {
openTime = 4000;
$("ul#sub"+table_hover[0].id).hide();
}
}, 2500);
*/
});
}
//Daniel barbero 10/08/2016 Display menu with click --END
}else{
$(document).ready(function() {
//Daniel barbero 10/08/2016 Display menu with click --INI
if (autohidden_menu) {
//Daniel barbero 10/08/2016 Display menu with click --END
$('.menu_icon').on("click", function() {
if( typeof(table_hover) != 'undefined'){
$("ul#sub"+table_hover[0].id).hide();
}
table_hover = $(this);
handsIn = 1;
openTime = new Date().getTime();
$("ul#sub"+table_hover[0].id).show();
}).mouseleave(function() {
table_noHover = $(this);
handsIn = 0;
setTimeout(function() {
opened = new Date().getTime() - openTime;
if(opened > 5000 && handsIn == 0) {
openTime = 6000;
$("ul#sub"+table_hover[0].id).hide();
}
}, 5500);
});
//Daniel barbero 10/08/2016 Display menu with click --INI
} else {
$('.menu_icon').on("click", function() {
if( typeof(table_hover) != 'undefined'){
$("ul#sub"+table_hover[0].id).hide();
}
table_hover = $(this);
handsIn = 1;
openTime = new Date().getTime();
$("ul#sub"+table_hover[0].id).show();
});
}
//Daniel barbero 10/08/2016 Display menu with click --END
}); });
} }
//Daniel maya 02/06/2016 Display menu with click --END //Daniel maya 02/06/2016 Display menu with click --END
@ -408,7 +454,7 @@ $(document).ready( function() {
$('li.menu_icon').removeClass( " no_hidden_menu"); $('li.menu_icon').removeClass( " no_hidden_menu");
$('ul.submenu').css('left', '44px'); $('ul.submenu').css('left', '44px');
$('div#title_menu').hide(); $('div#title_menu').hide();
}); });
$('div.menu>ul>li>ul>li>ul>li>a').click(function() { $('div.menu>ul>li>ul>li>ul>li>a').click(function() {
openTime = 4000; openTime = 4000;
if( typeof(table_hover) != 'undefined') if( typeof(table_hover) != 'undefined')

2
pandora_console/include/styles/menu.css
View File

@ -205,7 +205,7 @@ li:hover ul { display: block; }
top: -140px; top: -140px;
} }
#subicon_god-extensions { #subicon_god-extensions {
top: -315px; top: -262px;
} }
#subBulk_operations { #subBulk_operations {
top: -210px; top: -210px;