minor user avatar stuff

pkg/api/index.go

@@ -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",

pkg/api/user.go

@@ -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