diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index ace65271c6..a983ebafbd 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -242,8 +242,6 @@ config_check(); set_pandora_error_for_header('There are one or more minor releases waiting for update, there are required administrator permissions', 'minor release/s available'); } - echo ''; - if ($config["alert_cnt"] > 0) { $maintenance_link = 'javascript:'; $maintenance_title = __("System alerts detected - Please fix as soon as possible"); diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js index eb0ec04217..8e1973846c 100644 --- a/pandora_console/include/javascript/jquery.pandora.js +++ b/pandora_console/include/javascript/jquery.pandora.js @@ -59,14 +59,24 @@ $(document).ready (function () { }); $("a.show_systemalert_dialog").click (function () { - $('body').append( "
" ); - jQuery.get ("ajax.php", + jQuery.get ("ajax.php", {"page": "operation/system_alert"}, function (data, status) { - $("#alert_messages").hide () - .empty () - .append (data) - .show (); + $("#alert_messages").html(data); + $("#alert_messages").dialog({ + resizable: false, + draggable: true, + width: 450, + modal: true, + overlay: { + opacity: 0.5, + background: "black" + }, + open: function (event, ui) { + dialog_open = this; + } + }); + $("#alert_messages").css('padding','0px'); }, "html" ); diff --git a/pandora_console/index.php b/pandora_console/index.php index 5b52479ac3..2765e56d8d 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -933,6 +933,7 @@ if ($config["pure"] == 0) { echo ''; } +echo ''; /// Clippy function require_once('include/functions_clippy.php'); clippy_start($sec2); diff --git a/pandora_console/operation/system_alert.php b/pandora_console/operation/system_alert.php index 85bbdf26c4..31334e159a 100644 --- a/pandora_console/operation/system_alert.php +++ b/pandora_console/operation/system_alert.php @@ -7,10 +7,10 @@ echo "
"; -if(!enterprise_installed()){ +if (!enterprise_installed()) { echo "Community version"; } -else{ +else { echo "Enterprise version"; } @@ -18,10 +18,11 @@ echo "
"; +echo "
"; +echo get_pandora_error_for_header(); +echo "
"; -echo get_pandora_error_for_header()." - -
+echo "
OK
"; @@ -31,8 +32,7 @@ echo get_pandora_error_for_header()."