diff --git a/awx/ui/client/assets/variables.less b/awx/ui/client/assets/variables.less index 40cab8727c..3d8f8af957 100644 --- a/awx/ui/client/assets/variables.less +++ b/awx/ui/client/assets/variables.less @@ -19,6 +19,3 @@ @about-modal-padding-top: initial; @about-modal-margin-top: -40px; @about-modal-margin-left: -20px; - -// Copyright text should be hidden -@copyright-text: 0; diff --git a/awx/ui/client/lib/components/components.strings.js b/awx/ui/client/lib/components/components.strings.js index 395af1f809..4eaa0eea64 100644 --- a/awx/ui/client/lib/components/components.strings.js +++ b/awx/ui/client/lib/components/components.strings.js @@ -84,8 +84,8 @@ function ComponentsStrings (BaseString) { INSTANCE_GROUPS: t.s('Instance Groups'), APPLICATIONS: t.s('Applications'), SETTINGS: t.s('Settings'), - FOOTER_ABOUT: t.s('About'), - FOOTER_COPYRIGHT: t.s('Copyright © 2018 Red Hat, Inc.'), + ABOUT: t.s('About'), + COPYRIGHT: t.s('Copyright © 2018 Red Hat, Inc.'), VIEWS_HEADER: t.s('Views'), RESOURCES_HEADER: t.s('Resources'), ACCESS_HEADER: t.s('Access'), diff --git a/awx/ui/client/lib/components/layout/_index.less b/awx/ui/client/lib/components/layout/_index.less index dc63d2ac3f..6d5a7a7229 100644 --- a/awx/ui/client/lib/components/layout/_index.less +++ b/awx/ui/client/lib/components/layout/_index.less @@ -202,30 +202,13 @@ width: 100%; flex-direction: column; padding-left: @at-width-collapsed-side-nav; + padding-bottom: @at-space-4x; overflow-x: hidden; } &-content { flex: 1px; } - - &-footer { - background-color: @at-color-footer-background; - color: @at-color-footer; - position: relative; - padding-right: @at-padding-footer-right; - padding-bottom: @at-padding-footer-bottom; - margin-top: @at-margin-footer-top; - flex: 0; - display: flex; - align-items: center; - justify-content: flex-end; - - a { - cursor: pointer; - margin-right: @at-margin-after-footer-link; - } - } } @media screen and (max-width: @at-breakpoint-mobile-layout) { diff --git a/awx/ui/client/lib/components/layout/layout.partial.html b/awx/ui/client/lib/components/layout/layout.partial.html index 9354f06dce..4acc9fd108 100644 --- a/awx/ui/client/lib/components/layout/layout.partial.html +++ b/awx/ui/client/lib/components/layout/layout.partial.html @@ -14,6 +14,11 @@ {{ $parent.layoutVm.currentUsername }} + + + + + @@ -98,9 +103,5 @@
-
- {{ vm.getString('FOOTER_ABOUT') }} {{ vm.getString('BRAND_NAME') }}| - {{ vm.getString('FOOTER_COPYRIGHT') }} -
diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less index 88461fa08b..284929253e 100644 --- a/awx/ui/client/lib/theme/_variables.less +++ b/awx/ui/client/lib/theme/_variables.less @@ -177,8 +177,6 @@ @at-color-side-nav-item-icon: @at-white; @at-color-side-nav-item-spacer: @at-gray-d7; @at-color-side-nav-space-collapsed-border: @at-gray-b7; -@at-color-footer-background: @at-gray-fc; -@at-color-footer: @at-gray-70; @at-color-list-empty-border: @at-gray-d7; @at-color-list-empty-background: @at-gray-f6; @@ -241,8 +239,6 @@ @at-padding-left-side-nav-item-icon: 10px; @at-padding-left-side-nav-item-icon-expanded: 15px; @at-padding-between-side-nav-icon-text: @at-space-3x; -@at-padding-footer-right: @at-space-4x; -@at-padding-footer-bottom: @at-space-4x; @at-padding-list-empty: @at-space-2x; @at-padding-list-row-item-tag: 3px 9px; @at-padding-list-row-action: 7px; @@ -260,8 +256,6 @@ @at-margin-top-nav-item-between-icon-and-name: @at-space-2x; @at-margin-top-nav-item-icon-socket-top-makeup: -3px; @at-margin-side-nav-space-collapsed: 5px 0; -@at-margin-after-footer-link: @at-space; -@at-margin-footer-top: @at-space-4x; @at-margin-top-search-key: @at-space-2x; @@ -328,7 +322,6 @@ @at-highlight-left-border-margin-makeup: -5px; @at-z-index-nav: 1040; @at-z-index-side-nav: 1030; -@at-z-index-footer: 1020; @at-line-height-list-row-item-tag: 22px; // 6. Breakpoints --------------------------------------------------------------------------------- diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less index d4a1788564..3b9a0ad00a 100644 --- a/awx/ui/client/src/about/about.block.less +++ b/awx/ui/client/src/about/about.block.less @@ -58,7 +58,3 @@ .About-ansibleVersion { color: @default-data-txt; } - -.Copyright-text{ - opacity: @copyright-text; -} diff --git a/awx/ui/client/src/about/about.controller.js b/awx/ui/client/src/about/about.controller.js index 992279aedc..868adf01dc 100644 --- a/awx/ui/client/src/about/about.controller.js +++ b/awx/ui/client/src/about/about.controller.js @@ -1,5 +1,5 @@ -export default ['$rootScope', '$scope', '$state', 'ConfigService', - ($rootScope, $scope, $state, ConfigService) => { +export default ['$rootScope', '$scope', '$location', 'ConfigService', 'lastPath', + ($rootScope, $scope, $location, ConfigService, lastPath) => { ConfigService.getConfig() .then(function(config){ @@ -10,7 +10,7 @@ export default ['$rootScope', '$scope', '$state', 'ConfigService', $('#about-modal').modal('show'); }); - $('#about-modal').on('hidden.bs.modal', () => $state.go('dashboard')); + $('#about-modal').on('hidden.bs.modal', () => $location.url(lastPath)); function createSpeechBubble (brand, version) { let text = `${brand} ${version}`; diff --git a/awx/ui/client/src/about/about.route.js b/awx/ui/client/src/about/about.route.js index e063530c7e..e8fb6b0d10 100644 --- a/awx/ui/client/src/about/about.route.js +++ b/awx/ui/client/src/about/about.route.js @@ -9,6 +9,11 @@ export default { ncyBreadcrumb: { label: N_("ABOUT") }, + resolve: { + lastPath: function($location) { + return $location.url(); + } + }, onExit: function(){ // hacky way to handle user browsing away via URL bar $('.modal-backdrop').remove();