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

fixed histogram and pie editors, added hits and map editors

Browse Source
This commit is contained in:
Rashid Khan 2013-02-08 15:57:24 -07:00
parent b94ea26b9c
commit 0d8f1fab9b
7 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboards.js
View File

@ -193,8 +193,8 @@ var dashboards =
labels : false,
colors : ['#BF3030','#1D7373','#86B32D','#A60000','#006363','#679B00'],
field : 'country',
mode : "query",
query : { query:"falstaff" }
mode : "terms",
query : { query:"*", field:"play_name" }
},
{
type : "text",

2
panels/histogram/editor.html
View File

@ -28,7 +28,7 @@
</form>
</div>
<div class="span1">
<i class="icon-remove" ng-click="remove_query(q);get_data()"></i>
<i class="icon-remove pointer" ng-click="remove_query(q)"></i>
</div>
</div>
<div class="row-fluid">

1
panels/histogram/module.js
View File

@ -25,6 +25,7 @@ angular.module('kibana.histogram', [])
$scope.remove_query = function(q) {
$scope.panel.query = _.without($scope.panel.query,q);
$scope.get_data();
}
$scope.add_query = function(label,query) {

11
panels/hits/editor.html
View File

@ -0,0 +1,11 @@
<div class="row-fluid">
<div class="span9">
<form class="input-append">
<h6>Query</h6>
<input type="text" style="width:85%" ng-model="panel.query">
<button class="btn" ng-click="get_data();"><i class="icon-search"></i></button>
</form>
</div>
<div class="span3"><h6>Font Size</h6>
<select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
</div>

11
panels/map/editor.html Normal file
View File

@ -0,0 +1,11 @@
<div class="row-fluid">
<div class="span9">
<form class="input-append">
<h6>Query</h6>
<input type="text" style="width:85%" ng-model="panel.query">
<button class="btn" ng-click="get_data();"><i class="icon-search"></i></button>
</form>
</div>
<div class="span3"><h6>Map</h6>
<select class="input-small" ng-model="panel.map" ng-options="f for f in ['world','europe','usa']"></select></span>
</div>

12
panels/pie/editor.html
View File

@ -31,8 +31,6 @@
</div>
<div ng-switch-when="query">
<div class="row-fluid">
<div class="span1">
</div>
<div class="span3">
<form style="margin-bottom: 0px">
<h6>Label</h6>
@ -46,12 +44,11 @@
<button class="btn" ng-click="add_query(newlabel,newquery);newlabel='';newquery=''"><i class="icon-plus"></i></button>
</form>
</div>
<div class="span1">
</div>
</div>
<div class="row-fluid" ng-repeat="q in panel.query">
<div class="span1">
<i class="icon-remove" ng-click="remove_query(q)"></i>
</div>
<div class="span4">
<div class="span3">
<form style="margin-bottom: 0px">
<input type="text" style="width:70%" ng-model="q.label">
</form>
@ -62,6 +59,9 @@
<button class="btn" ng-click="get_data()"><i class="icon-search"></i></button>
</form>
</div>
<div class="span1">
<i class="icon-remove pointer" ng-click="remove_query(q)"></i>
</div>
</div>
</div>
</div>

8
panels/pie/module.js
View File

@ -33,6 +33,14 @@ angular.module('kibana.pie', [])
eventBus.broadcast($scope.$id,$scope.panel.group,'get_time')
}
$scope.remove_query = function(q) {
if($scope.panel.mode !== 'query')
return false;
$scope.panel.query = _.without($scope.panel.query,q);
$scope.get_data();
}
$scope.add_query = function(label,query) {
if($scope.panel.mode !== 'query')
return false;