Skip to content

N
nexpie-grafana-theme
Commit d705ee70 by Torkel Ödegaard
Options

Refactoring out http settings to its own partial

parent 448717a7
Showing with 69 additions and 49 deletions
src/app/features/org/datasourceEditCtrl.js
...@@ -10,6 +10,8 @@ function (angular) { ...@@ -10,6 +10,8 @@ function (angular) {
module.controller('DataSourceEditCtrl', function($scope, $q, backendSrv, $routeParams, $location, datasourceSrv) { module.controller('DataSourceEditCtrl', function($scope, $q, backendSrv, $routeParams, $location, datasourceSrv) {
$scope.httpConfigPartialSrc = 'app/features/org/partials/datasourceHttpConfig.html';
var defaults = { var defaults = {
name: '', name: '',
type: 'graphite', type: 'graphite',
......
src/app/features/org/partials/datasourceEdit.html
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form"> <div class="tight-form last">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px"> <li class="tight-form-item" style="width: 80px">
Type Type
...@@ -42,54 +42,9 @@ ...@@ -42,54 +42,9 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<br>
<h5>Http settings</h5>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px">
Url
</li>
<li>
<input type="text" class="tight-form-input input-xlarge" ng-model='current.url' placeholder="http://my.server.com:8080" required></input>
</li>
<li class="tight-form-item">
Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</label>
</li>
<li>
<select class="input-medium tight-form-input" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px">
Basic Auth
</li>
<li class="tight-form-item">
Enable&nbsp;
<input class="cr1" id="current.basicAuth" type="checkbox" ng-model="current.basicAuth" ng-checked="current.basicAuth">
<label for="current.basicAuth" class="cr1"></label>
</li>
<li class="tight-form-item" ng-if="current.basicAuth">
User
</li>
<li ng-if="current.basicAuth">
<input type="text" class="tight-form-input input-medium" style="width: 139px" ng-model='current.basicAuthUser' placeholder="user" required></input>
</li>
<li class="tight-form-item" style="width: 67px" ng-if="current.basicAuth">
Password
</li>
<li ng-if="current.basicAuth">
<input type="password" class="tight-form-input input-medium" ng-model='current.basicAuthPassword' placeholder="password" required></input>
</li>
</ul>
<div class="clearfix"></div>
</div>
<br>
<div ng-include="datasourceMeta.partials.config" ng-if="datasourceMeta.partials.config"></div> <div ng-include="datasourceMeta.partials.config" ng-if="datasourceMeta.partials.config"></div>
<br> <br>
<br>
<div class="pull-right"> <div class="pull-right">
<button type="submit" class="btn btn-success" ng-show="isNew" ng-click="add()">Add</button> <button type="submit" class="btn btn-success" ng-show="isNew" ng-click="add()">Add</button>
<button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="update()">Update</button> <button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="update()">Update</button>
......
src/app/features/org/partials/datasourceHttpConfig.html 0 → 100644
<br>
<h5>Http settings</h5>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px">
Url
</li>
<li>
<input type="text" class="tight-form-input input-xlarge" ng-model='current.url' placeholder="http://my.server.com:8080" required></input>
</li>
<li class="tight-form-item">
Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</label>
</li>
<li>
<select class="input-medium tight-form-input" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 80px">
Basic Auth
</li>
<li class="tight-form-item">
Enable&nbsp;
<input class="cr1" id="current.basicAuth" type="checkbox" ng-model="current.basicAuth" ng-checked="current.basicAuth">
<label for="current.basicAuth" class="cr1"></label>
</li>
<li class="tight-form-item" ng-if="current.basicAuth">
User
</li>
<li ng-if="current.basicAuth">
<input type="text" class="tight-form-input input-medium" style="width: 139px" ng-model='current.basicAuthUser' placeholder="user" required></input>
</li>
<li class="tight-form-item" style="width: 67px" ng-if="current.basicAuth">
Password
</li>
<li ng-if="current.basicAuth">
<input type="password" class="tight-form-input input-medium" ng-model='current.basicAuthPassword' placeholder="password" required></input>
</li>
</ul>
<div class="clearfix"></div>
</div>
src/app/plugins/datasource/elasticsearch/partials/config.html
<div ng-include="httpConfigPartialSrc"></div>
<br>
<h5>Elastic search details</h5> <h5>Elastic search details</h5>
<div class="tight-form last"> <div class="tight-form last">
......
src/app/plugins/datasource/influxdb/partials/config.html
<div ng-include="httpConfigPartialSrc"></div>
<br>
<h5>InfluxDB Details</h5> <h5>InfluxDB Details</h5>
<div class="tight-form"> <div class="tight-form">
......
src/app/plugins/datasource/influxdb/plugin.json
...@@ -13,6 +13,5 @@ ...@@ -13,6 +13,5 @@
"annotations": "app/plugins/datasource/influxdb/partials/annotations.editor.html" "annotations": "app/plugins/datasource/influxdb/partials/annotations.editor.html"
}, },
"metrics": true, "metrics": true
"annotations": true
} }
src/app/plugins/datasource/influxdb_08/partials/config.html
<div ng-include="httpConfigPartialSrc"></div>
<br>
<h5>InfluxDB Details</h5> <h5>InfluxDB Details</h5>
<div class="tight-form"> <div class="tight-form">
......
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