mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop
This commit is contained in:
commit
d7f6868217
@ -28,10 +28,6 @@ require_once ('functions_agents.php');
|
|||||||
require_once($config['homedir'] . "/include/functions_modules.php");
|
require_once($config['homedir'] . "/include/functions_modules.php");
|
||||||
require_once($config['homedir'] . "/include/functions_groups.php");
|
require_once($config['homedir'] . "/include/functions_groups.php");
|
||||||
ui_require_css_file ('cluetip');
|
ui_require_css_file ('cluetip');
|
||||||
$hack_metaconsole = '';
|
|
||||||
if (defined('METACONSOLE'))
|
|
||||||
$hack_metaconsole = '../../';
|
|
||||||
ui_require_jquery_file ('cluetip', $hack_metaconsole . 'include/javascript/');
|
|
||||||
|
|
||||||
// Check if a node descends from a given node
|
// Check if a node descends from a given node
|
||||||
function networkmap_is_descendant ($node, $ascendant, $parents) {
|
function networkmap_is_descendant ($node, $ascendant, $parents) {
|
||||||
@ -1796,14 +1792,41 @@ function networkmap_get_new_nodes_from_ip_mask($ip_mask, $fields = array(), $str
|
|||||||
|
|
||||||
?>
|
?>
|
||||||
<script language="javascript" type="text/javascript">
|
<script language="javascript" type="text/javascript">
|
||||||
/* <![CDATA[ */
|
|
||||||
$(document).ready (function () {
|
$(document).ready (function () {
|
||||||
$("area[title!='<?php echo 'Pandora FMS'; ?>']").cluetip ({
|
// TODO: Implement the jquery tooltip functionality everywhere
|
||||||
arrows: true,
|
// and remove the cluetip code.
|
||||||
attribute: 'title',
|
$("area[title!='<?php echo 'Pandora FMS'; ?>']")
|
||||||
cluetipClass: 'default',
|
.each(function (index, element) {
|
||||||
positionBy: "bottomTop"
|
// Store the title.
|
||||||
});
|
// The title stores the url into a data property
|
||||||
|
$(element).data('uri', $(element).prop('title'));
|
||||||
|
})
|
||||||
|
.tooltip({
|
||||||
|
track: true,
|
||||||
|
content: '<?php html_print_image("images/spinner.gif"); ?>',
|
||||||
|
open: function (evt, ui) {
|
||||||
|
var elem = $(this);
|
||||||
|
var uri = elem.data('uri');
|
||||||
|
|
||||||
|
if (typeof uri != 'undefined' && uri.length > 0) {
|
||||||
|
var jqXHR = $.ajax(uri).done(function(data) {
|
||||||
|
elem.tooltip('option', 'content', data);
|
||||||
|
});
|
||||||
|
// Store the connection handler
|
||||||
|
elem.data('jqXHR', jqXHR);
|
||||||
|
}
|
||||||
|
|
||||||
|
$(".ui-tooltip>.ui-tooltip-content:not(.cluetip-default)")
|
||||||
|
.addClass("cluetip-default");
|
||||||
|
},
|
||||||
|
close: function (evt, ui) {
|
||||||
|
var elem = $(this);
|
||||||
|
var jqXHR = elem.data('jqXHR');
|
||||||
|
|
||||||
|
// Close the connection handler
|
||||||
|
if (typeof jqXHR != 'undefined')
|
||||||
|
jqXHR.abort();
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
/* ]]> */
|
|
||||||
</script>
|
</script>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user