Added bootstrap_messages template tag (fix dyve#57) and improved handling of bootstrap javascript loading

Author: dyve

bootstrap_toolkit/templatetags/bootstrap_toolkit.py

@@ -44,22 +44,26 @@ def bootstrap_stylesheet_tag():
     return u'<link rel="stylesheet" href="%s">' % bootstrap_stylesheet_url()
 
 @register.simple_tag
-def bootstrap_javascript_url(name):
+def bootstrap_javascript_url(name=None):
     """
     URL to Bootstrap javascript file
     """
     if BOOTSTRAP_JS_URL:
         return BOOTSTRAP_JS_URL
-    return BOOTSTRAP_JS_BASE_URL + 'bootstrap-' + name + '.js'
-
+    if name:
+        return BOOTSTRAP_JS_BASE_URL + 'bootstrap-' + name + '.js'
+    else:
+        return BOOTSTRAP_JS_BASE_URL + 'bootstrap.min.js'
 
 @register.simple_tag
-def bootstrap_javascript_tag(name):
+def bootstrap_javascript_tag(name=None):
     """
     HTML tag to insert bootstrap_toolkit javascript file
     """
-
-    return u'<script src="%s"></script>' % bootstrap_javascript_url(name)
+    url = bootstrap_javascript_url(name)
+    if url:
+        return u'<script src="%s"></script>' % url
+    return u''
 
 @register.filter
 def as_bootstrap(form_or_field, layout='vertical,false'):
@@ -203,3 +207,7 @@ def split(str, splitter):
     Split a string
     """
     return str.split(splitter)
+
+@register.simple_tag(takes_context=True)
+def bootstrap_messages(context, *args, **kwargs):
+    return get_template("bootstrap_toolkit/messages.html").render(context)

demo_project/demo_app/templates/base.html

@@ -16,8 +16,7 @@
     <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
-    {% bootstrap_javascript_tag "dropdown" %}
-    {% bootstrap_javascript_tag "alert" %}
+    {% bootstrap_javascript_tag %}
     {% block extra_head %}{% endblock %}
 </head>
 
@@ -50,7 +49,7 @@
 
 <div class="container">
 
-    {% include "bootstrap_toolkit/messages.html" %}
+    {% bootstrap_messages %}
 
     {% block content %}Empty page{% endblock %}
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='django-bootstrap-toolkit',
-    version='2.6.24',
+    version='2.7.0',
     url='https://github.com/dyve/django-bootstrap-toolkit',
     author='Dylan Verheul',
     author_email='[email protected]',