From 0a44de3346201d9a6e6b377534f5263a384edf80 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Wed, 30 Jul 2014 18:35:31 -0400
Subject: [PATCH] hintText form option Add hintText:"some helpful text here" to
 a field in a form definition object. Form generator will display the text
 inside the <label> element on a new line with the fa-info-circle icon in a
 pleasant grey color.

---
 awx/ui/static/js/forms/Credentials.js       |  1 +
 awx/ui/static/less/ansible-ui.less          | 10 ++++++++++
 awx/ui/static/lib/ansible/form-generator.js |  1 +
 3 files changed, 12 insertions(+)

diff --git a/awx/ui/static/js/forms/Credentials.js b/awx/ui/static/js/forms/Credentials.js
index d03498e4a1..4726b5d540 100644
--- a/awx/ui/static/js/forms/Credentials.js
+++ b/awx/ui/static/js/forms/Credentials.js
@@ -238,6 +238,7 @@ angular.module('CredentialFormDefinition', [])
                     variable: 'key_required',
                     init: true
                 },
+                hintText:"drag and drop an SSH private key file on the field below",
                 addRequired: false,
                 editRequired: false,
                 awDropFile: true,
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index c3e81562e1..05d454d377 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -480,6 +480,16 @@ dd {
   padding-right: 10px;
 }
 
+.label-hint-text {
+   font-weight: normal;
+   color: @grey;
+}
+.label-hint-text:before {
+    /* for a line break before hintText */
+    content: '\A';
+    white-space: pre;
+}
+
 #group_form #group_tabs {
   margin-top: 25px;
 }
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index 0743c2887b..8f80490eb8 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -545,6 +545,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
                             html += "<span class=\"label-text\">" + field.label + "</span>";
                         }
                         html += (field.awPopOver && !field.awPopOverRight) ? Attr(field, 'awPopOver', fld) : "";
+                        html += (field.hintText) ? " <span class=\"label-hint-text\"><i class=\"fa fa-info-circle\"></i> Hint: " + field.hintText + "</span>" : "";
                         html += "</label>\n";
                     }
                     return html;