diff --git a/awx/ui/client/legacy-styles/main-layout.less b/awx/ui/client/legacy-styles/main-layout.less index 20a8b2639b..91bb945e5a 100644 --- a/awx/ui/client/legacy-styles/main-layout.less +++ b/awx/ui/client/legacy-styles/main-layout.less @@ -7,13 +7,16 @@ * */ -html, body { height: 100%; } +html { height: 100%; } body { font-family: 'Open Sans', sans-serif; font-weight: 400; color: @black; padding-top: 58px; + min-height: 100%; + padding-bottom: 40px; + position: relative; } #main-menu-container { diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index b07df48373..d0639727a5 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -67,6 +67,7 @@ import './shared/InventoryTree'; import './shared/Socket'; import './job-templates/main'; import './shared/features/main'; +import './footer/main'; /*#if DEBUG#*/ @@ -180,7 +181,8 @@ var tower = angular.module('Tower', [ 'AboutAnsibleHelpModal', 'PortalJobsListDefinition', 'features', - 'longDateFilter' + 'longDateFilter', + 'footer' ]) .constant('AngularScheduler.partials', urlPrefix + 'lib/angular-scheduler/lib/') diff --git a/awx/ui/client/src/footer/footer.block.less b/awx/ui/client/src/footer/footer.block.less index b1f65d44b8..fa9d2382b1 100644 --- a/awx/ui/client/src/footer/footer.block.less +++ b/awx/ui/client/src/footer/footer.block.less @@ -6,7 +6,7 @@ color: #848992; width: 100%; z-index: 1040; - position: fixed; + position: absolute; right: 0; left: 0; bottom: 0; diff --git a/awx/ui/client/src/footer/footer.directive.js b/awx/ui/client/src/footer/footer.directive.js new file mode 100644 index 0000000000..4193dddeb7 --- /dev/null +++ b/awx/ui/client/src/footer/footer.directive.js @@ -0,0 +1,16 @@ +/************************************************* + * Copyright (c) 2015 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +export default + ['templateUrl', + function(templateUrl) { + return { + restrict: 'E', + scope: true, + templateUrl: templateUrl('footer/footer') + }; + } + ]; diff --git a/awx/ui/client/src/footer/footer.partial.html b/awx/ui/client/src/footer/footer.partial.html new file mode 100644 index 0000000000..b82a640fec --- /dev/null +++ b/awx/ui/client/src/footer/footer.partial.html @@ -0,0 +1,8 @@ + diff --git a/awx/ui/client/src/footer/main.js b/awx/ui/client/src/footer/main.js new file mode 100644 index 0000000000..1bbd6a10c0 --- /dev/null +++ b/awx/ui/client/src/footer/main.js @@ -0,0 +1,11 @@ +/************************************************* + * Copyright (c) 2015 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import footerDirective from './footer.directive'; + +export default + angular.module('footer', []) + .directive('towerFooter', footerDirective); diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index 8154266d46..cdce8a42b8 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -247,15 +247,7 @@ --> - - + -