tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch '250-menu_error_with_new_inst' into 'pandora_6.0'"

Browse Source 
This reverts merge request !150
This commit is contained in:
vgilc 2017-02-20 17:20:39 +01:00
parent b0908ba24a
commit 24d1b576a5
1 changed files with 77 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
pandora_console/general/main_menu.php
View File

@ -75,18 +75,6 @@ var id_user = "<?php echo $config['id_user']; ?>";
var cookie_name = id_user + '-pandora_menu_state'; var cookie_name = id_user + '-pandora_menu_state';
var cookie_name_encoded = btoa(cookie_name); var cookie_name_encoded = btoa(cookie_name);
var click_display = "<?php echo $config["click_display"]; ?>"; var click_display = "<?php echo $config["click_display"]; ?>";
var classic_menu = parseInt("<?php echo $config["classic_menu"]; ?>");
if ((isNaN(classic_menu)) || (classic_menu == 0)) {
classic_menu = false;
}
else {
classic_menu = true;
}
if (classic_menu) {
autohidden_menu = 1;
}
var menuState = $.cookie(cookie_name_encoded); var menuState = $.cookie(cookie_name_encoded);
if (!menuState) { if (!menuState) {
@ -238,31 +226,29 @@ $(document).ready( function() {
*/ */
handsInMenu = 0; handsInMenu = 0;
openTimeMenu = 0; openTimeMenu = 0;
if (classic_menu) { if(!click_display){
$('div#title_menu').show(); $('#menu').mouseenter(function() {
handsInMenu = 1; $('div#title_menu').show();
openTimeMenu = new Date().getTime(); handsInMenu = 1;
$('#menu').css('width', '145px'); openTimeMenu = new Date().getTime();
$('#menu').css('position', 'block'); $('#menu').css('width', '145px');
$('li.menu_icon').addClass( " no_hidden_menu" ); $('li.menu_icon').addClass( " no_hidden_menu" );
$('ul.submenu').css('left', '144px'); $('ul.submenu').css('left', '144px');
}).mouseleave(function() {
$('#menu').mouseleave(function() {
handsInMenu = 0; handsInMenu = 0;
setTimeout(function() { setTimeout(function() {
openedMenu = new Date().getTime() - openTimeMenu; openedMenu = new Date().getTime() - openTimeMenu;
if(openedMenu > 1000 && handsInMenu == 0) { if(openedMenu > 1000 && handsInMenu == 0) {
$('#menu').css('width', '145px'); $('#menu').css('width', '45px');
$('#menu').css('position', 'block'); $('li.menu_icon').removeClass( " no_hidden_menu");
$('li.menu_icon').addClass( " no_hidden_menu" ); $('ul.submenu').css('left', '44px');
$('ul.submenu').css('left', '144px'); $('div#title_menu').hide();
} }
}, 2500); }, 2500);
}); });
} }else{
else { $(document).ready(function() {
if(!click_display){ $('#menu').on("click", function() {
$('#menu').mouseenter(function() {
$('div#title_menu').show(); $('div#title_menu').show();
handsInMenu = 1; handsInMenu = 1;
openTimeMenu = new Date().getTime(); openTimeMenu = new Date().getTime();
@ -281,34 +267,29 @@ $(document).ready( function() {
$('ul.submenu').css('left', '44px'); $('ul.submenu').css('left', '44px');
$('div#title_menu').hide(); $('div#title_menu').hide();
} }
}, 2500); }, 5500);
}); });
}else{ });
$(document).ready(function() {
$('#menu').on("click", function() {
$('div#title_menu').show();
handsInMenu = 1;
openTimeMenu = new Date().getTime();
$('#menu').css('width', '145px');
$('li.menu_icon').addClass( " no_hidden_menu" );
$('li.menu_icon').find('li').addClass( " no_hidden_menu" );
$('ul.submenu').css('left', '144px');
}).mouseleave(function() {
handsInMenu = 0;
setTimeout(function() {
openedMenu = new Date().getTime() - openTimeMenu;
if(openedMenu > 1000 && handsInMenu == 0) {
$('#menu').css('width', '45px');
$('li.menu_icon').removeClass( " no_hidden_menu");
$('li.menu_icon').find('li').removeClass( " no_hidden_menu" );
$('ul.submenu').css('left', '44px');
$('div#title_menu').hide();
}
}, 5500);
});
});
}
} }
/*$('#menu').mouseenter(function() {
$('div#title_menu').show();
handsInMenu = 1;
openTimeMenu = new Date().getTime();
$('#menu').css('width', '145px');
$('li.menu_icon').addClass( " no_hidden_menu" );
$('ul.submenu').css('left', '144px');
}).mouseleave(function() {
handsInMenu = 0;
setTimeout(function() {
openedMenu = new Date().getTime() - openTimeMenu;
if(openedMenu > 1000 && handsInMenu == 0) {
$('#menu').css('width', '45px');
$('li.menu_icon').removeClass( " no_hidden_menu");
$('ul.submenu').css('left', '44px');
$('div#title_menu').hide();
}
}, 1500);
});*/
} }
else { else {
$('div#title_menu').hide(); $('div#title_menu').hide();
@ -435,80 +416,9 @@ $(document).ready( function() {
}); });
$(document).ready(function() { $(document).ready(function() {
if (!classic_menu) { //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){ $('#container').click(function() {
$('#container').click(function() {
openTime = 4000;
if( typeof(table_hover) != 'undefined')
$("ul#sub"+table_hover[0].id).hide();
if( typeof(table_hover2) != 'undefined')
$("ul#sub"+table_hover2[0].id).hide();
$('#menu').css('width', '45px');
$('li.menu_icon').removeClass( " no_hidden_menu");
$('ul.submenu').css('left', '44px');
$('div#title_menu').hide();
});
}else{
$('#main').click(function() {
openTime = 4000;
if( typeof(table_hover) != 'undefined')
$("ul#sub"+table_hover[0].id).hide();
if( typeof(table_hover2) != 'undefined')
$("ul#sub"+table_hover2[0].id).hide();
$('#menu').css('width', '45px');
$('li.menu_icon').removeClass( " no_hidden_menu");
$('ul.submenu').css('left', '44px');
$('div#title_menu').hide();
});
}
//Daniel maya 02/06/2016 Display menu with click --END
}
else {
if(!click_display){
$('#container').click(function() {
openTime = 4000;
if( typeof(table_hover) != 'undefined')
$("ul#sub"+table_hover[0].id).hide();
if( typeof(table_hover2) != 'undefined')
$("ul#sub"+table_hover2[0].id).hide();
$('#menu').css('width', '145px');
$('ul.submenu').css('left', '144px');
});
}else{
$('#main').click(function() {
openTime = 4000;
if( typeof(table_hover) != 'undefined')
$("ul#sub"+table_hover[0].id).hide();
if( typeof(table_hover2) != 'undefined')
$("ul#sub"+table_hover2[0].id).hide();
$('#menu').css('width', '145px');
$('ul.submenu').css('left', '144px');
});
}
}
if (classic_menu) {
$('div.menu>ul>li>ul>li>a').click(function() {
openTime = 4000;
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.submenu').css('left', '144px');
});
$('div.menu>ul>li>ul>li>ul>li>a').click(function() {
openTime = 4000;
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.submenu').css('left', '144px');
});
}
else {
$('div.menu>ul>li>ul>li>a').click(function() {
openTime = 4000; openTime = 4000;
if( typeof(table_hover) != 'undefined') if( typeof(table_hover) != 'undefined')
$("ul#sub"+table_hover[0].id).hide(); $("ul#sub"+table_hover[0].id).hide();
@ -518,20 +428,44 @@ $(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();
}); });
}else{
$('#main').click(function() {
openTime = 4000;
if( typeof(table_hover) != 'undefined')
$("ul#sub"+table_hover[0].id).hide();
if( typeof(table_hover2) != 'undefined')
$("ul#sub"+table_hover2[0].id).hide();
$('#menu').css('width', '45px');
$('li.menu_icon').removeClass( " no_hidden_menu");
$('ul.submenu').css('left', '44px');
$('div#title_menu').hide();
});
}
//Daniel maya 02/06/2016 Display menu with click --END
$('div.menu>ul>li>ul>li>ul>li>a').click(function() { $('div.menu>ul>li>ul>li>a').click(function() {
openTime = 4000; openTime = 4000;
if( typeof(table_hover) != 'undefined') if( typeof(table_hover) != 'undefined')
$("ul#sub"+table_hover[0].id).hide(); $("ul#sub"+table_hover[0].id).hide();
if( typeof(table_hover2) != 'undefined') if( typeof(table_hover2) != 'undefined')
$("ul#sub"+table_hover2[0].id).hide(); $("ul#sub"+table_hover2[0].id).hide();
$('#menu').css('width', '45px'); $('#menu').css('width', '45px');
$('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() {
openTime = 4000;
if( typeof(table_hover) != 'undefined')
$("ul#sub"+table_hover[0].id).hide();
if( typeof(table_hover2) != 'undefined')
$("ul#sub"+table_hover2[0].id).hide();
$('#menu').css('width', '45px');
$('li.menu_icon').removeClass( " no_hidden_menu");
$('ul.submenu').css('left', '44px');
$('div#title_menu').hide();
});
}); });