|
@@ -118,9 +118,14 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
if c.IsSignedIn {
|
|
if c.IsSignedIn {
|
|
|
|
|
+ // Only set login if it's different from the name
|
|
|
|
|
+ var login string
|
|
|
|
|
+ if c.SignedInUser.Login != c.SignedInUser.NameOrFallback() {
|
|
|
|
|
+ login = c.SignedInUser.Login
|
|
|
|
|
+ }
|
|
|
profileNode := &dtos.NavLink{
|
|
profileNode := &dtos.NavLink{
|
|
|
Text: c.SignedInUser.NameOrFallback(),
|
|
Text: c.SignedInUser.NameOrFallback(),
|
|
|
- SubTitle: c.SignedInUser.Login,
|
|
|
|
|
|
|
+ SubTitle: login,
|
|
|
Id: "profile",
|
|
Id: "profile",
|
|
|
Img: data.User.GravatarUrl,
|
|
Img: data.User.GravatarUrl,
|
|
|
Url: setting.AppSubUrl + "/profile",
|
|
Url: setting.AppSubUrl + "/profile",
|
|
@@ -284,6 +289,7 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
|
|
|
|
|
|
|
|
data.NavTree = append(data.NavTree, &dtos.NavLink{
|
|
data.NavTree = append(data.NavTree, &dtos.NavLink{
|
|
|
Text: "Help",
|
|
Text: "Help",
|
|
|
|
|
+ SubTitle: fmt.Sprintf(`Grafana version: %s+%s`, setting.BuildVersion, setting.BuildCommit),
|
|
|
Id: "help",
|
|
Id: "help",
|
|
|
Url: "#",
|
|
Url: "#",
|
|
|
Icon: "gicon gicon-question",
|
|
Icon: "gicon gicon-question",
|