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: sidenav fixes and dashboard search changes

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-08-17 12:06:51 +02:00
parent a4da0adf38
commit 6609dbff90
17 changed files with 200 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/org/org_users_ctrl.ts
View File

@@ -47,7 +47,7 @@ export class OrgUsersCtrl {
} else if (config.disableLoginForm) {
return "Add Users";
} else {
return "Add or Invite";
return "Add";
}
}

8
public/app/features/org/partials/orgUsers.html
View File

@@ -26,12 +26,12 @@
</a>
</li>
<li class="gf-tabs-item">
<a class="gf-tabs-link" ng-click="ctrl.editor.index = 0" ng-class="{active: ctrl.editor.index === 1}">
<a class="gf-tabs-link" ng-click="ctrl.editor.index = 1" ng-class="{active: ctrl.editor.index === 1}">
Groups (0)
</a>
</li>
<li class="gf-tabs-item" ng-show="ctrl.showInviteUI">
<a class="gf-tabs-link" ng-click="ctrl.editor.index = 1" ng-class="{active: ctrl.editor.index === 2}">
<li class="gf-tabs-item" ng-show="ctrl.pendingInvites.length">
<a class="gf-tabs-link" ng-click="ctrl.editor.index = 2" ng-class="{active: ctrl.editor.index === 2}">
Pending Invitations ({{ctrl.pendingInvites.length}})
</a>
</li>
@@ -76,7 +76,7 @@
</table>
</div>
<div ng-if="ctrl.editor.index === 1 && ctrl.showInviteUI">
<div ng-if="ctrl.editor.index === 2">
<table class="filter-table form-inline">
<thead>
<tr>