From b5929a232a2003028d9072c9afd205b6f1c20660 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Tue, 13 Jan 2015 14:50:35 -0500
Subject: [PATCH] Machine Credential username/password

changed username/password for machine credential to NOT include 'SSH'
---
 awx/ui/static/js/forms/Credentials.js   | 4 ++--
 awx/ui/static/js/helpers/Credentials.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui/static/js/forms/Credentials.js b/awx/ui/static/js/forms/Credentials.js
index 9fa67d70b4..9d8a729481 100644
--- a/awx/ui/static/js/forms/Credentials.js
+++ b/awx/ui/static/js/forms/Credentials.js
@@ -246,7 +246,7 @@ angular.module('CredentialFormDefinition', [])
                 }
             },
             "ssh_password": {
-                label: 'SSH Password',
+                label: 'Password', // formally 'SSH Password'
                 type: 'password',
                 ngShow: "kind.value == 'ssh'",
                 ngChange: "clearPWConfirm('ssh_password_confirm')",
@@ -258,7 +258,7 @@ angular.module('CredentialFormDefinition', [])
                 autocomplete: false
             },
             "ssh_password_confirm": {
-                label: 'Confirm SSH Password',
+                label: 'Confirm Password', // formally 'Confirm SSH password'
                 type: 'password',
                 ngShow: "kind.value == 'ssh'",
                 addRequired: false,
diff --git a/awx/ui/static/js/helpers/Credentials.js b/awx/ui/static/js/helpers/Credentials.js
index 7b91295c6e..31ac14b160 100644
--- a/awx/ui/static/js/helpers/Credentials.js
+++ b/awx/ui/static/js/helpers/Credentials.js
@@ -57,7 +57,7 @@ angular.module('CredentialsHelper', ['Utilities'])
                     scope.username_required = true;
                     break;
                 case 'ssh':
-                    scope.usernameLabel = 'SSH Username';
+                    scope.usernameLabel = 'Username'; //formally 'SSH Username'
                     break;
                 case 'scm':
                     scope.sshKeyDataLabel = 'SCM Private Key';