Merge ~ya-bo-ng/maas:improve-vanilla-help-text into maas:master

[Anthony Dillon]

Improve the Vanilla help text in settings

Add Vanilla help classes to the help text in settings forms.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b improve-vanilla-help-text lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5113/console
COMMIT: 3450fd6bc1f5c0fc81a64a10b4b3d1581a73664a

review: Needs Fixing

1b43e37... by Anthony Dillon on 2019-02-19

White space to kick off CI

b44d8d2... by Anthony Dillon on 2019-02-19

Update test

c385a3c... by Anthony Dillon on 2019-02-19

Remove fit

[Newell Jensen (newell-jensen)]

LGTM

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b improve-vanilla-help-text lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c385a3c0558a7698f50020dd88cf3f0331d92089

review: Approve

[Lilyana Videnova (lilyanavidenova)]

lgtm!

review: Approve

diff --git a/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js b/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js
index 1836c90..d760a12 100644
--- a/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js
+++ b/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js
@@ -195,8 +195,8 @@ describe("maasPowerParameters", function() {
                 var directive = compileDirective("powerTypes", "value");
                 var select = directive.find("select");
                 expect(select.attr("data-ng-model")).toBe("ngModel.type");
-                expect(select.attr("data-ng-options")).toBe(
-                    "type as type.description for type " +
+                expect(select.attr("data-ng-options")).toBe("type as " +
+                    "type.description for type " +
                     "in maasPowerParameters track by type.name");
                 expect(select.attr("data-ng-disabled")).toBe(
                     "ngDisabled || ngModel.in_pod");
diff --git a/src/maasserver/static/scss/_patterns_card.scss b/src/maasserver/static/scss/_patterns_card.scss
index 813f5cc..c977eba 100644
--- a/src/maasserver/static/scss/_patterns_card.scss
+++ b/src/maasserver/static/scss/_patterns_card.scss
@@ -20,4 +20,4 @@
       margin-top: - $sp-unit * 2;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/maasserver/templates/maasserver/form_field.html b/src/maasserver/templates/maasserver/form_field.html
index a50a5af..7497203 100644
--- a/src/maasserver/templates/maasserver/form_field.html
+++ b/src/maasserver/templates/maasserver/form_field.html
@@ -22,6 +22,6 @@
         <strong>Error:</strong> {{ field.errors }}
     </span>
     {% endif %}
-    <p>{% if field.help_text %}{{ field.help_text }}{% endif %}</p>
+    <p class="p-form-help-text">{% if field.help_text %}{{ field.help_text }}{% endif %}</p>
 </div>
 </li>
\ No newline at end of file