From fee8b5a0d38ed8311f64f2dc060400793b71f3d1 Mon Sep 17 00:00:00 2001
From: Diana Whitten <hurgleburgler@gmail.com>
Date: Thu, 10 Mar 2016 13:57:52 -0700
Subject: [PATCH] Form Fields Required Visual treatment is missing

Form fields that are required need to have an asterisk.

Change-Id: I6325574548170ea3b806f433b3fd439ec985d937
Closes-bug: #1548507
---
 horizon/templates/horizon/common/_form_field.html       | 4 ++--
 horizon/templates/horizon/common/_horizontal_field.html | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/horizon/templates/horizon/common/_form_field.html b/horizon/templates/horizon/common/_form_field.html
index d99c9f8233..c3d247ec3f 100644
--- a/horizon/templates/horizon/common/_form_field.html
+++ b/horizon/templates/horizon/common/_form_field.html
@@ -8,8 +8,8 @@
   {% elif field|is_radio %}
     {% if field.auto_id %}
       <label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}">{{ field.label }}</label>
+      {% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
       {% if field.help_text %}
-        {% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
         <span class="help-icon" data-toggle="tooltip" data-placement="top" title="{{ field.help_text|safe }}"><span class="fa fa-question-circle"></span></span>
       {% endif %}
     {% endif %}
@@ -31,8 +31,8 @@
   {% else %}
     {% if field.auto_id %}
       <label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">{{ field.label }}</label>
+      {% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
       {% if field.help_text %}
-        {% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
         <span class="help-icon" data-toggle="tooltip" data-placement="top" title="{{ field.help_text|safe }}"><span class="fa fa-question-circle"></span></span>
       {% endif %}
     {% endif %}
diff --git a/horizon/templates/horizon/common/_horizontal_field.html b/horizon/templates/horizon/common/_horizontal_field.html
index 798ac5cfa0..219224ae61 100644
--- a/horizon/templates/horizon/common/_horizontal_field.html
+++ b/horizon/templates/horizon/common/_horizontal_field.html
@@ -1,7 +1,9 @@
 {% load form_helpers %}
 
 <div class="form-group{% if field.errors %} has-error{% endif %} {{ field.css_classes }}">
-  <label class="control-label col-sm-3 {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.id_for_label }}">{{ field.label }}</label>
+  <label class="control-label col-sm-3" for="{{ field.id_for_label }}">{{ field.label }}
+    {% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
+  </label>
   <div class="col-sm-9 {{ classes.value }} {{ field|wrapper_classes }}">
     {% if field|is_checkbox %}
       {% with is_vertical=1 %}