mirror of
https://github.com/ansible/awx.git
synced 2026-03-02 09:18:48 -03:30
removed bottom right pop-over directions.
This commit is contained in:
@@ -513,11 +513,9 @@ function HomeGroups($log, $scope, $filter, $compile, $location, $routeParams, Lo
|
|||||||
});
|
});
|
||||||
html += "</tbody>\n";
|
html += "</tbody>\n";
|
||||||
html += "</table>\n";
|
html += "</table>\n";
|
||||||
html += "<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
html = "<p>No recent job data available for this inventory.</p>\n" +
|
html = "<p>No recent job data available for this inventory.</p>\n";
|
||||||
"<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
}
|
}
|
||||||
attachElem(event, html, title);
|
attachElem(event, html, title);
|
||||||
});
|
});
|
||||||
@@ -549,7 +547,6 @@ function HomeGroups($log, $scope, $filter, $compile, $location, $routeParams, Lo
|
|||||||
});
|
});
|
||||||
html += "</tbody>\n";
|
html += "</tbody>\n";
|
||||||
html += "</table>\n";
|
html += "</table>\n";
|
||||||
html += "<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
title = "Sync Status";
|
title = "Sync Status";
|
||||||
attachElem(event, html, title);
|
attachElem(event, html, title);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -205,11 +205,9 @@ function InventoriesList($scope, $rootScope, $location, $log, $routeParams, $com
|
|||||||
});
|
});
|
||||||
html += "</tbody>\n";
|
html += "</tbody>\n";
|
||||||
html += "</table>\n";
|
html += "</table>\n";
|
||||||
html += "<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
html = "<p>No recent job data available for this inventory.</p>\n" +
|
html = "<p>No recent job data available for this inventory.</p>\n";
|
||||||
"<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
}
|
}
|
||||||
attachElem(event, html, title);
|
attachElem(event, html, title);
|
||||||
});
|
});
|
||||||
@@ -250,7 +248,6 @@ function InventoriesList($scope, $rootScope, $location, $log, $routeParams, $com
|
|||||||
});
|
});
|
||||||
html += "</tbody>\n";
|
html += "</tbody>\n";
|
||||||
html += "</table>\n";
|
html += "</table>\n";
|
||||||
html += "<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
title = "Sync Status";
|
title = "Sync Status";
|
||||||
attachElem(event, html, title);
|
attachElem(event, html, title);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -90,9 +90,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
|
|||||||
scope.eventsHelpText = "<p><i class=\"fa fa-circle successful-hosts-color\"></i> Successful</p>\n" +
|
scope.eventsHelpText = "<p><i class=\"fa fa-circle successful-hosts-color\"></i> Successful</p>\n" +
|
||||||
"<p><i class=\"fa fa-circle changed-hosts-color\"></i> Changed</p>\n" +
|
"<p><i class=\"fa fa-circle changed-hosts-color\"></i> Changed</p>\n" +
|
||||||
"<p><i class=\"fa fa-circle unreachable-hosts-color\"></i> Unreachable</p>\n" +
|
"<p><i class=\"fa fa-circle unreachable-hosts-color\"></i> Unreachable</p>\n" +
|
||||||
"<p><i class=\"fa fa-circle failed-hosts-color\"></i> Failed</p>\n" +
|
"<p><i class=\"fa fa-circle failed-hosts-color\"></i> Failed</p>\n";
|
||||||
"<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
|
|
||||||
function openSocket() {
|
function openSocket() {
|
||||||
event_socket = Socket({
|
event_socket = Socket({
|
||||||
scope: scope,
|
scope: scope,
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ angular.module('CredentialsHelper', ['Utilities'])
|
|||||||
scope.key_required = false; // JT -- doing the same for key and project
|
scope.key_required = false; // JT -- doing the same for key and project
|
||||||
scope.project_required = false;
|
scope.project_required = false;
|
||||||
scope.subscription_required = false;
|
scope.subscription_required = false;
|
||||||
scope.key_description = "Paste the contents of the SSH private key file.<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
|
scope.key_description = "Paste the contents of the SSH private key file.";
|
||||||
scope.key_hint= "drag and drop an SSH private key file on the field below";
|
scope.key_hint= "drag and drop an SSH private key file on the field below";
|
||||||
scope.host_required = false;
|
scope.host_required = false;
|
||||||
scope.password_required = false;
|
scope.password_required = false;
|
||||||
@@ -68,7 +68,7 @@ angular.module('CredentialsHelper', ['Utilities'])
|
|||||||
scope.email_required = true;
|
scope.email_required = true;
|
||||||
scope.key_required = true;
|
scope.key_required = true;
|
||||||
scope.project_required = true;
|
scope.project_required = true;
|
||||||
scope.key_description = 'Paste the contents of the PEM file associated with the service account email. <div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>';
|
scope.key_description = 'Paste the contents of the PEM file associated with the service account email.';
|
||||||
scope.key_hint= "drag and drop a private key file on the field below";
|
scope.key_hint= "drag and drop a private key file on the field below";
|
||||||
break;
|
break;
|
||||||
case 'azure':
|
case 'azure':
|
||||||
@@ -76,7 +76,7 @@ angular.module('CredentialsHelper', ['Utilities'])
|
|||||||
scope.sshKeyDataLabel = 'Management Certificate';
|
scope.sshKeyDataLabel = 'Management Certificate';
|
||||||
scope.subscription_required = true;
|
scope.subscription_required = true;
|
||||||
scope.key_required = true;
|
scope.key_required = true;
|
||||||
scope.key_description = "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console.<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
|
scope.key_description = "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console.";
|
||||||
scope.key_hint= "drag and drop a management certificate file on the field below";
|
scope.key_hint= "drag and drop a management certificate file on the field below";
|
||||||
break;
|
break;
|
||||||
case 'vmware':
|
case 'vmware':
|
||||||
|
|||||||
@@ -1439,9 +1439,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
|
|||||||
"the associated groups and hosts will no longer appear in the inventory.</dd>\n" +
|
"the associated groups and hosts will no longer appear in the inventory.</dd>\n" +
|
||||||
"<dt style=\"margin-top: 5px;\">Promote</dt><dd>Groups and hosts associated with the group being removed will be " +
|
"<dt style=\"margin-top: 5px;\">Promote</dt><dd>Groups and hosts associated with the group being removed will be " +
|
||||||
"promoted one level. Note: groups already associated with other groups cannot be promoted to the top level of the " +
|
"promoted one level. Note: groups already associated with other groups cannot be promoted to the top level of the " +
|
||||||
"tree.</dd></dl>\n" +
|
"tree.</dd></dl>\n";
|
||||||
"<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
|
|
||||||
|
|
||||||
buttonSet = [{
|
buttonSet = [{
|
||||||
label: "Cancel",
|
label: "Cancel",
|
||||||
onClick: function() {
|
onClick: function() {
|
||||||
|
|||||||
@@ -77,8 +77,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
|
|||||||
|
|
||||||
function noRecentJobs() {
|
function noRecentJobs() {
|
||||||
title = 'No job data';
|
title = 'No job data';
|
||||||
html = "<p>No recent job data available for this host.</p>\n" +
|
html = "<p>No recent job data available for this host.</p>\n";
|
||||||
"<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function setMsg(host) {
|
function setMsg(host) {
|
||||||
@@ -129,7 +128,6 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
|
|||||||
}
|
}
|
||||||
html += "</tbody>\n";
|
html += "</tbody>\n";
|
||||||
html += "</table>\n";
|
html += "</table>\n";
|
||||||
html += "<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
noRecentJobs();
|
noRecentJobs();
|
||||||
|
|||||||
@@ -453,8 +453,7 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
|
|||||||
"JSON:<br />\n" +
|
"JSON:<br />\n" +
|
||||||
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" +
|
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" +
|
||||||
"YAML:<br />\n" +
|
"YAML:<br />\n" +
|
||||||
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
|
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n";
|
||||||
"<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
|
|
||||||
|
|
||||||
scope.extra_vars = ParseVariableString(extra_vars);
|
scope.extra_vars = ParseVariableString(extra_vars);
|
||||||
scope.parseType = 'yaml';
|
scope.parseType = 'yaml';
|
||||||
|
|||||||
@@ -47,8 +47,7 @@ angular.module('JobTemplatesHelper', ['Utilities'])
|
|||||||
scope.callback_server_path + GetBasePath('job_templates') + scope.example_template_id + "/callback/</pre>\n" +
|
scope.callback_server_path + GetBasePath('job_templates') + scope.example_template_id + "/callback/</pre>\n" +
|
||||||
"<p>Note the requesting host must be defined in the inventory associated with the job template. If Tower fails to " +
|
"<p>Note the requesting host must be defined in the inventory associated with the job template. If Tower fails to " +
|
||||||
"locate the host, the request will be denied.</p>" +
|
"locate the host, the request will be denied.</p>" +
|
||||||
"<p>Successful requests create an entry on the Jobs page, where results and history can be viewed.</p>" +
|
"<p>Successful requests create an entry on the Jobs page, where results and history can be viewed.</p>";
|
||||||
"<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// The md5 helper emits NewMD5Generated whenever a new key is available
|
// The md5 helper emits NewMD5Generated whenever a new key is available
|
||||||
|
|||||||
@@ -17,8 +17,7 @@ angular.module('CredentialsListDefinition', [])
|
|||||||
selectTitle: 'Add Credentials',
|
selectTitle: 'Add Credentials',
|
||||||
editTitle: 'Credentials',
|
editTitle: 'Credentials',
|
||||||
selectInstructions: "<p>Select existing credentials by clicking each credential or checking the related checkbox. When " +
|
selectInstructions: "<p>Select existing credentials by clicking each credential or checking the related checkbox. When " +
|
||||||
"finished, click the blue <em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking " +
|
"finished, click the blue <em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking ",
|
||||||
"the <i class=\"fa fa-plus\"></i> button.</p><div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>",
|
|
||||||
index: false,
|
index: false,
|
||||||
hover: true,
|
hover: true,
|
||||||
|
|
||||||
|
|||||||
@@ -16,9 +16,6 @@ angular.module('CustomInventoryListDefinition', [])
|
|||||||
iterator: 'source_script', //'custom_inventory',
|
iterator: 'source_script', //'custom_inventory',
|
||||||
selectTitle: 'Add custom inventory',
|
selectTitle: 'Add custom inventory',
|
||||||
editTitle: 'Custom Inventories',
|
editTitle: 'Custom Inventories',
|
||||||
// selectInstructions: "<p>Select existing credentials by clicking each credential or checking the related checkbox. When " +
|
|
||||||
// "finished, click the blue <em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking " +
|
|
||||||
// "the <i class=\"fa fa-plus\"></i> button.</p><div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>",
|
|
||||||
index: false,
|
index: false,
|
||||||
hover: false,
|
hover: false,
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ angular.module('OrganizationListDefinition', [])
|
|||||||
selectTitle: 'Add Organizations',
|
selectTitle: 'Add Organizations',
|
||||||
selectInstructions: '<p>Select existing organizations by clicking each organization or checking the related checkbox. When finished, ' +
|
selectInstructions: '<p>Select existing organizations by clicking each organization or checking the related checkbox. When finished, ' +
|
||||||
'click the blue <em>Select</em> button, located bottom right.</p><p>Create a new organization by clicking the ' +
|
'click the blue <em>Select</em> button, located bottom right.</p><p>Create a new organization by clicking the ' +
|
||||||
'<i class=\"fa fa-plus\"></i> button.</p><div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>',
|
'<i class=\"fa fa-plus\"></i> button.</p>',
|
||||||
editTitle: 'Organizations',
|
editTitle: 'Organizations',
|
||||||
hover: true,
|
hover: true,
|
||||||
index: false,
|
index: false,
|
||||||
|
|||||||
@@ -17,8 +17,7 @@ angular.module('ProjectsListDefinition', [])
|
|||||||
selectTitle: 'Add Project',
|
selectTitle: 'Add Project',
|
||||||
editTitle: 'Projects',
|
editTitle: 'Projects',
|
||||||
selectInstructions: '<p>Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' +
|
selectInstructions: '<p>Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' +
|
||||||
'<em>Select</em> button, located bottom right.</p><p>Create a new project by clicking the <i class=\"fa fa-plus\"></i> button.</p>'+
|
'<em>Select</em> button, located bottom right.</p><p>Create a new project by clicking the <i class=\"fa fa-plus\"></i> button.</p>',
|
||||||
'<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>',
|
|
||||||
index: false,
|
index: false,
|
||||||
hover: true,
|
hover: true,
|
||||||
|
|
||||||
@@ -66,34 +65,12 @@ angular.module('ProjectsListDefinition', [])
|
|||||||
ngClick: 'addProject()',
|
ngClick: 'addProject()',
|
||||||
awToolTip: 'Create a new project'
|
awToolTip: 'Create a new project'
|
||||||
},
|
},
|
||||||
/*help: {
|
|
||||||
awPopOver: "<dl>\n<dt>Updating</dt><dd>A source control update is in progress.</dd>\n" +
|
|
||||||
"<dt>Never Updated</dt><dd>This project has not yet been updated from source control.</dd>\n" +
|
|
||||||
"<dt>Failed</dt><dd>An error occurred during the most recent source control update, click the status " +
|
|
||||||
"text for more information.</dd>\n" +
|
|
||||||
"<dt>Successful</dt><dd>TThe latest source control update completed successfully.</dd>\n" +
|
|
||||||
"<dt>Missing</dt><dd>The previously configured local project directory is missing.</dd>\n" +
|
|
||||||
"<dt>N/A</dt><dd>The project is not linked to source control, so updates are not applicable.</dd>\n" +
|
|
||||||
"</dl>\n",
|
|
||||||
dataPlacement: 'left',
|
|
||||||
dataContainer: 'body',
|
|
||||||
mode: 'edit',
|
|
||||||
awToolTip: 'Click for help',
|
|
||||||
awTipPlacement: 'top'
|
|
||||||
},*/
|
|
||||||
refresh: {
|
refresh: {
|
||||||
mode: 'all',
|
mode: 'all',
|
||||||
awToolTip: "Refresh the page",
|
awToolTip: "Refresh the page",
|
||||||
ngClick: "refresh()",
|
ngClick: "refresh()",
|
||||||
ngShow: "socketStatus == 'error'"
|
ngShow: "socketStatus == 'error'"
|
||||||
},
|
},
|
||||||
/*socket: {
|
|
||||||
mode: 'all',
|
|
||||||
iconClass: "{{ 'fa fa-power-off fa-lg socket-' + socketStatus }}",
|
|
||||||
awToolTip: "{{ socketTip }}",
|
|
||||||
dataTipWatch: "socketTip",
|
|
||||||
ngClick: "socketToggle()",
|
|
||||||
},*/
|
|
||||||
stream: {
|
stream: {
|
||||||
ngClick: "showActivity()",
|
ngClick: "showActivity()",
|
||||||
awToolTip: "View Activity Stream",
|
awToolTip: "View Activity Stream",
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ angular.module('UserListDefinition', [])
|
|||||||
editTitle: 'Users',
|
editTitle: 'Users',
|
||||||
selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
|
selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
|
||||||
'<em>Select</em> button, located bottom right.</p> <p>When available, a brand new user can be created by clicking the ' +
|
'<em>Select</em> button, located bottom right.</p> <p>When available, a brand new user can be created by clicking the ' +
|
||||||
'<i class=\"fa fa-plus\"></i> button.</p><div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>',
|
'<i class=\"fa fa-plus\"></i> button.</p>',
|
||||||
index: false,
|
index: false,
|
||||||
hover: true,
|
hover: true,
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ angular.module('GeneratorHelpers', [])
|
|||||||
break;
|
break;
|
||||||
case 'awPopOver':
|
case 'awPopOver':
|
||||||
// construct the entire help link
|
// construct the entire help link
|
||||||
result = "<a id=\"awp-" + fld + "\" href=\"\" aw-pop-over=\'" + value + "<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\' ";
|
result = "<a id=\"awp-" + fld + "\" href=\"\" aw-pop-over=\'" + value + "\' ";
|
||||||
result += (obj.dataPlacement) ? "data-placement=\"" + obj.dataPlacement + "\" " : "";
|
result += (obj.dataPlacement) ? "data-placement=\"" + obj.dataPlacement + "\" " : "";
|
||||||
result += (obj.dataContainer) ? "data-container=\"" + obj.dataContainer + "\" " : "";
|
result += (obj.dataContainer) ? "data-container=\"" + obj.dataContainer + "\" " : "";
|
||||||
result += (obj.dataTitle) ? "data-title=\"" + obj.dataTitle + "\" " : "";
|
result += (obj.dataTitle) ? "data-title=\"" + obj.dataTitle + "\" " : "";
|
||||||
|
|||||||
Reference in New Issue
Block a user