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

updated

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-09-30 15:34:31 +02:00
parent 69d2a8f4fa
commit 6991e5f3ef
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/panels/overview/module.html
View File

@ -1,6 +1,4 @@
<div ng-controller='OverviewCtrl' <div ng-controller='OverviewCtrl'>
style="min-height:{{panel.height || row.height}}"
ng-class="{'panel-fullscreen': fullscreen}">
<h2>hello</h2> <h2>hello</h2>
<div class="overview-series-list"> <div class="overview-series-list">
@ -11,15 +9,23 @@
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="panel-full-edit-tabs" ng-if="editMode"> <div style="margin-top: 30px" ng-if="editMode">
<div ng-model="editor.index" bs-tabs> <div class="dashboard-editor-header">
<div ng-repeat="tab in editorTabs" data-title="{{tab}}"> <div class="dashboard-editor-title">
</div> <i class="icon icon-bar-chart"></i>
</div> Panel settings
</div>
<div class="tab-content" ng-repeat="tab in panelMeta.fullEditorTabs" ng-show="editorTabs[editor.index] == tab.title"> <div ng-model="editor.index" bs-tabs>
<div ng-include src="tab.src"></div> <div ng-repeat="tab in editorTabs" data-title="{{tab}}">
</div> </div>
</div> </div>
</div>
<div class="dashboard-editor-body">
<div ng-repeat="tab in panelMeta.fullEditorTabs" ng-if="editorTabs[editor.index] == tab.title">
<div ng-include src="tab.src"></div>
</div>
</div>
</div>
</div> </div>

4
src/app/panels/overview/module.js
View File

@ -11,7 +11,7 @@ function (angular, app, _, timeSeries) {
var module = angular.module('grafana.panels.overview', []); var module = angular.module('grafana.panels.overview', []);
app.useModule(module); app.useModule(module);
module.controller('OverviewCtrl', function($scope, panelSrv) { module.controller('OverviewCtrl', function($scope, panelSrv, timeSrv) {
$scope.panelMeta = { $scope.panelMeta = {
description : "A panel to show an overview of different metrics through avg, total, current numbers and sparklines", description : "A panel to show an overview of different metrics through avg, total, current numbers and sparklines",
@ -39,7 +39,7 @@ function (angular, app, _, timeSeries) {
}; };
$scope.get_data = function() { $scope.get_data = function() {
$scope.rangeUnparsed = $scope.filter.timeRange(false); $scope.rangeUnparsed = timeSrv.timeRange(false);
var metricsQuery = { var metricsQuery = {
range: $scope.rangeUnparsed, range: $scope.rangeUnparsed,