Move popover trigger to base.html

Author: patriknordlen

dojo/templates/base.html

@@ -369,6 +369,12 @@
 <script src="{% static "jquery-cookie/jquery.cookie.js" %}"></script>
 <!-- our JS -->
 <script src="{% static "dojo/js/index.js" %}"></script>
+<script type="application/javascript">
+    $(document).ready(function() {
+        $('.has-popover').popover({'trigger':'hover'});
+    });
+</script>
+
 {% block postscript %}
 {% endblock %}
 </body>

dojo/templates/dojo/form_fields.html

@@ -20,14 +20,14 @@
                             {{ field }} <span>{{ field.label }}{% if field.field.required%}<sup>*</sup>{% endif %}</span>
                         </label>
                     {% endif %}
+                    {% if field.help_text %}
+                        <i class="fa fa-question-circle has-popover" data-trigger="hover" data-content="{{ field.help_text }}" data-placement="right" data-container="body">
+                        </i>
+                    {% endif %}
                     {% for error in field.errors %}
                         <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
                     {% endfor %}
 
-                {% if field.help_text %}
-                    <i class="fa fa-question-circle has-popover" data-trigger="hover" data-content="{{ field.help_text|safe }}" data-placement="right" data-container="body">
-                    </i>
-                {% endif %}
                 </div>
             </div>
         {% elif field|is_radio %}
@@ -50,15 +50,20 @@
                 {% endfor %}
 
                 {% if field.help_text %}
-                    <i class="fa fa-question-circle has-popover" data-trigger="hover" data-content="{{ field.help_text|safe }}" data-placement="right" data-container="body">
+                    <i class="fa fa-question-circle has-popover" data-trigger="hover" data-content="{{ field.help_text }}" data-placement="right" data-container="body">
                     </i>
                 {% endif %}
             </div>
         {% else %}
             {% if field.auto_id %}
                 <label class="col-sm-2 control-label
                         {% if field.field.required %}{{ form.required_css_class }}{% endif %}"
-                       for="{{ field.auto_id }}">{{ field.label }}{% if field.field.required%}<sup>*</sup>{% endif %}</label>
+                       for="{{ field.auto_id }}">{{ field.label }}{% if field.field.required%}<sup>*</sup>{% endif %}
+                        {% if field.help_text %}
+                            <i class="fa fa-question-circle has-popover" data-trigger="hover" data-content="{{ field.help_text }}" data-placement="right" data-container="body">
+                            </i>
+                        {% endif %}
+                </label>
             {% endif %}
 
             <div class="col-sm-10 {{ classes.value }} {% if field|is_multiple_checkbox %}multiple-checkbox{% endif %}">
@@ -67,11 +72,6 @@
                 {% for error in field.errors %}
                     <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
                 {% endfor %}
-
-                {% if field.help_text %}
-                    <i class="fa fa-question-circle has-popover" data-trigger="hover" data-content="{{ field.help_text|safe }}" data-placement="right" data-container="body">
-                    </i>
-                {% endif %}
             </div>
         {% endif %}
     </div>

dojo/templates/dojo/system_settings.html

@@ -20,10 +20,3 @@ <h3> System Settings </h3>
         </div>
     </form>
 {% endblock %}
-{% block postscript %}
-    <script type="application/javascript">
-        $(document).ready(function() {
-            $('.has-popover').popover({'trigger':'hover'});
-        });
-    </script>
-{% endblock %}