diff --git a/awx/ui/static/img/PortalMode--exit.svg b/awx/ui/static/img/PortalMode--exit.svg index 24161d48c9..af0ae04212 100644 --- a/awx/ui/static/img/PortalMode--exit.svg +++ b/awx/ui/static/img/PortalMode--exit.svg @@ -5,7 +5,7 @@ Created with Sketch. - + 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 0323d1724d..e3face97a8 100644 --- a/awx/ui/static/js/main-menu/main-menu.directive.js +++ b/awx/ui/static/js/main-menu/main-menu.directive.js @@ -2,7 +2,7 @@ function getMenuStylePartialUrl(style) { - if (style !== 'default' && style !== 'minimal') { + if (style !== 'default' && style !== 'portal') { /* jshint ignore:start */ console.warn('main-menu: "', style, 'is not a valid menu style. Please use "default" or "minimal".'); /* jshint ignore:end */ diff --git a/awx/ui/static/js/main-menu/main.js b/awx/ui/static/js/main-menu/main.js index 5f03d77c09..3b8db6fc0a 100644 --- a/awx/ui/static/js/main-menu/main.js +++ b/awx/ui/static/js/main-menu/main.js @@ -1,7 +1,6 @@ import mainMenu from './main-menu.directive'; import menuItem from './menu-item.directive'; import menuToggle from './menu-toggle.directive'; -import portalModeLink from './portal-mode-link.directive'; import webSocketStatus from './web-socket-status.directive'; import includePartial from 'tower/shared/include-partial/main'; @@ -12,7 +11,6 @@ export default [ includePartial.name, shared.name ]) - .directive('portalModeLink', portalModeLink) .directive('menuItem', menuItem) .directive('menuToggleButton', menuToggle) .directive('webSocketStatus', webSocketStatus) 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 0a5e936066..dd41902ca4 100644 --- a/awx/ui/static/js/main-menu/menu-default.partial.html +++ b/awx/ui/static/js/main-menu/menu-default.partial.html @@ -24,7 +24,7 @@ Setup - + diff --git a/awx/ui/static/js/main-menu/menu-minimal.partial.html b/awx/ui/static/js/main-menu/menu-minimal.partial.html deleted file mode 100644 index 0f7c2f70cc..0000000000 --- a/awx/ui/static/js/main-menu/menu-minimal.partial.html +++ /dev/null @@ -1,6 +0,0 @@ - - Portal - - - - diff --git a/awx/ui/static/js/main-menu/menu-portal.partial.html b/awx/ui/static/js/main-menu/menu-portal.partial.html new file mode 100644 index 0000000000..39699f8bb5 --- /dev/null +++ b/awx/ui/static/js/main-menu/menu-portal.partial.html @@ -0,0 +1,8 @@ + + Portal + + + + + + diff --git a/awx/ui/static/js/main-menu/portal-mode-link.directive.js b/awx/ui/static/js/main-menu/portal-mode-link.directive.js deleted file mode 100644 index 4dd16b63bf..0000000000 --- a/awx/ui/static/js/main-menu/portal-mode-link.directive.js +++ /dev/null @@ -1,28 +0,0 @@ -/* jshint unused: vars */ - -function wrapper(rootScope) { - return function compile(element, attrs) { - var href, title, icon; - if (rootScope.portalMode) { - href = '#'; - title = 'Exit Portal Mode'; - icon = 'PortalMode--exit.svg'; - } else { - href = '#portal'; - title = 'Portal Mode'; - icon = 'PortalMode.svg'; - } - - element - .attr('href', href) - .attr('title', title) - .find('>img') - .attr('src', '/static/img/' + icon); - }; -} - -export default ['$rootScope', function($rootScope) { - return { - compile: wrapper($rootScope) - }; -}]; diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index f8da03eb36..81566a6737 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -31,7 +31,7 @@