diff --git a/awx/ui/static/js/forms/LicenseForm.js b/awx/ui/static/js/forms/LicenseForm.js index 80b1f07e7b..66010f8854 100644 --- a/awx/ui/static/js/forms/LicenseForm.js +++ b/awx/ui/static/js/forms/LicenseForm.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name forms.function:LicenseForm @@ -45,6 +45,12 @@ export default readonly: true, tab: 'license' }, + subscription_name: { + label: 'Subscription Name', + type: 'text', + readonly: true, + tab: 'license' + }, license_key: { label: 'License Key', type: 'textarea', diff --git a/awx/ui/static/js/helpers/AboutAnsible.js b/awx/ui/static/js/helpers/AboutAnsible.js index 40b7e790a9..1be96d17d5 100644 --- a/awx/ui/static/js/helpers/AboutAnsible.js +++ b/awx/ui/static/js/helpers/AboutAnsible.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc overview * @name helpers @@ -50,22 +50,24 @@ export default scope.removeBuildAboutDialog(); } scope.removeBuildAboutDialog = scope.$on('BuildAboutDialog', function(e, data) { - var spaces, i, - paddedStr = "", l, - version = data.version.replace(/-.*$/,''), - license_type = data.license_info.license_type; + var spaces, i, j, + paddedStr = "", + str = data.version, + subscription = data.license_info.subscription_name || ""; - // get the length of the license type and the word license (7) plus the extra spaces (4) - l = license_type.length + 11; - - spaces = Math.floor(l-(version.length + 10)); // 8 comes from " Tower " + if(str.search('-')){ + str = str.substr(0,str.search('-')); + } + spaces = Math.floor((16-str.length)/2); for( i=0; i<=spaces; i++){ paddedStr = paddedStr +" "; } - paddedStr = version+paddedStr; + paddedStr = paddedStr+str; + for( j = paddedStr.length; j<16; j++){ + paddedStr = paddedStr + " "; + } $('#about-modal-version').html(paddedStr); - $('#about-modal-license-type').html(license_type); - + $('#about-modal-subscription').html(subscription); scope.modalOK = function(){ $('#about-modal-dialog').dialog('close'); }; @@ -74,7 +76,7 @@ export default scope: scope, // buttons: [], width: 710, - height: 380, + height: 400, minWidth: 300, resizable: false, // title: , //'' ,//'About Ansible', diff --git a/awx/ui/static/partials/cowsay-about.html b/awx/ui/static/partials/cowsay-about.html index 8ec3906381..94e1bc0b04 100644 --- a/awx/ui/static/partials/cowsay-about.html +++ b/awx/ui/static/partials/cowsay-about.html @@ -5,8 +5,8 @@
  ________________
-/  Tower  \
-\   license /
+/  Tower Version \
+\/
  ----------------
         \   ^__^
          \  (oo)\_______
@@ -22,5 +22,7 @@
             

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


Visit Ansible.com for more information.

+
+