elements
+ $(this).remove();
+ });
$('#status-modal-dialog').dialog('destroy');
$('#inventory-modal-container').empty();
+ },
+ open: function(e, ui) {
+ Wait('stop');
}
});
@@ -122,7 +135,6 @@ angular.module('JobsHelper', ['Utilities', 'FormGenerator', 'JobSummaryDefinitio
scope['traceback_rows'] = calcRows(scope['result_traceback']);
var cDate = new Date(data.created);
scope.created = FormatDate(cDate);
- Wait('stop');
$('#status-modal-dialog').dialog('open');
})
.error( function(data, status, headers, config) {
diff --git a/awx/ui/static/js/helpers/Projects.js b/awx/ui/static/js/helpers/Projects.js
index afcb4562ff..a551ef2f90 100644
--- a/awx/ui/static/js/helpers/Projects.js
+++ b/awx/ui/static/js/helpers/Projects.js
@@ -12,24 +12,89 @@
angular.module('ProjectsHelper', ['RestServices', 'Utilities', 'ProjectStatusDefinition', 'ProjectFormDefinition'])
.factory('ProjectStatus', ['$rootScope', '$location', '$log', '$routeParams', 'Rest', 'Alert', 'GenerateForm',
- 'Prompt', 'ProcessErrors', 'GetBasePath', 'FormatDate', 'ProjectStatusForm',
+ 'Prompt', 'ProcessErrors', 'GetBasePath', 'FormatDate', 'ProjectStatusForm', 'Wait',
function($rootScope, $location, $log, $routeParams, Rest, Alert, GenerateForm, Prompt, ProcessErrors, GetBasePath,
- FormatDate, ProjectStatusForm) {
+ FormatDate, ProjectStatusForm, Wait) {
return function(params) {
var project_id = params.project_id;
var last_update = params.last_update;
+
var generator = GenerateForm;
var form = ProjectStatusForm;
- var scope;
+
+ Wait('start');
+
+ // Using jquery dialog for its expandable property
+ var html = "
\n";
+ $('#projects-modal-container').empty().append(html);
+
+ var scope = generator.inject(form, { mode: 'edit', id: 'form-container', related: false, breadCrumbs: false });
+ generator.reset();
+
+ // Set modal dimensions based on viewport width
+ var ww = $(document).width();
+ var wh = $('body').height();
+ var x, y, maxrows;
+ if (ww > 1199) {
+ // desktop
+ x = 675;
+ y = (750 > wh) ? wh - 20 : 750;
+ maxrows = 20;
+ }
+ else if (ww <= 1199 && ww >= 768) {
+ x = 550;
+ y = (620 > wh) ? wh - 15 : 620;
+ maxrows = 15;
+ }
+ else {
+ x = (ww - 20);
+ y = (500 > wh) ? wh : 500;
+ maxrows = 10;
+ }
+ // Create the modal
+ $('#status-modal-dialog').dialog({
+ buttons: { "OK": function() { $( this ).dialog( "close" ); } },
+ modal: true,
+ width: x,
+ height: y,
+ autoOpen: false,
+ create: function (e, ui) {
+ // fix the close button
+ $('.ui-dialog[aria-describedby="status-modal-dialog"]').find('.ui-dialog-titlebar button').empty().attr({ 'class': 'close' }).text('x');
+ // fix the OK button
+ $('.ui-dialog[aria-describedby="status-modal-dialog"]').find('.ui-dialog-buttonset button:first')
+ .attr({ 'class': 'btn btn-primary' });
+ },
+ resizeStop: function(e, ui) {
+ // for some reason, after resizing dialog the form and fields (the content) doesn't expand to 100%
+ var dialog = $('.ui-dialog[aria-describedby="status-modal-dialog"]');
+ var content = dialog.find('#status-modal-dialog');
+ content.width( dialog.width() - 28 );
+ },
+ close: function(e, ui) {
+ // Destroy on close
+ // Destroy on close
+ $('.tooltip').each( function(index) {
+ // Remove any lingering tooltip
elements
+ $(this).remove();
+ });
+ $('.popover').each(function(index) {
+ // remove lingering popover
elements
+ $(this).remove();
+ });
+ $('#status-modal-dialog').dialog('destroy');
+ $('#projects-modal-container').empty();
+ },
+ open: function(e, ui) {
+ Wait('stop');
+ }
+ });
// Retrieve detail record and prepopulate the form
Rest.setUrl(last_update);
Rest.get()
.success( function(data, status, headers, config) {
- // load up the form
- scope = generator.inject(form, { mode: 'edit', modal: true, related: false});
- generator.reset();
var results = data;
for (var fld in form.fields) {
if (results[fld]) {
@@ -46,18 +111,10 @@ angular.module('ProjectsHelper', ['RestServices', 'Utilities', 'ProjectStatusDef
}
}
}
- scope.formModalAction = function() {
- $('#form-modal').modal("hide");
- }
- scope.formModalActionLabel = 'OK';
- scope.formModalCancelShow = false;
- scope.formModalInfo = false;
- scope.formModalHeader = results.summary_fields.project.name + ' - SCM Status';
- $('#form-modal .btn-success').removeClass('btn-success').addClass('btn-none');
- $('#form-modal').addClass('skinny-modal');
- if (!scope.$$phase) {
- scope.$digest();
- }
+ $('#status-modal-dialog')
+ .dialog({ title: results.summary_fields.project.name + ' Status'})
+ .dialog('open');
+
})
.error( function(data, status, headers, config) {
$('#form-modal').modal("hide");
diff --git a/awx/ui/static/js/lists/Jobs.js b/awx/ui/static/js/lists/Jobs.js
index a56a2328b8..29a40309d0 100644
--- a/awx/ui/static/js/lists/Jobs.js
+++ b/awx/ui/static/js/lists/Jobs.js
@@ -84,7 +84,7 @@ angular.module('JobsListDefinition', [])
fieldActions: {
submit: {
- label: 'Launch',
+ label: 'Relaunch',
icon: 'icon-rocket',
mode: 'all',
ngClick: "submitJob(\{\{ job.id \}\}, '\{\{ job.summary_fields.job_template.name \}\}' )",
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index e87bfcf02c..3817f34686 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -142,19 +142,39 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
}
}
if (options.modal_selector) {
- $(options.modal_selector).modal({ show: true, backdrop: 'static', keyboard: true });
- $(options.modal_selector).on('shown.bs.modal', function() {
- $(options.modal_select + ' input:first').focus();
- });
- $(options.modal_selector).unbind('hidden.bs.modal');
+ $(options.modal_selector).modal({ show: true, backdrop: 'static', keyboard: true });
+ $(options.modal_selector).on('shown.bs.modal', function() {
+ $(options.modal_select + ' input:first').focus();
+ });
+ $(options.modal_selector).on('hidden.bs.modal', function() {
+ $('.tooltip').each( function(index) {
+ // Remove any lingering tooltip and popover
elements
+ $(this).remove();
+ });
+
+ $('.popover').each(function(index) {
+ // remove lingering popover
. Seems to be a bug in TB3 RC1
+ $(this).remove();
+ });
+ });
}
else {
- var show = (options.show_modal == false) ? false : true;
- $('#form-modal').modal({ show: show, backdrop: 'static', keyboard: true });
- $('#form-modal').on('shown.bs.modal', function() {
- $('#form-modal input:first').focus();
- });
- $('#form-modal').off('hidden.bs.modal');
+ var show = (options.show_modal == false) ? false : true;
+ $('#form-modal').modal({ show: show, backdrop: 'static', keyboard: true });
+ $('#form-modal').on('shown.bs.modal', function() {
+ $('#form-modal input:first').focus();
+ });
+ $('#form-modal').on('hidden.bs.modal', function() {
+ $('.tooltip').each( function(index) {
+ // Remove any lingering tooltip and popover
elements
+ $(this).remove();
+ });
+
+ $('.popover').each(function(index) {
+ // remove lingering popover
. Seems to be a bug in TB3 RC1
+ $(this).remove();
+ });
+ });
}
$(document).bind('keydown', function(e) {
if (e.keyCode === 27) {
@@ -194,38 +214,51 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
if (this.scope[this.form.name + '_form']) {
this.scope[this.form.name + '_form'].$setPristine();
}
+
+ var scope = this.scope;
+ var form = this.form;
- for (var fld in this.form.fields) {
- if (this.form.fields[fld].type == 'checkbox_group') {
- for (var i=0; i < this.form.fields[fld].fields.length; i++) {
- this.scope[this.form.fields[fld].fields[i].name] = '';
- this.scope[this.form.fields[fld].fields[i].name + '_api_error'] = '';
- }
+ function resetField(f, fld) {
+ // f is the field object, fld is the key
+
+ if (f.type == 'checkbox_group') {
+ for (var i=0; i < f.fields.length; i++) {
+ scope[f.name] = '';
+ scope[f.name + '_api_error'] = '';
+ }
}
else {
- this.scope[fld] = '';
- this.scope[fld + '_api_error'] = '';
+ scope[fld] = '';
+ scope[fld + '_api_error'] = '';
}
- if (this.form.fields[fld].sourceModel) {
- this.scope[this.form.fields[fld].sourceModel + '_' + this.form.fields[fld].sourceField] = '';
- this.scope[this.form.fields[fld].sourceModel + '_' + this.form.fields[fld].sourceField + '_api_error'] = '';
+ if (f.sourceModel) {
+ scope[f.sourceModel + '_' + f.sourceField] = '';
+ scope[f.sourceModel + '_' + f.sourceField + '_api_error'] = '';
}
- if ( this.form.fields[fld].type == 'lookup' &&
- this.scope[this.form.name + '_form'][this.form.fields[fld].sourceModel + '_' + this.form.fields[fld].sourceField] ) {
- this.scope[this.form.name + '_form'][this.form.fields[fld].sourceModel + '_' + this.form.fields[fld].sourceField].$setPristine();
+ if (f.type == 'lookup' && scope[form.name + '_form'][f.sourceModel + '_' + f.sourceField]) {
+ scope[form.name + '_form'][f.sourceModel + '_' + f.sourceField].$setPristine();
}
- if (this.scope[this.form.name + '_form'][fld]) {
- this.scope[this.form.name + '_form'][fld].$setPristine();
+ if (scope[form.name + '_form'][fld]) {
+ scope[form.name + '_form'][fld].$setPristine();
}
- if (this.form.fields[fld].chkPass && this.scope[this.form.name + '_form'][fld]) {
- this.scope[this.form.name + '_form'][fld].$setValidity('complexity', true);
+ if (f.chkPass && scope[form.name + '_form'][fld]) {
+ scope[form.name + '_form'][fld].$setValidity('complexity', true);
$('#progbar').css({ width: 0 });
}
- if (this.form.fields[fld].awPassMatch && this.scope[this.form.name + '_form'][fld]) {
- this.scope[this.form.name + '_form'][fld].$setValidity('awpassmatch', true);
+ if (f.awPassMatch && scope[form.name + '_form'][fld]) {
+ scope[form.name + '_form'][fld].$setValidity('awpassmatch', true);
}
- if (this.form.fields[fld].ask) {
- this.scope[fld + '_ask'] = false;
+ if (f.ask) {
+ scope[fld + '_ask'] = false;
+ }
+ }
+
+ for (var fld in form.fields) {
+ resetField(form.fields[fld], fld);
+ }
+ if (form.statusFields) {
+ for (var fld in form.statusFields) {
+ resetField(form.statusFields[fld], fld);
}
}
if (this.mode == 'add') {
diff --git a/awx/ui/static/lib/ansible/license.js b/awx/ui/static/lib/ansible/license.js
index b247cf1ffa..cacba6b0ce 100644
--- a/awx/ui/static/lib/ansible/license.js
+++ b/awx/ui/static/lib/ansible/license.js
@@ -1,7 +1,9 @@
-/*****************************************
+/*********************************************
+ * Copyright (c) 2014 AnsibleWorks, Inc.
+ *
* License.js
*
- * View license info: /api/vi/config/
+ * View license info found in /api/vi/config/
*
*****************************************/
@@ -118,7 +120,7 @@ angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'Prompt
scope.formModalActionLabel = 'OK';
scope.formModalCancelShow = false;
scope.formModalInfo = 'Purchase/Extend License';
- scope.formModalHeader = 'AWX License';
+ scope.formModalHeader = 'Tower License';
//$('#form-modal .btn-success').removeClass('btn-success').addClass('btn-none');
//$('#form-modal').addClass('skinny-modal');
@@ -127,10 +129,10 @@ angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'Prompt
// Respond to license button
scope.formModalInfoAction = function() {
Prompt({
- hdr: 'AWX Licensing',
- body: "
AWX licenses can be purchased or extended by visiting " + - "the AnsibleWorks online store. Would you like to purchase or extend your license now?
", + hdr: 'Tower Licensing', + body: "Ansible Tower licenses can be purchased or extended by visiting " + + "the Ansible online store. Would you like to purchase or extend your license now?
", 'class': 'btn-primary', action: function() { var href = $('#license-link').attr('href'); diff --git a/awx/ui/static/partials/projects.html b/awx/ui/static/partials/projects.html index 4b57efbd87..a034df92bc 100644 --- a/awx/ui/static/partials/projects.html +++ b/awx/ui/static/partials/projects.html @@ -1,3 +1,4 @@
+
\ No newline at end of file
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 51e5e3cc18..478f1e9c69 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -369,14 +369,14 @@
