shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

updated credential help descriptions

Browse Source
This commit is contained in:
Jared Tabor 2014-07-31 10:38:43 -04:00
parent 65aadb862e
commit b8cd4d063e
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/static/js/forms/Credentials.js
View File

@ -172,7 +172,7 @@ angular.module('CredentialFormDefinition', [])
}, },
autocomplete: false, autocomplete: false,
awPopOver: '<p>The e-mail address assigned to the Google Compute Engine <b><i>service account.</b></i></p>', awPopOver: '<p>The e-mail address assigned to the Google Compute Engine <b><i>service account.</b></i></p>',
dataTitle: 'Subscription ID', dataTitle: 'Email',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body" dataContainer: "body"
}, },
@ -259,16 +259,17 @@ angular.module('CredentialFormDefinition', [])
variable: 'key_required', variable: 'key_required',
init: true init: true
}, },
hintText:"drag and drop an SSH private key file on the field below", hintText: "{{ key_hint }}",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
awDropFile: true, awDropFile: true,
'class': 'ssh-key-field', 'class': 'ssh-key-field',
rows: 10, rows: 10,
// awPopOver: "key_description", awPopOver: "SSH key description",
// dataTitle: 'Subscription ID', awPopOverWatch: "key_description",
// dataPlacement: 'right', dataTitle: 'Help',
// dataContainer: "body" dataPlacement: 'right',
dataContainer: "body"
}, },
"ssh_key_unlock": { "ssh_key_unlock": {
label: 'Key Password', label: 'Key Password',

19
awx/ui/static/js/helpers/Credentials.js
View File

@ -19,6 +19,14 @@ angular.module('CredentialsHelper', ['Utilities'])
reset = params.reset, reset = params.reset,
collapse, id; collapse, id;
$('.popover').each(function() {
// remove lingering popover <div>. Seems to be a bug in TB3 RC1
$(this).remove();
});
$('.tooltip').each( function() {
// close any lingering tool tipss
$(this).hide();
});
// Put things in a default state // Put things in a default state
scope.usernameLabel = 'Username'; scope.usernameLabel = 'Username';
scope.aws_required = false; scope.aws_required = false;
@ -29,7 +37,8 @@ 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 = ''; 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_hint= "drag and drop an SSH private key file on the field below";
if (!Empty(scope.kind)) { if (!Empty(scope.kind)) {
// Apply kind specific settings // Apply kind specific settings
switch (scope.kind.value) { switch (scope.kind.value) {
@ -52,14 +61,16 @@ 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 that corresponds to the certificate you uploaded in the Windows Azure console."; scope.key_description = 'Paste the value of the private key found within a GCE service account\'s JSON key. <div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>';
scope.key_hint= "drag and drop a private key file on the field below";
break; break;
case 'azure': case 'azure':
scope.usernameLabel = "Subscription ID"; scope.usernameLabel = "Subscription ID";
scope.sshKeyDataLabel = 'RSA Private Key'; 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 value of the private key within a GCE service account\'s JSON key.'; scope.key_description = "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Windows Azure console.<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
scope.key_hint= "drag and drop a management certificate file on the field below";
break; break;
} }
} }