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

fixed error log js and warning php visual style

Browse Source
This commit is contained in:
daniel 2018-11-23 09:21:22 +01:00
parent c8969582a0
commit 1b78c1a78d
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pandora_console/general/main_menu.php
View File

@ -335,11 +335,8 @@ $(document).ready( function() {
handsIn = 0; handsIn = 0;
handsIn2 = 0; handsIn2 = 0;
//Daniel maya 02/06/2016 Display menu with click --INI
if(!click_display){ if(!click_display){
//Daniel barbero 10/08/2016 Display menu with click --INI
if (autohidden_menu) { if (autohidden_menu) {
//Daniel barbero 10/08/2016 Display menu with click --END
$('.menu_icon').mouseenter(function() { $('.menu_icon').mouseenter(function() {
table_hover = $(this); table_hover = $(this);
handsIn = 1; handsIn = 1;
@ -359,37 +356,10 @@ $(document).ready( function() {
} }
}, 2500); }, 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{ }else{
$(document).ready(function() { $(document).ready(function() {
//Daniel barbero 10/08/2016 Display menu with click --INI
if (autohidden_menu) { if (autohidden_menu) {
//Daniel barbero 10/08/2016 Display menu with click --END
$('.menu_icon').on("click", function() { $('.menu_icon').on("click", function() {
if( typeof(table_hover) != 'undefined'){ if( typeof(table_hover) != 'undefined'){
$("ul#sub"+table_hover[0].id).hide(); $("ul#sub"+table_hover[0].id).hide();
@ -409,7 +379,6 @@ $(document).ready( function() {
} }
}, 5500); }, 5500);
}); });
//Daniel barbero 10/08/2016 Display menu with click --INI
} else { } else {
$('.menu_icon').on("click", function() { $('.menu_icon').on("click", function() {
if( typeof(table_hover) != 'undefined'){ if( typeof(table_hover) != 'undefined'){
@ -421,10 +390,8 @@ $(document).ready( function() {
$("ul#sub"+table_hover[0].id).show(); $("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
- $('.has_submenu').mouseenter(function() { - $('.has_submenu').mouseenter(function() {
table_hover2 = $(this); table_hover2 = $(this);

8
pandora_console/godmode/setup/setup_visuals.php
View File

@ -1208,21 +1208,21 @@ $(".logo_preview").click (function(e) {
switch (e.target.id) { switch (e.target.id) {
case 'button-custom_logo_preview': case 'button-custom_logo_preview':
icon_name = $("select#custom_logo option:selected").val(); icon_name = $("select#custom_logo option:selected").val();
icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name; icon_path = "<?php echo $config['homeurl']; if(enterprise_installed()){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
options.grayed = true; options.grayed = true;
break; break;
case 'button-custom_logo_white_bg_preview': case 'button-custom_logo_white_bg_preview':
icon_name = $("select#custom_logo_white_bg option:selected").val(); icon_name = $("select#custom_logo_white_bg option:selected").val();
icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name; icon_path = "<?php echo $config['homeurl']; if(enterprise_installed()){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
break; break;
case 'button-custom_logo_login_preview': case 'button-custom_logo_login_preview':
icon_name = $("select#custom_logo_login option:selected").val(); icon_name = $("select#custom_logo_login option:selected").val();
icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name; icon_path = "<?php echo $config['homeurl']; if(enterprise_installed()){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
options.grayed = true; options.grayed = true;
break; break;
case 'button-custom_splash_login_preview': case 'button-custom_splash_login_preview':
icon_name = $("select#custom_splash_login option:selected").val(); icon_name = $("select#custom_splash_login option:selected").val();
icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_splash_login/" + icon_name; icon_path = "<?php echo $config['homeurl']; if(enterprise_installed()){ echo 'enterprise/'; } ?>images/custom_splash_login/" + icon_name;
options.title = "<?php echo __('Splash Preview'); ?>"; options.title = "<?php echo __('Splash Preview'); ?>";
break; break;
case 'button-custom_docs_logo_preview': case 'button-custom_docs_logo_preview':