From fdf4bad1b765380f5c7f12dbf39f84a1ad07c6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 15 Dec 2017 13:03:07 +0100
Subject: [PATCH] fix: sidemenu profile main text is now username instead of
 name

---
 pkg/api/index.go                    | 4 ++--
 public/app/core/routes/routes.ts    | 2 +-
 public/sass/components/_footer.scss | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/api/index.go b/pkg/api/index.go
index 812f07c2aef..c7a434cd2b7 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -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",
diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts
index 1f5b8cacf0e..cd1ae8682b4 100644
--- a/public/app/core/routes/routes.ts
+++ b/public/app/core/routes/routes.ts
@@ -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',
diff --git a/public/sass/components/_footer.scss b/public/sass/components/_footer.scss
index 6413ed3650f..e974ad749a6 100644
--- a/public/sass/components/_footer.scss
+++ b/public/sass/components/_footer.scss
@@ -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;
+  }
+}