From ee0e286d9c8385641ef1358265c2cc5befbf1350 Mon Sep 17 00:00:00 2001 From: Enrique Camargo Date: Fri, 10 Feb 2017 10:33:24 +0100 Subject: [PATCH] Merge branch '52-la-ventana-de-alertas-deberia-de-ser-arrastrable-y-con-zindex-3-cambiar-tambien-texto-para-desactivar-logo-en-graficas-en-setup-visual' into 'develop' Make alert messages window draggable, zindex 3, change disable logo in graph - #52 See merge request !143 --- pandora_console/godmode/setup/setup_visuals.php | 2 +- pandora_console/include/javascript/jquery.pandora.js | 3 +++ pandora_console/include/styles/pandora.css | 7 ++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index f8ead5f576..64dcd69bb3 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -193,7 +193,7 @@ $table_styles->data[$row][0] = __('Custom logo in login') . ui_print_help_icon(" $row++; -$table_styles->data[$row][0] = __('Disable Pandora FMS on graphs'); +$table_styles->data[$row][0] = __('Disable logo in graphs'); $table_styles->data[$row][1] = __('Yes') . ' ' . html_print_radio_button_extended ('fixed_graph', 1, '', $config["fixed_graph"], $open, '','',true) . '  '; diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js index e815122b35..eb0ec04217 100644 --- a/pandora_console/include/javascript/jquery.pandora.js +++ b/pandora_console/include/javascript/jquery.pandora.js @@ -213,6 +213,9 @@ $(document).ready (function () { $('#menu').css('top','80px'); } }); + +$("#alert_messages").draggable(); +$("#alert_messages").css({'left':+parseInt(screen.width/2)-parseInt($("#alert_messages").css('width'))/2+'px'}); }); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 489225db0b..3180cde37c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -3449,13 +3449,10 @@ div.simple_value > a > span.text p -webkit-border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; - z-index:2; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - -webkit-transform: translate(-50%, -50%); + z-index:3; position:fixed; width:650px; + top: 30%; background:white; } .modalheader{