From 1b78c1a78d3ecf637cff7cec7947c7aa9a51f2e0 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 23 Nov 2018 09:21:22 +0100 Subject: [PATCH] fixed error log js and warning php visual style --- pandora_console/general/main_menu.php | 33 ------------------- .../godmode/setup/setup_visuals.php | 8 ++--- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 2c4ca1e6cb..8cb37fa2c4 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -335,11 +335,8 @@ $(document).ready( function() { handsIn = 0; handsIn2 = 0; - //Daniel maya 02/06/2016 Display menu with click --INI if(!click_display){ - //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').mouseenter(function() { table_hover = $(this); handsIn = 1; @@ -359,37 +356,10 @@ $(document).ready( function() { } }, 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(); @@ -409,7 +379,6 @@ $(document).ready( function() { } }, 5500); }); - //Daniel barbero 10/08/2016 Display menu with click --INI } else { $('.menu_icon').on("click", function() { if( typeof(table_hover) != 'undefined'){ @@ -421,10 +390,8 @@ $(document).ready( function() { $("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() { table_hover2 = $(this); diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 19d46d9769..d8902f2bc0 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -1208,21 +1208,21 @@ $(".logo_preview").click (function(e) { switch (e.target.id) { case 'button-custom_logo_preview': icon_name = $("select#custom_logo option:selected").val(); - icon_path = "images/custom_logo/" + icon_name; + icon_path = "images/custom_logo/" + icon_name; options.grayed = true; break; case 'button-custom_logo_white_bg_preview': icon_name = $("select#custom_logo_white_bg option:selected").val(); - icon_path = "images/custom_logo/" + icon_name; + icon_path = "images/custom_logo/" + icon_name; break; case 'button-custom_logo_login_preview': icon_name = $("select#custom_logo_login option:selected").val(); - icon_path = "images/custom_logo_login/" + icon_name; + icon_path = "images/custom_logo_login/" + icon_name; options.grayed = true; break; case 'button-custom_splash_login_preview': icon_name = $("select#custom_splash_login option:selected").val(); - icon_path = "images/custom_splash_login/" + icon_name; + icon_path = "images/custom_splash_login/" + icon_name; options.title = ""; break; case 'button-custom_docs_logo_preview':