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

minor user avatar stuff

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-08-18 14:49:04 +02:00
parent d452d3ce93
commit 011c582ebb
6 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/api/index.go
View File

@ -235,12 +235,19 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
},
},
{
Text: "Users",
Text: "Members",
Id: "users",
Description: "Manage users & user groups",
Icon: "fa fa-fw fa-users",
Description: "Manage org members",
Icon: "icon-gf icon-gf-users",
Url: setting.AppSubUrl + "/org/users",
},
{
Text: "Groups",
Id: "users",
Description: "Manage org groups",
Icon: "fa fa-fw fa-users",
Url: setting.AppSubUrl + "/org/user-groups",
},
{
Text: "API Keys",
Id: "apikeys",

5
pkg/api/user.go
View File

@ -1,6 +1,7 @@
package api
import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
@ -247,6 +248,10 @@ func searchUser(c *middleware.Context) (*m.SearchUsersQuery, error) {
return nil, err
}
for _, user := range query.Result.Users {
user.AvatarUrl = dtos.GetGravatarUrl(user.Email)
}
query.Result.Page = page
query.Result.PerPage = perPage

1
pkg/models/user.go
View File

@ -197,6 +197,7 @@ type UserSearchHitDTO struct {
Name string `json:"name"`
Login string `json:"login"`
Email string `json:"email"`
AvatarUrl string `json:"avatarUrl"`
IsAdmin bool `json:"isAdmin"`
LastSeenAt time.Time `json:"lastSeenAt"`
LastSeenAtAge string `json:"lastSeenAtAge"`

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

@ -21,8 +21,7 @@
<table class="filter-table form-inline">
<thead>
<tr>
<th>Id</th>
<th>Name</th>
<th></th>
<th>Login</th>
<th>Email</th>
<th>
@ -35,8 +34,9 @@
</thead>
<tbody>
<tr ng-repeat="user in ctrl.users">
<td>{{user.id}}</td>
<td>{{user.name}}</td>
<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>

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

@ -2,20 +2,18 @@
<div class="page-container">
<div class="page-header">
<h1>
<i class="{{ctrl.navModel.node.icon}}"></i>
{{ctrl.navModel.node.text}}
</h1>
<page-h1 model="ctrl.navModel"></page-h1>
<button class="btn btn-success" ng-click="ctrl.openAddUsersView()" ng-hide="ctrl.externalUserMngLinkUrl">
<i class="fa fa-plus"></i>
<span>{{ctrl.addUsersBtnName}}</span>
</button>
<div class="page-header-tabs">
<button class="btn btn-success" ng-click="ctrl.openAddUsersView()" ng-hide="ctrl.externalUserMngLinkUrl">
<i class="fa fa-plus"></i>
<span>{{ctrl.addUsersBtnName}}</span>
</button>
<a class="btn btn-inverse" ng-href="{{ctrl.externalUserMngLinkUrl}}" target="_blank" ng-if="ctrl.externalUserMngLinkUrl">
<a class="btn btn-inverse" ng-href="{{ctrl.externalUserMngLinkUrl}}" target="_blank" ng-if="ctrl.externalUserMngLinkUrl">
<i class="fa fa-external-link-square"></i>
{{ctrl.addUsersBtnName}}
{{ctrl.addUsersBtnName}}
</a>
<ul class="gf-tabs">
@ -24,13 +22,8 @@
Users ({{ctrl.users.length}})
</a>
</li>
<li class="gf-tabs-item">
<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.pendingInvites.length">
<a class="gf-tabs-link" ng-click="ctrl.editor.index = 2" ng-class="{active: ctrl.editor.index === 2}">
<a class="gf-tabs-link" ng-click="ctrl.editor.index = 1" ng-class="{active: ctrl.editor.index === 1}">
Pending Invitations ({{ctrl.pendingInvites.length}})
</a>
</li>
@ -79,7 +72,7 @@
</table>
</div>
<div ng-if="ctrl.editor.index === 2">
<div ng-if="ctrl.editor.index === 1">
<table class="filter-table form-inline">
<thead>
<tr>

2
public/sass/components/_gf-form.scss
View File

@ -1,4 +1,4 @@
$gf-form-margin: 0.1rem;
$gf-form-margin: 1px;
.gf-form {
margin-bottom: $gf-form-margin;