diff --git a/awx/ui/static/img/InventoryScripts.svg b/awx/ui/static/img/InventoryScripts.svg
index 5035b9c5e8..050da79a90 100644
--- a/awx/ui/static/img/InventoryScripts.svg
+++ b/awx/ui/static/img/InventoryScripts.svg
@@ -5,21 +5,11 @@
Created with Sketch.
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
->>>>>>> 470dc9b... Update icons on setup menu
-
\ No newline at end of file
+
diff --git a/awx/ui/static/img/ManagementJobs.svg b/awx/ui/static/img/ManagementJobs.svg
index dc10b3725d..ee638334f7 100644
--- a/awx/ui/static/img/ManagementJobs.svg
+++ b/awx/ui/static/img/ManagementJobs.svg
@@ -5,17 +5,10 @@
Created with Sketch.
-<<<<<<< HEAD
-=======
-
-
-
-
->>>>>>> 470dc9b... Update icons on setup menu
-
\ No newline at end of file
+
diff --git a/awx/ui/static/img/Organizations.svg b/awx/ui/static/img/Organizations.svg
index ecc2ad3f1a..db36409b13 100644
--- a/awx/ui/static/img/Organizations.svg
+++ b/awx/ui/static/img/Organizations.svg
@@ -5,7 +5,6 @@
Created with Sketch.
-<<<<<<< HEAD
@@ -13,11 +12,6 @@
-=======
-
-
-
->>>>>>> 470dc9b... Update icons on setup menu
-
\ No newline at end of file
+
diff --git a/awx/ui/static/img/PortalMode--exit.svg b/awx/ui/static/img/PortalMode--exit.svg
index 853a9acea5..24161d48c9 100644
--- a/awx/ui/static/img/PortalMode--exit.svg
+++ b/awx/ui/static/img/PortalMode--exit.svg
@@ -5,17 +5,12 @@
Created with Sketch.
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 470dc9b... Update icons on setup menu
-
\ No newline at end of file
+
diff --git a/awx/ui/static/img/User.svg b/awx/ui/static/img/User.svg
new file mode 100644
index 0000000000..ddb77ada69
--- /dev/null
+++ b/awx/ui/static/img/User.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/awx/ui/static/js/main-menu/main-menu.directive.js b/awx/ui/static/js/main-menu/main-menu.directive.js
index 107f4b4113..055656970d 100644
--- a/awx/ui/static/js/main-menu/main-menu.directive.js
+++ b/awx/ui/static/js/main-menu/main-menu.directive.js
@@ -22,7 +22,8 @@ export default function() {
restrict: 'E',
templateUrl: '/static/js/main-menu/main-menu.partial.html',
scope: {
- style: '&menuStyle'
+ style: '&menuStyle',
+ currentUser: '='
},
link: link
};
diff --git a/awx/ui/static/js/main-menu/main-menu.partial.html b/awx/ui/static/js/main-menu/main-menu.partial.html
index e395133195..4c7ec3e335 100644
--- a/awx/ui/static/js/main-menu/main-menu.partial.html
+++ b/awx/ui/static/js/main-menu/main-menu.partial.html
@@ -4,5 +4,4 @@
-
diff --git a/awx/ui/static/js/main-menu/main.js b/awx/ui/static/js/main-menu/main.js
index 4674e6fbd3..5f03d77c09 100644
--- a/awx/ui/static/js/main-menu/main.js
+++ b/awx/ui/static/js/main-menu/main.js
@@ -5,9 +5,13 @@ import portalModeLink from './portal-mode-link.directive';
import webSocketStatus from './web-socket-status.directive';
import includePartial from 'tower/shared/include-partial/main';
+import shared from 'tower/shared/main';
export default
- angular.module('mainMenu', [includePartial.name])
+ angular.module('mainMenu',
+ [ includePartial.name,
+ shared.name
+ ])
.directive('portalModeLink', portalModeLink)
.directive('menuItem', menuItem)
.directive('menuToggleButton', menuToggle)
diff --git a/awx/ui/static/js/main-menu/menu-default.partial.html b/awx/ui/static/js/main-menu/menu-default.partial.html
index 45671f5624..25014f67ef 100644
--- a/awx/ui/static/js/main-menu/menu-default.partial.html
+++ b/awx/ui/static/js/main-menu/menu-default.partial.html
@@ -1,45 +1,30 @@
-
-
-
-
-
+
-
-
-
-
diff --git a/awx/ui/static/js/main-menu/menu-toggle.partial.html b/awx/ui/static/js/main-menu/menu-toggle.partial.html
index 76b937edff..962cc4c7c9 100644
--- a/awx/ui/static/js/main-menu/menu-toggle.partial.html
+++ b/awx/ui/static/js/main-menu/menu-toggle.partial.html
@@ -1,4 +1,4 @@
-
+
+ 
+
+ {{currentUser.username}}
+
+
+
+ 
+
+ 
- Sign Out
-
-
- Setup
-
-
-