diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less index 8759cfa6dc..fe1860d2cb 100644 --- a/awx/ui/client/src/about/about.block.less +++ b/awx/ui/client/src/about/about.block.less @@ -1,6 +1,16 @@ /** @define About */ @import "./client/src/shared/branding/colors.default.less"; + +.About-ansibleVersion, +.About-cowsay--code { + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; +} + +.About-ansibleVersion { + color: @default-data-txt; +} + .About-cowsay--container{ width: 340px; margin: 0 auto; @@ -25,6 +35,7 @@ .About-brand--redhat{ float: left; width: 112px; + padding-top: 13px; } .About-brand--ansible{ max-width: 120px; diff --git a/awx/ui/client/src/about/about.controller.js b/awx/ui/client/src/about/about.controller.js index 2c821b9e09..eeb21cbd5f 100644 --- a/awx/ui/client/src/about/about.controller.js +++ b/awx/ui/client/src/about/about.controller.js @@ -1,27 +1,12 @@ export default ['$scope', '$state', 'ConfigService', 'i18n', function($scope, $state, ConfigService, i18n){ - 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(){ ConfigService.getConfig() .then(function(config){ + $scope.version = config.version.split('-')[0]; + $scope.ansible_version = config.ansible_version; $scope.subscription = config.license_info.subscription_name; - $scope.version = processVersion(config.version); - $scope.version_str = i18n._("Version"); $('#about-modal').modal('show'); }); }; diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 867a5f6035..9625e3f800 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -10,10 +10,9 @@
- ________________
-/  Tower {{version_str}} \
-\{{version}}/
- ----------------
+ _______________
+<  Tower {{version}}  >
+ ---------------
         \   ^__^
          \  (oo)\_______
             (__)      A )\/\
@@ -23,8 +22,13 @@