3 files changed, 35 insertions, 2 deletions
diff --git a/ishtar_common/templates/blocks/bs_field_snippet.html b/ishtar_common/templates/blocks/bs_field_snippet.html
new file mode 100644
index 000000000..bf341db8e
--- /dev/null
+++ b/ishtar_common/templates/blocks/bs_field_snippet.html
@@ -0,0 +1,26 @@
+{% load i18n %}
+    <div class="form-group col-lg-6">
+        {{ field.label_tag }}
+        {% if field.help_text %}
+        <div class="input-group">
+        {% endif %}
+        {{field|safe}}
+        {% if field.help_text %}
+          <span class="input-group-append">
+            <a class="input-group-text" data-toggle="collapse"
+               href="#{{field.auto_id}}_help"
+               aria-expanded="false" aria-controls="{{field.auto_id}}_help">
+               <i class="fa fa-question-circle" aria-hidden="true"></i>
+            </a>
+          </span>
+        </div>
+        <div class="collapse" id="{{field.auto_id}}_help">
+            <div class="card card-body">
+                {{field.help_text}}
+            </div>
+        </div>
+        {% endif %}
+        {% if field.errors %}<div class="invalid-feedback">
+          {{ field.errors }}
+        </div>{% endif %}
+    </div>
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index eb52fa653..a9042ff67 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -7,8 +7,8 @@
 
 {% for hidden in form.hidden_fields %}
 {{hidden}}
-{% if field.errors %}<div class="invalid-feedback">
-    {{ field.errors }}
+{% if hidden.errors %}<div class="invalid-feedback">
+    {{ hidden.errors }}
 </div>{% endif %}
 {% endfor %}
 
diff --git a/ishtar_common/templatetags/table_form.py b/ishtar_common/templatetags/table_form.py
index ad99516a5..0ebd8443e 100644
--- a/ishtar_common/templatetags/table_form.py
+++ b/ishtar_common/templatetags/table_form.py
@@ -17,6 +17,13 @@ def table_form(form):
     return {'form': form}
 
 
+@register.inclusion_tag('blocks/bs_field_snippet.html')
+def bs_field(field, required=False, label=None):
+    if label:
+        label = _(label)
+    return {'field': field, 'required': required, 'label': label}
+
+
 @register.inclusion_tag('blocks/table_field.html')
 def table_field(field, required=False, label=None):
     if label: