Commit 1d769fe4 by Torkel Ödegaard

Worked on handling marking a datasource as the default

parent 1b9b8ba2
...@@ -26,14 +26,26 @@ ...@@ -26,14 +26,26 @@
<em>No datasources defined</em> <em>No datasources defined</em>
</div> </div>
<table class="grafana-options-table"> <table class="grafana-options-table">
<tr>
<td><strong>Name<strong></td>
<td><strong>Url<strong></td>
<td><strong><strong></td>
<td><strong><strong></td>
<td><strong><strong></td>
</tr>
<tr ng-repeat="ds in datasources"> <tr ng-repeat="ds in datasources">
<td style="width:1%"> <td style="width:1%">
<i class="icon-hdd"></i> &nbsp; <i class="fa fa-database"></i> &nbsp;
{{ds.name}} {{ds.name}}
</td> </td>
<td style="width:90%"> <td style="width:90%">
{{ds.url}} {{ds.url}}
</td> </td>
<td style="width:2%" class="text-center">
<span ng-if="ds.isDefault">
<span class="label label-info">default</span>
</span>
</td>
<td style="width: 1%"> <td style="width: 1%">
<a ng-click="edit(ds)" class="btn btn-success btn-mini"> <a ng-click="edit(ds)" class="btn btn-success btn-mini">
<i class="fa fa-edit"></i> <i class="fa fa-edit"></i>
...@@ -60,6 +72,7 @@ ...@@ -60,6 +72,7 @@
<label class="small">Type</label> <label class="small">Type</label>
<select class="input-medium" ng-model="current.type" ng-options="f for f in ['graphite', 'influxdb', 'opentsdb']" ng-change="typeChanged()"></select> <select class="input-medium" ng-model="current.type" ng-options="f for f in ['graphite', 'influxdb', 'opentsdb']" ng-change="typeChanged()"></select>
</div> </div>
<editor-opt-bool text="Mark as default" model="current.isDefault" change="render()"></editor-opt-bool>
</div> </div>
<div class="editor-row"> <div class="editor-row">
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="page-alert-list"> <div class="page-alert-list">
<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert"> <div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert">
<button type="button" class="alert-close" ng-click="dashAlerts.clear(alert)"> <button type="button" class="alert-close" ng-click="dashAlerts.clear(alert)">
<i class="icon-remove-sign"></i> <i class="fa fa-times-circle"></i>
</button> </button>
<div class="alert-title">{{alert.title}}</div> <div class="alert-title">{{alert.title}}</div>
<div ng-bind-html='alert.text'></div> <div ng-bind-html='alert.text'></div>
......
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