IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-08 15:13:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: sidemenu profile main text is now username instead of name

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-15 13:03:07 +01:00
parent 7bec195599
commit fdf4bad1b7
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/index.go
View File

@ -120,8 +120,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
if c.IsSignedIn {
profileNode := &dtos.NavLink{
Text: c.SignedInUser.Name,
SubTitle: c.SignedInUser.Login,
Text: c.SignedInUser.Login,
SubTitle: c.SignedInUser.Name,
Id: "profile",
Img: data.User.GravatarUrl,
Url: setting.AppSubUrl + "/profile",

2
public/app/core/routes/routes.ts
View File

@ -199,7 +199,7 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
.when('/login', {
templateUrl: 'public/app/partials/login.html',
controller : 'LoginCtrl',
pageClass: 'sidemenu-hidden',
pageClass: 'login-page sidemenu-hidden',
})
.when('/invite/:code', {
templateUrl: 'public/app/partials/signup_invited.html',

8
public/sass/components/_footer.scss
View File

@ -6,6 +6,7 @@
color: $footer-link-color;
padding: 5rem 0 1rem 0;
font-size: $font-size-sm;
position: relative;
width: 98%; /* was causing horiz scrollbars - need to examine */
a {
@ -36,3 +37,10 @@
}
}
}
.login-page {
.footer {
position: absolute;
bottom: $spacer;
}
}