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

Merge remote-tracking branch 'origin/develop-filter-table' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-15 11:44:51 +01:00
commit 75bfe313d7
9 changed files with 125 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/admin/partials/edit_org.html
View File

@ -16,7 +16,7 @@
<h3 class="page-heading">Organization Users</h3>
<table class="grafana-options-table">
<table class="filter-table">
<tr>
<th>Username</th>
<th>Email</th>

57
public/app/features/admin/partials/orgs.html
View File

@ -1,37 +1,40 @@
<page-header model="navModel"></page-header>
<div class="page-container page-body">
<div class="page-action-bar">
<div class="page-action-bar">
<div class="page-action-bar__spacer"></div>
<a class="page-header__cta btn btn-success" href="org/new">
<i class="fa fa-plus"></i>
New Org
</a>
</div>
</div>
<table class="filter-table form-inline">
<thead>
<tr>
<th>Id</th>
<th>Name</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="org in orgs">
<td>{{org.id}}</td>
<td>{{org.name}}</td>
<td class="text-right">
<a href="admin/orgs/edit/{{org.id}}" class="btn btn-inverse btn-small">
<i class="fa fa-edit"></i>
Edit
</a>
&nbsp;&nbsp;
<a ng-click="deleteOrg(org)" class="btn btn-danger btn-small">
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
</tbody>
</table>
<table class="filter-table form-inline filter-table--hover">
<thead>
<tr>
<th>Id</th>
<th>Name</th>
<th style="width:1%"></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="org in orgs">
<td class="link-td">
<a href="admin/orgs/edit/{{org.id}}">
{{org.id}}
</a>
</td>
<td class="link-td">
<a href="admin/orgs/edit/{{org.id}}">
{{org.name}}
</a>
</td>
<td class="text-right">
<a ng-click="deleteOrg(org)" class="btn btn-danger btn-small">
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
</tbody>
</table>
</div>

56
public/app/features/admin/partials/users.html
View File

@ -14,39 +14,48 @@
</div>
<div class="admin-list-table">
<table class="filter-table form-inline">
<table class="filter-table form-inline filter-table--hover">
<thead>
<tr>
<th></th>
<th>Login</th>
<th>Email</th>
<th>
Seen
<tip>Time since user was seen using Grafana</tip>
</th>
<th></th>
Seen
<tip>Time since user was seen using Grafana</tip>
</th>
<th></th>
<th style="width: 1%"></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="user in ctrl.users">
<td class="width-4 text-center">
<img class="filter-table__avatar" ng-src="{{user.avatarUrl}}"></img>
</td>
<td>{{user.login}}</td>
<td>{{user.email}}</td>
<td>
{{user.lastSeenAtAge}}
</td>
<td>
<i class="fa fa-shield" ng-show="user.isAdmin" bs-tooltip="'Grafana Admin'"></i>
</td>
<td class="text-right">
<a href="admin/users/edit/{{user.id}}" class="btn btn-inverse btn-small">
<i class="fa fa-edit"></i>
Edit
<td class="width-4 text-center link-td">
<a href="admin/users/edit/{{user.id}}">
<img class="filter-table__avatar" ng-src="{{user.avatarUrl}}"></img>
</a>
&nbsp;&nbsp;
</td>
<td class="link-td">
<a href="admin/users/edit/{{user.id}}">
{{user.login}}
</a>
</td>
<td class="link-td">
<a href="admin/users/edit/{{user.id}}">
{{user.email}}
</a>
</td>
<td class="link-td">
<a href="admin/users/edit/{{user.id}}">
{{user.lastSeenAtAge}}
</a>
</td>
<td class="link-td">
<a href="admin/users/edit/{{user.id}}">
<i class="fa fa-shield" ng-show="user.isAdmin" bs-tooltip="'Grafana Admin'"></i>
</a>
</td>
<td class="text-right">
<a ng-click="ctrl.deleteUser(user)" class="btn btn-danger btn-small">
<i class="fa fa-remove"></i>
</a>
@ -60,10 +69,7 @@
<div class="admin-list-paging" ng-if="ctrl.showPaging">
<ol>
<li ng-repeat="page in ctrl.pages">
<button
class="btn btn-small"
ng-class="{'btn-secondary': page.current, 'btn-inverse': !page.current}"
ng-click="ctrl.navigateToPage(page)">{{page.page}}</button>
<button class="btn btn-small" ng-class="{'btn-secondary': page.current, 'btn-inverse': !page.current}" ng-click="ctrl.navigateToPage(page)">{{page.page}}</button>
</li>
</ol>
</div>

13
public/app/features/alerting/partials/notification_edit.html
View File

@ -37,15 +37,10 @@
<div class="gf-form-group" ng-include src="ctrl.notifierTemplateId">
</div>
<div class="gf-form-group">
<div class="gf-form-inline">
<div class="gf-form width-8">
<button type="submit" ng-click="ctrl.save()" class="btn btn-success width-7">Save</button>
</div>
<div class="gf-form width-8">
<button type="submit" ng-click="ctrl.testNotification()" class="btn btn-secondary width-7">Send Test</button>
</div>
</div>
<div class="gf-form-group gf-form-button-row">
<button type="submit" ng-click="ctrl.save()" class="btn btn-success width-7">Save</button>
<button type="submit" ng-click="ctrl.testNotification()" class="btn btn-secondary width-7">Send Test</button>
<a href="alerting/notifications" class="btn btn-inverse">Back</a>
</div>
</form>
</div>

