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

ux(): update data source list to card view, #4364

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-03-16 15:05:07 +01:00
parent e4c0c39fbf
commit 852ecd71f7
4 changed files with 42 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/app/features/plugins/ds_edit_ctrl.ts
View File

@@ -134,6 +134,24 @@ export class DataSourceEditCtrl {
});
}
};
confirmDelete() {
this.backendSrv.delete('/api/datasources/' + this.current.id).then(() => {
this.$location.path('datasources');
});
}
delete(s) {
this.$scope.appEvent('confirm-modal', {
title: 'Delete',
text: 'Are you sure you want to delete this datasource?',
yesText: "Delete",
icon: "fa-trash",
onConfirm: () => {
this.confirmDelete();
}
});
}
}
coreModule.controller('DataSourceEditCtrl', DataSourceEditCtrl);

3
public/app/features/plugins/partials/ds_edit.html
View File

@@ -66,6 +66,9 @@
<button type="submit" class="btn btn-success" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges()">Save</button>
<button type="submit" class="btn btn-secondary" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges(true)">
Test Connection
</button>
<button type="submit" class="btn btn-danger" ng-show="!ctrl.isNew" ng-click="ctrl.delete()">
Delete
</button>
<a class="btn btn-link" href="datasources">Cancel</a>
</div>

68
public/app/features/plugins/partials/ds_list.html
View File

@@ -18,23 +18,28 @@
<ol class="card-list" >
<li class="card-item-wrapper" ng-repeat="ds in ctrl.datasources">
<div class="card-item" >
<a class="card-item" href="datasources/edit/{{ds.id}}/">
<div class="card-item-header">
<i class="icon-gf icon-gf-{{ds.type}}"></i>
{{ds.type}}
</div>
<div class="card-item-body">
<a href="datasources/edit/{{ds.id}}">
<figure class="card-item-figure">
<img ng-src="{{ds.typeLogoUrl}}">
</figure>
</a>
<figure class="card-item-figure">
<img ng-src="{{ds.typeLogoUrl}}">
</figure>
<div class="card-item-details">
<a class="card-item-name" href="datasources/edit/{{ds.id}}/">{{ds.name}}</a>
<div class="card-item-sub-name">{{ds.url}}</div>
<div class="card-item-name">
{{ds.name}}
<span ng-if="ds.isDefault">
<span class="btn btn-secondary btn-mini">default</span>
</span>
</div>
<div class="card-item-sub-name">
{{ds.url}}
</div>
</div>
</div>
</div>
</a>
</li>
</ol>
</section>
@@ -43,49 +48,4 @@
<em>No data sources defined</em>
</div>
<table class="filter-table" ng-if="ctrl.datasources.length > 0">
<thead>
<tr>
<th><strong>name</strong></th>
<th><strong>type</strong></th>
<th><strong>url</strong></th>
<th style="width: 60px;"></th>
<th style="width: 85px;"></th>
<th style="width: 44px;"></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="ds in ctrl.datasources">
<td>
<a href="datasources/edit/{{ds.id}}">
<i class="icon-gf inline-icon-gf icon-gf-datasources"></i> &nbsp; {{ds.name}}
</a>
</td>
<td>
<span>{{ds.type}}</span>
</td>
<td>
<span>{{ds.url}}</span>
</td>
<td class="text-center">
<span ng-if="ds.isDefault">
<span class="btn btn-secondary btn-mini">default</span>
</span>
</td>
<td class="text-right">
<a href="datasources/edit/{{ds.id}}" class="btn btn-inverse btn-small">
<i class="fa fa-edit"></i>
Edit
</a>
</td>
<td class="text-right">
<a ng-click="ctrl.removeDataSource(ds)" class="btn btn-danger btn-small">
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>