tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed dialog of system warning alerts. Gitlab: #506

This commit is contained in:
m-lopez-f 2017-03-09 15:40:59 +01:00
parent cb2ff6e9f8
commit 8de4984faf
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/general/header.php
View File

@ -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'); 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 '<div id="alert_messages" style="display: none"></div>';
if ($config["alert_cnt"] > 0) { if ($config["alert_cnt"] > 0) {
$maintenance_link = 'javascript:'; $maintenance_link = 'javascript:';
$maintenance_title = __("System alerts detected - Please fix as soon as possible"); $maintenance_title = __("System alerts detected - Please fix as soon as possible");

20
pandora_console/include/javascript/jquery.pandora.js
View File

@ -59,14 +59,24 @@ $(document).ready (function () {
}); });
$("a.show_systemalert_dialog").click (function () { $("a.show_systemalert_dialog").click (function () {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.get ("ajax.php", jQuery.get ("ajax.php",
{"page": "operation/system_alert"}, {"page": "operation/system_alert"},
function (data, status) { function (data, status) {
$("#alert_messages").hide () $("#alert_messages").html(data);
.empty () $("#alert_messages").dialog({
.append (data) resizable: false,
.show (); 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" "html"
); );

1
pandora_console/index.php
View File

@ -933,6 +933,7 @@ if ($config["pure"] == 0) {
echo '</div>'; echo '</div>';
} }
echo '<div id="alert_messages" style="display: none"></div>';
/// Clippy function /// Clippy function
require_once('include/functions_clippy.php'); require_once('include/functions_clippy.php');
clippy_start($sec2); clippy_start($sec2);

10
pandora_console/operation/system_alert.php
View File

@ -18,10 +18,11 @@ echo "</span>
<img class='modalclosex cerrar' src='".$config['homeurl']."/images/icono_cerrar.png'> <img class='modalclosex cerrar' src='".$config['homeurl']."/images/icono_cerrar.png'>
</div>"; </div>";
echo "<div style='overflow-y:scroll;height:550px;'>";
echo get_pandora_error_for_header();
echo "</div>";
echo get_pandora_error_for_header()." echo "<div class='modalokbutton cerrar'>
<div class='modalokbutton cerrar'>
<span class='modalokbuttontext close'>OK</span> <span class='modalokbuttontext close'>OK</span>
</div>"; </div>";
@ -31,8 +32,7 @@ echo get_pandora_error_for_header()."
<script> <script>
$(".cerrar").click(function(){ $(".cerrar").click(function(){
$("#alert_messages").hide(); $("#alert_messages").dialog('close');
$( "#opacidad" ).remove();
}); });
</script> </script>