63
public/app/features/alerting/partials/notifications_list.html
View File

@ -1,7 +1,7 @@
<page-header model="ctrl.navModel"></page-header>
<div class="page-container page-body">
<div class="page-action-bar">
<div class="page-action-bar">
<div class="page-action-bar__spacer">
</div>
@ -11,34 +11,35 @@
</a>
</div>
<table class="grafana-options-table">
<thead>
<th style="min-width: 200px"><strong>Name</strong></th>
<th style="min-width: 100px">Type</th>
<th style="width: 1%"></th>
</thead>
<tr ng-repeat="notification in ctrl.notifications">
<td>
<a href="alerting/notification/{{notification.id}}/edit">
{{notification.name}}
</a>
</td>
<td>
{{notification.type}}
</td>
<td class="text-right">
<span class="btn btn-secondary btn-small" ng-show="notification.isDefault == true">
default
</span>
<a href="alerting/notification/{{notification.id}}/edit" class="btn btn-inverse btn-small">
<i class="fa fa-edit"></i>
edit
</a>
<a ng-click="ctrl.deleteNotification(notification.id)" class="btn btn-danger btn-small">
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
</table>
<table class="filter-table filter-table--hover">
<thead>
<th style="min-width: 200px">
<strong>Name</strong>
</th>
<th style="min-width: 100px">Type</th>
<th style="width: 1%"></th>
</thead>
<tbody>
<tr ng-repeat="notification in ctrl.notifications">
<td class="link-td">
<a href="alerting/notification/{{notification.id}}/edit">
{{notification.name}}
</a>
</td>
<td class="link-td">
<a href="alerting/notification/{{notification.id}}/edit">
{{notification.type}}
</a>
</td>
<td class="text-right">
<span class="btn btn-secondary btn-small" ng-show="notification.isDefault == true">
default
</span>
<a ng-click="ctrl.deleteNotification(notification.id)" class="btn btn-danger btn-small">
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
</tbody>
</table>
</div>

2
public/app/features/org/partials/select_org.html
View File

@ -25,7 +25,7 @@
</div>
<div style="display: inline-block; width: 400px; margin: 30px 0">
<table class="grafana-options-table">
<table class="filter-table">
<tr ng-repeat="org in orgs">
<td class="nobg max-width-btns">
<a ng-click="setUsingOrg(org)" class="btn btn-inverse">

15
public/app/features/org/partials/teams.html
View File

@ -15,26 +15,23 @@
</div>
<div class="admin-list-table">
<table class="filter-table form-inline" ng-show="ctrl.teams.length > 0">
<table class="filter-table filter-table--hover form-inline" ng-show="ctrl.teams.length > 0">
<thead>
<tr>
<th>Name</th>
<th>Members</th>
<th></th>
<th style="width: 1%"></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="team in ctrl.teams">
<td>
<td class="link-td">
<a href="org/teams/edit/{{team.id}}">{{team.name}}</a>
</td>
<td>#Count</td>
<td class="link-td">
<a href="org/teams/edit/{{team.id}}">#Count</a>
</td>
<td class="text-right">
<a href="org/teams/edit/{{team.id}}" class="btn btn-inverse btn-small">
<i class="fa fa-edit"></i>
Edit
</a>
&nbsp;&nbsp;
<a ng-click="ctrl.deleteTeam(team)" class="btn btn-danger btn-small">
<i class="fa fa-remove"></i>
</a>

6
public/app/features/playlist/partials/playlist.html
View File

@ -34,7 +34,7 @@
</div>
<div ng-if="ctrl.filteredDashboards.length > 0">
<table class="grafana-options-table playlist-available-list">
<table class="filter-table playlist-available-list">
<tr ng-repeat="playlistItem in ctrl.filteredDashboards">
<td>
<i class="icon-gf icon-gf-dashboard"></i>
@ -51,7 +51,7 @@
</table>
</div>
<div class="playlist-search-results-container" ng-if="ctrl.filteredTags.length > 0;">
<table class="grafana-options-table playlist-available-list">
<table class="filter-table playlist-available-list">
<tr ng-repeat="tag in ctrl.filteredTags">
<td>
<a class="search-result-tag label label-tag" tag-color-from-name="tag.term">
@ -72,7 +72,7 @@
<div class="col-lg-6">
<h5 class="page headering playlist-column-header">Selected</h5>
<table class="grafana-options-table playlist-available-list">
<table class="filter-table playlist-available-list">
<tr ng-repeat="playlistItem in ctrl.playlistItems">
<td ng-if="playlistItem.type === 'dashboard_by_id'">
<i class="icon-gf icon-gf-dashboard"></i>&nbsp;&nbsp;{{playlistItem.title}}

17
public/sass/components/_filter-table.scss
View File

@ -42,6 +42,23 @@
}
}
.link-td {
padding: 0;
line-height: 30px;
height: 30px;
white-space: nowrap;
&.filter-table__switch-cell {
padding: 0;
border-right: 3px solid $page-bg;
}
a {
display: block;
padding: $table-cell-padding;
}
}
.ellipsis {
display: block;
width: 100%;