External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

further clarify OpenStack options, consolidate to one PopOver

Browse Source
This commit is contained in:
AlanCoding
2016-03-30 16:20:06 -04:00
parent f6d174c337
commit 531c6afa58
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/forms/Credentials.js
View File

@@ -341,7 +341,7 @@ export default
ngShow: "kind.value == 'gce' || kind.value == 'openstack'", ngShow: "kind.value == 'gce' || kind.value == 'openstack'",
awPopOverWatch: "projectPopOver", awPopOverWatch: "projectPopOver",
awPopOver: "set in helpers/credentials", awPopOver: "set in helpers/credentials",
dataTitle: 'Project ID', dataTitle: 'Project Name',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
addRequired: false, addRequired: false,
@@ -356,8 +356,12 @@ export default
labelBind: 'domainLabel', labelBind: 'domainLabel',
type: 'text', type: 'text',
ngShow: "kind.value == 'openstack'", ngShow: "kind.value == 'openstack'",
awPopOver: "<p>Domain used for Keystone v3 <br />identity service.</p>", awPopOver: "<p>OpenStack domains define administrative " +
dataTitle: 'Domain Name (optional)', "boundaries. It is only needed for Keystone v3 authentication URLs. " +
"Common scenarios include:<ul><li><b>v2 URLs</b> - leave blank</li>" +
"<li><b>v3 default</b> - set to 'default'</br></li>" +
"<li><b>v3 multi-domain</b> - your domain name</p></li></ul></p>",
dataTitle: 'Domain Name',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
addRequired: false, addRequired: false,

8
awx/ui/client/src/helpers/Credentials.js
View File

@@ -74,8 +74,6 @@ angular.module('CredentialsHelper', ['Utilities'])
scope.project_required = false; scope.project_required = false;
scope.passwordLabel = 'Password (API Key)'; scope.passwordLabel = 'Password (API Key)';
scope.projectPopOver = "<p>The project value</p>"; scope.projectPopOver = "<p>The project value</p>";
scope.domainPopOver = "<p>Domain used for Keystone v3 " +
"<br />identity service.</p>";
scope.hostPopOver = "<p>The host value</p>"; scope.hostPopOver = "<p>The host value</p>";
if (!Empty(scope.kind)) { if (!Empty(scope.kind)) {
@@ -128,13 +126,13 @@ angular.module('CredentialsHelper', ['Utilities'])
case 'openstack': case 'openstack':
scope.hostLabel = "Host (Authentication URL)"; scope.hostLabel = "Host (Authentication URL)";
scope.projectLabel = "Project (Tenant Name)"; scope.projectLabel = "Project (Tenant Name)";
scope.domainLabel = "Domain Name (optional)"; scope.domainLabel = "Domain Name";
scope.password_required = true; scope.password_required = true;
scope.project_required = true; scope.project_required = true;
scope.host_required = true; scope.host_required = true;
scope.username_required = true; scope.username_required = true;
scope.projectPopOver = "<p>This is the tenant name " + scope.projectPopOver = "<p>This is the tenant name. " +
"or tenant id. This value is usually the same " + " This value is usually the same " +
" as the username.</p>"; " as the username.</p>";
scope.hostPopOver = "<p>The host to authenticate with." + scope.hostPopOver = "<p>The host to authenticate with." +
"<br />For example, https://openstack.business.com/v2.0/"; "<br />For example, https://openstack.business.com/v2.0/";