Private GIT

Skip to content
Snippets Groups Projects
Commit 20b8427b authored by Maximilien Bersoult's avatar Maximilien Bersoult
Browse files

Change to new chart style on monitoring listing

parent a3d8b0a1
No related branches found
No related tags found
No related merge requests found
......@@ -1454,6 +1454,11 @@ td,a.infobulle:hover td {padding:0px;}
display: none;
position: fixed;
z-index: 500;
width: 500px;
padding: 3px;
border-radius: 4px;
box-shadow: 5px 5px 2px #d1d2d4;
border: 1px solid #d1d2d4;
}
.popup_volante {
......
......@@ -854,47 +854,23 @@ function set_page(page) {
// Popin images
var func_displayIMG = function(event) {
var NewImage = new Image(),
self = event.currentTarget;
var self = event.currentTarget;
jQuery('.img_volante').html('<img class="mimgload" src="img/misc/ajax-loader.gif" />');
jQuery('.img_volante').css('left', event.pageX + 20);
jQuery('.img_volante').css('top', (jQuery(window).height() / 2) - (jQuery('.img_volante').height() / 2));
jQuery('.img_volante').show();
var elements = $(self).id.split('-');
var NewImageAlt = 'graph popup' + '&index=' + elements[0] + '&time=<?php print time(); ?>';
jQuery('.img_volante').append('<img style="display: none" src="' + 'include/views/graphs/generateGraphs/generateImage.php?index='+ elements[0] + '" alt="' + NewImageAlt + '" title="' + NewImageAlt + '" />');
NewImage.onload = function(){
jQuery('.img_volante .mimgload').remove();
<?php if ($centreon->user->get_js_effects() > 0) { ?>
jQuery('.img_volante').stop(true, true).animate({width: self.width, height: self.height, top: (jQuery(window).height() / 2) - (self.height / 2)}, 25);
jQuery('.img_volante img').stop(true, true).fadeIn(1000);
<?php } else { ?>
jQuery('.img_volante').css('left', jQuery('.img_volante').attr('left'));
jQuery('.img_volante').css('top', (jQuery(window).height() / 2) - (self.height / 2));
jQuery('.img_volante img').show();
<?php } ?>
};
NewImage.src = 'include/views/graphs/generateGraphs/generateImage.php?index='+ elements[0];
if (NewImage.complete) {
jQuery('.img_volante .mimgload').remove();
<?php if ($centreon->user->get_js_effects() > 0) { ?>
jQuery('.img_volante').stop(true, true).animate({width: NewImage.width, height: NewImage.height, top: (jQuery(window).height() / 2) - (NewImage.height / 2)}, 25);
jQuery('.img_volante img').stop(true, true).fadeIn(1000);
<?php } else { ?>
jQuery('.img_volante').css('left', jQuery('.img_volante').attr('left'));
jQuery('.img_volante').css('top', (jQuery(window).height() / 2) - (NewImage.height / 2));
jQuery('.img_volante img').show();
<?php } ?>
}
var chartElem = jQuery('<div></div>')
.addClass('chart')
.data('graphType', 'service')
.data('graphId', jQuery(self).attr('id').replace('-', '_'))
.appendTo(jQuery('.img_volante'));
jQuery(chartElem).centreonGraph({height: 140, interval: '24h'});
};
var func_hideIMG = function(event) {
jQuery('.img_volante').hide();
jQuery('.img_volante').empty();
jQuery('.img_volante').css('width', 'auto');
jQuery('.img_volante').css('height', 'auto');
};
// Poppin Function
......
<link href="./include/common/javascript/charts/c3.min.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="./include/common/javascript/tool.js"></script>
<form name='form'>
<input name="p" value="{$p}" type="hidden">
......@@ -92,3 +93,10 @@
<input type='hidden' id='limit' name='limit' value='{$limit}'>
{$form.hidden}
</form>
<script src="./include/common/javascript/moment-with-locales.js"></script>
<script src="./include/common/javascript/moment-timezone-with-data.min.js"></script>
<script src="./include/common/javascript/charts/d3.min.js"></script>
<script src="./include/common/javascript/charts/c3.min.js"></script>
<script src="./include/common/javascript/charts/d3-timeline.js"></script>
<script src="./include/views/graphs/javascript/centreon-graph.js"></script>
<script src="./include/views/graphs/javascript/centreon-c3.js"></script>
......@@ -287,7 +287,7 @@
<xsl:element name="a">
<xsl:attribute name="href">main.php?p=204&amp;mode=0&amp;svc_id=<xsl:value-of select="hnl"/>;<xsl:value-of select="sdl"/></xsl:attribute>
<xsl:element name="img">
<xsl:attribute name="id"><xsl:value-of select="svc_index"/>-<xsl:value-of select="svc_id"/></xsl:attribute>
<xsl:attribute name="id"><xsl:value-of select="hid"/>_<xsl:value-of select="svc_id"/></xsl:attribute>
<xsl:attribute name="class">graph-volant ico-18</xsl:attribute>
<xsl:attribute name="src">./img/icons/chart.png</xsl:attribute>
</xsl:element>
......
......@@ -151,7 +151,9 @@
this.chart = c3.generate({
bindto: '#' + this.$elem.attr('id'),
height: this.settings.height,
size: {
height: this.settings.height
},
data: parsedData.data,
axis: axis,
tooltip: {
......@@ -482,10 +484,10 @@
$.fn.centreonGraph = function (options) {
var args = Array.prototype.slice.call(arguments, 1);
var settings = $.extend({}, $.fn.centreonGraph.defaults, options);
var settings = jQuery.extend({}, $.fn.centreonGraph.defaults, options);
var methodReturn;
var $set = this.each(function () {
var $this = $(this);
var $this = jQuery(this);
var data = $this.data("centreonGraph");
if (!data) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment