The Ansible Tower license is valid.
" +
- "
If you are ready to upgrade, contact us at " + renew + ". Thanks!
";
- license_is_valid = true;
- }
- } else {
- // No license
- title = "Add Your License";
- html = "
Now that you’ve successfully installed or upgraded Ansible Tower, the next step is to add a license file. " +
- "If you don’t have a license file yet, " + license_link + " to see all of our free and paid license options.
" +
- "
Get a Free Tower Trial License
";
- }
-
- if (IsAdmin()) {
- html += "
Copy and paste the contents of your license in the field below, agree to the End User License Agreement, and click Submit.
";
- } else {
- html += "
A system administrator can install the new license by choosing View License on the Account Menu and clicking on the Update License tab.
";
- }
-
- html += "
";
-
- if (IsAdmin()) {
- html += GenerateForm.buildHTML(LicenseUpdateForm, { mode: 'edit', showButtons:((includeFormButton) ? true : false) });
- }
-
- html += "
";
-
- result.body = html;
- result.title = title;
- return result;
- },
-
- postLicense: function(license_key, in_scope) {
- var url = GetBasePath('config'),
- self = this,
- json_data, scope;
-
- scope = (in_scope) ? in_scope : self.scope;
-
- json_data = ToJSON('json', license_key);
- json_data.eula_accepted = scope.eula_agreement;
- if (typeof json_data === 'object' && Object.keys(json_data).length > 0) {
- Rest.setUrl(url);
- Rest.post(json_data)
- .success(function (response) {
- response.license_info = response;
- Alert('License Accepted', 'The Ansible Tower license was updated. To review or update the license, choose View License from the Setup menu.','alert-info');
- $rootScope.features = undefined;
-
- Authorization.getLicense()
- .success(function (data) {
- Authorization.setLicense(data);
- pendoService.issuePendoIdentity();
- Wait("stop");
- $location.path('/home');
- })
- .error(function () {
- Wait('stop');
- Alert('Error', 'Failed to access license information. GET returned status: ' + status, 'alert-danger',
- $location.path('/logout'));
- });
-
-
-
-
- })
- .catch(function (response) {
- scope.license_json_api_error = "A valid license key in JSON format is required";
- ProcessErrors(scope, response.data, response.status, null, { hdr: 'Error!',
- msg: 'Failed to update license. POST returned: ' + response.status
- });
- });
- } else {
- scope.license_json_api_error = "A valid license key in JSON format is required";
- }
- },
-
- test: function() {
- var license = Store('license'),
- self = this,
- scope;
-
- var getLicense = function() {
- var deferred = $q.defer();
-
- if (license === null) {
- Rest.setUrl(GetBasePath('config'));
- return Rest.get()
- .then(function (data) {
- license = data.data.license_info;
- deferred.resolve();
- return deferred.promise;
- }, function () {
- deferred.resolve();
- return deferred.promise;
- });
- } else {
- deferred.resolve(license);
- return deferred.promise;
- }
- }
-
- var promise = getLicense();
- promise.then(function() {
- self.scope = $rootScope.$new();
- scope = self.scope;
-
- if (license && typeof license === 'object' && Object.keys(license).length > 0) {
- if (license.tested) {
- return true;
- }
- license.tested = true;
- Store('license',license); //update with tested flag
- }
-
- // Don't do anything when the license is valid
- if (!self.shouldNotify(license)) {
- return true; // if the license is valid it would exit 'test' here, otherwise it moves on to making the modal for the license
- }
-
- $location.path('/license');
- });
- },
-
- GetLicense: function(callback, inScope) {
- // Retrieve license detail
- var self = this,
- scope = (inScope) ? inScope : self.scope,
- url = GetBasePath('config');
- Rest.setUrl(url);
- Rest.get()
- .success(function (data) {
- if (scope && callback) {
- scope.$emit(callback, data);
- }
- else if (scope) {
- scope.$emit('CheckLicenseReady', data);
- }
- })
- .error(function (data, status) {
- ProcessErrors($rootScope, data, status, null, { hdr: 'Error!',
- msg: 'Failed to retrieve license. GET status: ' + status
- });
- });
- }
- };
- }]);
diff --git a/awx/ui/client/src/license/checkLicense.factory.js b/awx/ui/client/src/license/checkLicense.factory.js
new file mode 100644
index 0000000000..a654e1dc32
--- /dev/null
+++ b/awx/ui/client/src/license/checkLicense.factory.js
@@ -0,0 +1,62 @@
+/*************************************************
+ * Copyright (c) 2016 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+export default
+ ['$state', '$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors', function($state, $rootScope, Rest, GetBasePath, ProcessErrors){
+ return {
+ get: function() {
+ var defaultUrl = GetBasePath('config');
+ Rest.setUrl(defaultUrl);
+ return Rest.get()
+ .success(function(res){
+ return res
+ })
+ .error(function(res, status){
+ ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
+ msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
+ });
+ },
+ post: function(license, eula){
+ var defaultUrl = GetBasePath('config');
+ Rest.setUrl(defaultUrl);
+ var data = license;
+ data.eula_accepted = eula;
+ return Rest.post(JSON.stringify(data))
+ .success(function(res){
+ return res
+ })
+ .error(function(res, status){
+ ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
+ msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
+ });
+ },
+ // Checks current license validity
+ // Intended to for runtime or pre-state checks
+ // Returns false if invalid
+ valid: function(license) {
+ if (!license.valid_key){
+ return false
+ }
+ else if (license.free_instances <= 0){
+ return false
+ }
+ // notify if less than 15 days remaining
+ else if (license.time_remaining / 1000 / 60 / 60 / 24 > 15){
+ return false
+ }
+ return true
+ },
+ notify: function(){
+ self = this;
+ this.get()
+ .then(function(res){
+ self.valid(res.data.license_info) ? null : $state.go('license');
+ });
+ }
+
+ }
+ }
+ ];
\ No newline at end of file
diff --git a/awx/ui/client/src/license/fileOnChange.directive.js b/awx/ui/client/src/license/fileOnChange.directive.js
new file mode 100644
index 0000000000..eac1f5ffe2
--- /dev/null
+++ b/awx/ui/client/src/license/fileOnChange.directive.js
@@ -0,0 +1,16 @@
+/*************************************************
+ * Copyright (c) 2016 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+export default
+ [function(){
+ return {
+ restrict: 'A',
+ link: function(scope, el, attrs){
+ var onChange = scope.$eval(attrs.fileOnChange);
+ el.bind('change', onChange);
+ }
+ }
+ }];
\ No newline at end of file
diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less
new file mode 100644
index 0000000000..58ce83542a
--- /dev/null
+++ b/awx/ui/client/src/license/license.block.less
@@ -0,0 +1,66 @@
+/*
+* Style conventions
+* .ModuleName-component-subComponent
+* Naming describes components of the view
+*/
+@import "awx/ui/client/src/shared/branding/colors.default.less";
+@import "awx/ui/client/src/shared/layouts/one-plus-two.less";
+
+
+.License-container{
+ .OnePlusTwo-container;
+}
+.License-field--label{
+ .OnePlusTwo-left--detailsLabel;
+}
+.License-management .CodeMirror-scroll{
+ min-height: 140px;
+}
+.License-file textarea{
+ display: block;
+ width: 100%;
+}
+.License-eula textarea{
+ width: 100%;
+ height: 300px;
+}
+.License-field label{
+ width: 155px;
+}
+.License-field--content{
+ .OnePlusTwo-left--detailsContent;
+}
+.License-field{
+ .OnePlusTwo-left--detailsRow;
+}
+.License-greenText{
+ color: @submit-button-bg;
+}
+.License-redText{
+ color: #d9534f;
+}
+.License-fields{
+ .OnePlusTwo-left--details;
+}
+.License-details {
+ .OnePlusTwo-left--panel(600px);
+}
+.License-titleText {
+ .OnePlusTwo-panelHeader;
+}
+.License-management{
+ .OnePlusTwo-right--panel(600px);
+}
+.License-submit--container{
+ height: 33px;
+}
+.License-submit--success{
+ line-height:33px;
+ margin: 0 10px 0 0;
+}
+.License-file--container {
+ margin: 20px 0 20px 0;
+ input[type=file] {
+ display: none;
+ }
+}
\ No newline at end of file
diff --git a/awx/ui/client/src/license/license.controller.js b/awx/ui/client/src/license/license.controller.js
new file mode 100644
index 0000000000..6e2801a85f
--- /dev/null
+++ b/awx/ui/client/src/license/license.controller.js
@@ -0,0 +1,66 @@
+/*************************************************
+ * Copyright (c) 2016 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+export default
+ [ 'Wait', '$state', '$scope', '$location',
+ 'GetBasePath', 'Rest', 'ProcessErrors', 'CheckLicense', 'moment',
+ function( Wait, $state, $scope, $location,
+ GetBasePath, Rest, ProcessErrors, CheckLicense, moment){
+ $scope.getKey = function(event){
+ // Mimic HTML5 spec, show filename
+ $scope.fileName = event.target.files[0].name;
+ // Grab the key from the raw license file
+ var raw = new FileReader();
+ // readAsFoo runs async
+ raw.onload = function(){
+ $scope.newLicense.file = JSON.parse(raw.result);
+ }
+ raw.readAsText(event.target.files[0]);
+ };
+ // HTML5 spec doesn't provide a way to customize file input css
+ // So we hide the default input, show our own, and simulate clicks to the hidden input
+ $scope.fakeClick = function(){
+ $('#License-file').click();
+ }
+ $scope.newLicense = {};
+ $scope.submit = function(event){
+ Wait('start');
+ CheckLicense.post($scope.newLicense.file, $scope.newLicense.eula)
+ .success(function(res){
+ reset();
+ init();
+ $scope.success = true;
+ });
+ };
+ var calcDaysRemaining = function(ms){
+ // calculate the number of days remaining on the license
+ var duration = moment.duration(ms);
+ return duration.days()
+ };
+
+ var calcExpiresOn = function(days){
+ // calculate the expiration date of the license
+ return moment().add(days, 'days').calendar()
+ };
+ var init = function(){
+ $scope.fileName = "Please choose a file..."
+ Wait('start');
+ CheckLicense.get()
+ .then(function(res){
+ $scope.license = res.data;
+ $scope.time = {};
+ $scope.time.remaining = calcDaysRemaining($scope.license.license_info.time_remaining);
+ $scope.time.expiresOn = calcExpiresOn($scope.time.remaining);
+ $scope.valid = CheckLicense.valid($scope.license.license_info);
+ Wait('stop');
+ });
+ };
+ var reset = function(){
+ document.getElementById('License-form').reset()
+ };
+ init();
+ }
+ ];
\ No newline at end of file
diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html
new file mode 100644
index 0000000000..dcbde280e7
--- /dev/null
+++ b/awx/ui/client/src/license/license.partial.html
@@ -0,0 +1,99 @@
+
+
+
+
Details
+
+
+
License
+
+
+
+
+
Version
+
+ {{license.version}}
+
+
+
+
License Type
+
+ {{license.license_info.license_type}}
+
+
+
+
Subscription
+
+ {{license.license_info.subscription_name}}
+
+
+
+
License Key
+
+ {{license.license_info.license_key}}
+
+
+
+
Expires On
+
+ {{time.expiresOn}}
+
+
+
+
Time Remaining
+
+ {{time.remaining}} Day
+
+
+
+
Hosts Available
+
+ {{license.license_info.available_instances}}
+
+
+
+
Hosts Used
+
+ {{license.license_info.current_instances}}
+
+
+
+
Hosts Remaining
+
+ {{license.license_info.free_instances}}
+
+
+
+
If you are ready to upgrade, please contact us by clicking the button below
+
Upgrade
+
+
+
+
+
License Management
+
Choose your license file, agree to the End User License Agreement, and click submit.
+
+
+
+
\ No newline at end of file
diff --git a/awx/ui/client/src/license/license.route.js b/awx/ui/client/src/license/license.route.js
new file mode 100644
index 0000000000..b32f6299ea
--- /dev/null
+++ b/awx/ui/client/src/license/license.route.js
@@ -0,0 +1,19 @@
+/*************************************************
+ * Copyright (c) 2016 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+import {templateUrl} from '../shared/template-url/template-url.factory';
+
+export default {
+ name: 'license',
+ route: '/license',
+ templateUrl: templateUrl('license/license'),
+ controller: 'licenseController',
+ data: {},
+ ncyBreadcrumb: {
+ parent: 'setup',
+ label: 'LICENSE'
+ }
+}
\ No newline at end of file
diff --git a/awx/ui/client/src/license/main.js b/awx/ui/client/src/license/main.js
new file mode 100644
index 0000000000..6eeb8bf12e
--- /dev/null
+++ b/awx/ui/client/src/license/main.js
@@ -0,0 +1,19 @@
+/*************************************************
+ * Copyright (c) 2016 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+import route from './license.route';
+import controller from './license.controller';
+import CheckLicense from './checkLicense.factory';
+import fileOnChange from './fileOnChange.directive';
+
+export default
+ angular.module('license', [])
+ .controller('licenseController', controller)
+ .directive('fileOnChange', fileOnChange)
+ .factory('CheckLicense', CheckLicense)
+ .run(['$stateExtender', function($stateExtender) {
+ $stateExtender.addState(route);
+ }]);
\ No newline at end of file
diff --git a/awx/ui/client/src/partials/license.html b/awx/ui/client/src/partials/license.html
deleted file mode 100644
index c83f858354..0000000000
--- a/awx/ui/client/src/partials/license.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/awx/ui/client/src/shared/layouts/one-plus-two.less b/awx/ui/client/src/shared/layouts/one-plus-two.less
new file mode 100644
index 0000000000..fe43e40b65
--- /dev/null
+++ b/awx/ui/client/src/shared/layouts/one-plus-two.less
@@ -0,0 +1,79 @@
+/*
+* Large resolution: 1/3 + 2/3 width panels
+* Small resolution: 100% width panels, stacked
+* Options: static height, custom breakpoint
+*
+* Style conventions
+* .ModuleName-component--subComponent
+*/
+@import "awx/ui/client/src/shared/branding/colors.default.less";
+
+
+.OnePlusTwo-container(@height: 100%; @breakpoint: 900px){
+ height: @height;
+ display: flex;
+ flex-direction: row;
+ @media screen and (max-width: @breakpoint){
+ flex-direction: column;
+ }
+}
+
+.OnePlusTwo-left--panel(@height: 100%; @breakpoint: 900px) {
+ flex: 0 0;
+ height: @height;
+ width: 100%;
+ .Panel{
+ height: 100%;
+ }
+ @media screen and (min-width: @breakpoint){
+ max-width: 400px;
+ }
+}
+
+.OnePlusTwo-right--panel(@height: 100%; @breakpoint: 900px) {
+ height: @height;
+ flex: 1 0;
+ margin-left: 20px;
+ .Panel{
+ height: 100%;
+ }
+ @media screen and (max-width: @breakpoint){
+ flex-direction: column;
+ margin-left: 0px;
+ margin-top: 25px;
+ }
+}
+
+.OnePlusTwo-panelHeader {
+ color: @default-interface-txt;
+ font-size: 14px;
+ font-weight: bold;
+ margin-right: 10px;
+ text-transform: uppercase;
+}
+
+.OnePlusTwo-left--details {
+ margin-top: 25px;
+}
+
+.OnePlusTwo-left--detailsRow {
+ display: flex;
+ :not(:last-child){
+ margin-bottom: 20px;
+ }
+}
+
+.OnePlusTwo-left--detailsLabel {
+ width: 140px;
+ display: inline-block;
+ color: @default-interface-txt;
+ text-transform: uppercase;
+ font-weight: 400;
+}
+
+.OnePlusTwo-left--detailsContent {
+ display: inline-block;
+ max-width: 220px;
+ word-wrap: break-word;
+}
+
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index b431239a5a..79111c287d 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -41,7 +41,7 @@
-
+
@@ -221,8 +221,7 @@
-
-
+