Skip to content

N
nexpie-grafana-theme
Commit 3f9a8ecc by Torkel Ödegaard
Options

Merge branch 'master' of github.com:grafana/grafana

parents 71a801bb f333ef80
Showing with 26 additions and 15 deletions
package.json
...@@ -53,5 +53,8 @@ ...@@ -53,5 +53,8 @@
"scripts": { "scripts": {
"test": "grunt test" "test": "grunt test"
}, },
"license": "Apache License" "license": "Apache License",
"dependencies": {
"grunt-contrib-concat": "^0.4.0"
}
} }
src/app/controllers/influxTargetCtrl.js
...@@ -17,7 +17,10 @@ function (angular) { ...@@ -17,7 +17,10 @@ function (angular) {
$scope.rawQuery = false; $scope.rawQuery = false;
$scope.functions = ['count', 'mean', 'sum', 'min', 'max', 'mode', 'distinct', 'median', 'derivative', 'stddev', 'first', 'last']; $scope.functions = ['count', 'mean', 'sum', 'min',
'max', 'mode', 'distinct', 'median',
'derivative', 'stddev', 'first', 'last',
'difference'];
$scope.operators = ['=', '=~', '>', '<', '!~', '<>']; $scope.operators = ['=', '=~', '>', '<', '!~', '<>'];
$scope.oldSeries = $scope.target.series; $scope.oldSeries = $scope.target.series;
$scope.$on('typeahead-updated', function(){ $scope.$on('typeahead-updated', function(){
......
src/app/services/influxdb/influxdbDatasource.js
...@@ -23,8 +23,7 @@ function (angular, _, kbn) { ...@@ -23,8 +23,7 @@ function (angular, _, kbn) {
}; };
} }
InfluxDatasource.prototype.query = function(options) { InfluxDatasource.prototype.query = function(filterSrv, options) {
var promises = _.map(options.targets, function(target) { var promises = _.map(options.targets, function(target) {
var query; var query;
......
src/css/default.min.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/index.html
...@@ -7,23 +7,16 @@ ...@@ -7,23 +7,16 @@
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">
<title>Grafana</title> <title>Grafana</title>
<link rel="stylesheet" href="css/bootstrap.dark.min.css" title="Light"> <link rel="stylesheet" href="css/default.min.css" title="Light">
<link rel="stylesheet" href="css/timepicker.css">
<link rel="stylesheet" href="css/spectrum.css">
<link rel="stylesheet" href="css/animate.min.css">
<link rel="stylesheet" href="css/normalize.min.css">
<!-- load the root require context --> <!-- load the root require context -->
<script src="vendor/require/require.js"></script> <script src="vendor/require/require.js"></script>
<script src="app/components/require.config.js"></script> <script src="app/components/require.config.js"></script>
<script>require(['app'], function () {})</script> <script>require(['app'], function () {})</script>
<style>
</style>
</head> </head>
<body ng-cloak body-class> <body ng-cloak body-class>
<!--<link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">-->
<link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css"> <link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">
<link rel="stylesheet" href="css/bootstrap-responsive.min.css"> <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
<link rel="stylesheet" href="css/font-awesome.min.css"> <link rel="stylesheet" href="css/font-awesome.min.css">
......
tasks/default_task.js
// Lint and build CSS // Lint and build CSS
module.exports = function(grunt) { module.exports = function(grunt) {
grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src']); grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src', 'concat']);
grunt.registerTask('test', ['default', 'karma:test']); grunt.registerTask('test', ['default', 'karma:test']);
}; };
\ No newline at end of file
tasks/options/concat.js 0 → 100644
module.exports = function(config) {
return {
css: {
src: [
'<%= srcDir %>/css/normalize.min.css',
'<%= srcDir %>/css/bootstrap.dark.min.css',
'<%= srcDir %>/css/timepicker.css',
'<%= srcDir &>/css/spectrum.css',
'<%= srcDir &>/css/animate.min.css'
],
dest: '<%= srcDir %>/css/default.min.css'
},
};
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment