Fixes #149 Moved bootstrap.min.js to the <head> to support bootstrap …

…plugins included by Admin class media js
darklow · Sep 17, 2013 · f633803 · f633803
1 parent dfe7dc3
commit f633803
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,7 @@ v0.2.5 (Upcoming)
 
 * [Feature] JS: `#147 <https://github.com/darklow/django-suit/pull/147>`_ Avoiding double submit by disabling submit buttons on change form submit [Thanks to @adamJLev]
 * [Fix] Fixes `#150 <https://github.com/darklow/django-suit/issues/150>`_ Incorrect menu is marked as active when multiple apps have models with same name
+* [Fix] Fixes `#149 <https://github.com/darklow/django-suit/issues/149>`_ Moved bootstrap.min.js to the <head> to support bootstrap plugins by media js
 * See `commit log <https://github.com/darklow/django-suit/commits/develop>`_ and `closed issues <https://github.com/darklow/django-suit/issues?direction=desc&sort=updated&state=closed>`_ for full changes
 
 

diff --git a/suit/templates/admin/base.html b/suit/templates/admin/base.html
@@ -10,6 +10,7 @@
   <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";</script>
   <script src="{% static 'suit/js/jquery-1.8.3.min.js' %}"></script>
   <script type="text/javascript">var Suit = { $: $.noConflict() }; if (!$) $ = Suit.$; </script>
+  <script src="{% static 'suit/bootstrap/js/bootstrap.min.js' %}"></script>
   {% if 'SHOW_REQUIRED_ASTERISK'|suit_conf %}
   <style type="text/css">.required:after { content: '*'; margin: 0 0 0 5px; position: absolute; color: #ccc;}</style>
   {% endif %}
@@ -203,7 +204,6 @@ <h2 class="content-title">{{ title }}</h2>
   {% endif %}
 {% endblock %}
 
-  <script src="{% static 'suit/bootstrap/js/bootstrap.min.js' %}"></script>
   <script src="{% static 'suit/js/suit.js' %}"></script>
   {% block extrajs %}{% endblock %}