IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(graph): fixed issue with graph and legend to the right in snapshots, closes #4400

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-03-20 11:17:53 +01:00
parent 82232e2530
commit f4feb38089
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/panel/graph/legend.js
View File

@@ -101,6 +101,7 @@ function (angular, _, $) {
} }
function render() { function render() {
console.log('render legend');
if (firstRender) { if (firstRender) {
elem.append($container); elem.append($container);
$container.on('click', '.graph-legend-icon', openColorSelector); $container.on('click', '.graph-legend-icon', openColorSelector);

22
public/app/plugins/panel/graph/module.html
View File

@@ -1,22 +0,0 @@
<div class="graph-wrapper" ng-class="{'graph-legend-rightside': ctrl.panel.legend.rightSide}">
<div class="graph-canvas-wrapper">
<div ng-if="datapointsWarning" class="datapoints-warning">
<span class="small" ng-show="!datapointsCount">
No datapoints <tip>No datapoints returned from metric query</tip>
</span>
<span class="small" ng-show="datapointsOutside">Datapoints outside time range <tip>Can be caused by timezone mismatch between browser and graphite server</tip></span>
</div>
<div grafana-graph class="histogram-chart" ng-dblclick="ctrl.zoomOut()">
</div>
</div>
<div class="graph-legend-wrapper" ng-if="ctrl.panel.legend.show" graph-legend></div>
</div>
<div class="clearfix"></div>

3
public/app/plugins/panel/graph/module.ts
View File

@@ -4,6 +4,7 @@ import './graph';
import './legend'; import './legend';
import './series_overrides_ctrl'; import './series_overrides_ctrl';
import template from './template';
import moment from 'moment'; import moment from 'moment';
import kbn from 'app/core/utils/kbn'; import kbn from 'app/core/utils/kbn';
import _ from 'lodash'; import _ from 'lodash';
@@ -83,7 +84,7 @@ var panelDefaults = {
}; };
class GraphCtrl extends MetricsPanelCtrl { class GraphCtrl extends MetricsPanelCtrl {
static templateUrl = 'module.html'; static template = template;
hiddenSeries: any = {}; hiddenSeries: any = {};
seriesList: any = []; seriesList: any = [];

28
public/app/plugins/panel/graph/template.ts Normal file
View File

@@ -0,0 +1,28 @@
var template = `
<div class="graph-wrapper" ng-class="{'graph-legend-rightside': ctrl.panel.legend.rightSide}">
<div class="graph-canvas-wrapper">
<div ng-if="datapointsWarning" class="datapoints-warning">
<span class="small" ng-show="!datapointsCount">
No datapoints <tip>No datapoints returned from metric query</tip>
</span>
<span class="small" ng-show="datapointsOutside">
Datapoints outside time range
<tip>Can be caused by timezone mismatch between browser and graphite server</tip>
</span>
</div>
<div grafana-graph class="histogram-chart" ng-dblclick="ctrl.zoomOut()">
</div>
</div>
<div class="graph-legend-wrapper" graph-legend></div>
</div>
<div class="clearfix"></div>
`;
export default template;