From 9ca560ab8cb6e2bca40837486a2cd98f0da3dda8 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Wed, 2 Mar 2016 17:07:24 -0500 Subject: [PATCH 1/2] finish modular-izing about modal, delete scattered dependencies for old modal, resolves #1046 --- awx/ui/client/assets/cowsay-about.html | 29 ------ awx/ui/client/src/about/about.block.less | 48 ++++++++-- awx/ui/client/src/about/about.controller.js | 32 +++++++ awx/ui/client/src/about/about.partial.html | 32 +++++++ awx/ui/client/src/about/about.route.js | 12 +++ awx/ui/client/src/about/main.js | 15 +++ awx/ui/client/src/app.js | 11 +-- awx/ui/client/src/helpers.js | 4 +- awx/ui/client/src/helpers/AboutAnsible.js | 93 ------------------- awx/ui/client/src/setup-menu/main.js | 4 +- .../src/setup-menu/setup-menu.partial.html | 3 +- .../client/src/setup-menu/setup.controller.js | 12 --- awx/ui/client/src/setup-menu/setup.route.js | 2 - 13 files changed, 137 insertions(+), 160 deletions(-) delete mode 100644 awx/ui/client/assets/cowsay-about.html create mode 100644 awx/ui/client/src/about/about.controller.js create mode 100644 awx/ui/client/src/about/about.partial.html create mode 100644 awx/ui/client/src/about/about.route.js create mode 100644 awx/ui/client/src/about/main.js delete mode 100644 awx/ui/client/src/helpers/AboutAnsible.js delete mode 100644 awx/ui/client/src/setup-menu/setup.controller.js diff --git a/awx/ui/client/assets/cowsay-about.html b/awx/ui/client/assets/cowsay-about.html deleted file mode 100644 index b1cbcf9d24..0000000000 --- a/awx/ui/client/assets/cowsay-about.html +++ /dev/null @@ -1,29 +0,0 @@ - -
-
-
-
-
- ________________
-/  Tower Version \
-\/
- ----------------
-        \   ^__^
-         \  (oo)\_______
-            (__)\     A)\/\
-                ||----w |
-                ||     ||
-
-
-
-
-
-

Copyright 2015. All rights reserved.

-

Ansible and Ansible Tower are registered trademarks of Red Hat, Inc.

-
- -
-

Visit Ansible.com for more information.

-

-
-
diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less index 4e46b24b50..d5453c0cf2 100644 --- a/awx/ui/client/src/about/about.block.less +++ b/awx/ui/client/src/about/about.block.less @@ -1,14 +1,42 @@ /** @define About */ -.About { - height: 309px !important; -} +@import "awx/ui/client/src/shared/branding/colors.default.less"; -.About-cowsay { - margin-top: 30px; +.About-cowsay--container{ + width: 340px; + margin: 0 auto; } - -.About-redhat { - max-width: 100%; - margin-top: -61px; - margin-bottom: -33px; +.About-cowsay--code{ + background-color: @default-bg; + padding-left: 30px; + border-style: none; + max-width: 340px; + padding-left: 30px; } +.About .modal-header{ + border: none; + padding-bottom: 0px; +} +.About .modal-dialog{ + max-width: 500px; +} +.About .modal-body{ + padding-top: 0px; +} +.About-brand--redhat{ + max-width: 420px; + margin: 0 auto; + margin-top: -50px; + margin-bottom: -30px; +} +.About-brand--ansible{ + max-width: 120px; + margin: 0 auto; +} +.About-close{ + position: absolute; + top: 15px; + right: 15px; +} +.About p{ + color: @default-interface-txt; +} \ No newline at end of file diff --git a/awx/ui/client/src/about/about.controller.js b/awx/ui/client/src/about/about.controller.js new file mode 100644 index 0000000000..c112b91800 --- /dev/null +++ b/awx/ui/client/src/about/about.controller.js @@ -0,0 +1,32 @@ +export default + ['$scope', '$state', 'CheckLicense', function($scope, $state, CheckLicense){ + var processVersion = function(version){ + // prettify version & calculate padding + // e,g 3.0.0-0.git201602191743/ -> 3.0.0 + var split = version.split('-')[0] + var spaces = Math.floor((16-split.length)/2), + paddedStr = ""; + for(var i=0; i<=spaces; i++){ + paddedStr = paddedStr +" "; + } + paddedStr = paddedStr + split; + for(var j = paddedStr.length; j<16; j++){ + paddedStr = paddedStr + " "; + } + return paddedStr + } + var init = function(){ + CheckLicense.get() + .then(function(res){ + $scope.subscription = res.data.license_info.subscription_name; + $scope.version = processVersion(res.data.version); + $('#about-modal').modal('show'); + console.log(window.cowsay) + }); + }; + var back = function(){ + $state.go('setup'); + } + init(); + } + ]; \ No newline at end of file diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html new file mode 100644 index 0000000000..afc66724f4 --- /dev/null +++ b/awx/ui/client/src/about/about.partial.html @@ -0,0 +1,32 @@ + +
diff --git a/awx/ui/client/src/setup-menu/setup.controller.js b/awx/ui/client/src/setup-menu/setup.controller.js deleted file mode 100644 index 31ca9f7fe8..0000000000 --- a/awx/ui/client/src/setup-menu/setup.controller.js +++ /dev/null @@ -1,12 +0,0 @@ -export default - [ '$scope', - '$rootScope', - 'AboutAnsibleHelp', - function( - $scope, - $rootScope, - showAboutModal - ) { - $scope.showAboutModal = showAboutModal; - } - ]; diff --git a/awx/ui/client/src/setup-menu/setup.route.js b/awx/ui/client/src/setup-menu/setup.route.js index f318b10906..fc588dab98 100644 --- a/awx/ui/client/src/setup-menu/setup.route.js +++ b/awx/ui/client/src/setup-menu/setup.route.js @@ -1,10 +1,8 @@ import {templateUrl} from '../shared/template-url/template-url.factory'; -import controller from './setup.controller'; export default { name: 'setup', route: '/setup', - controller: controller, ncyBreadcrumb: { label: "SETUP" }, From 761a5303e37bfb508a75e2e19fc7204e9879383f Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Thu, 3 Mar 2016 09:21:49 -0500 Subject: [PATCH 2/2] remove log line #1046 --- awx/ui/client/src/about/about.controller.js | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/ui/client/src/about/about.controller.js b/awx/ui/client/src/about/about.controller.js index c112b91800..c35388e8ae 100644 --- a/awx/ui/client/src/about/about.controller.js +++ b/awx/ui/client/src/about/about.controller.js @@ -21,7 +21,6 @@ export default $scope.subscription = res.data.license_info.subscription_name; $scope.version = processVersion(res.data.version); $('#about-modal').modal('show'); - console.log(window.cowsay) }); }; var back = function(){