From 7d208b7d6f0c7c859273488fc24088d0b524c15e Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 6 Nov 2015 10:53:20 -0500 Subject: [PATCH] updates based on jtabor's review --- awx/ui/client/src/main-menu/main-menu.directive.js | 8 ++++---- awx/ui/client/src/main-menu/main-menu.partial.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/src/main-menu/main-menu.directive.js b/awx/ui/client/src/main-menu/main-menu.directive.js index ec00f31729..5f45fc7a18 100644 --- a/awx/ui/client/src/main-menu/main-menu.directive.js +++ b/awx/ui/client/src/main-menu/main-menu.directive.js @@ -13,14 +13,14 @@ export default } else { return false; } - } + }; // check to see if the current route is the currently // logged in user scope.isCurrentRouteUser = function() { if ($rootScope && $rootScope.current_user) { if ($location.url().split('/')[1] === 'users') { - if ($location.url().split('/')[2] === ($rootScope.current_user.id + "")) { + if ($location.url().split('/')[2] === ($rootScope.current_user.id + "")) { return true; } else { return false; @@ -31,7 +31,7 @@ export default } else { return false; } - } + }; // set up the user tooltip $rootScope.$on('current_user', function(user) { @@ -58,7 +58,7 @@ export default } else { scope.isHiddenOnMobile = true; } - } + }; // if the user clicks outside of the mobile menu, // close it if it's open $("body").on('click', function(e) { diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html index c3e636a059..f085378fb7 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -119,10 +119,10 @@ data-trigger="hover" data-container="body"> + alt="Logged in as {{ $root.current_user.username}}"> - {{::$root.current_user.username}} + {{ $root.current_user.username}}