Fix zostera#255 CSS link tag, plus tests

Author: dyve

HISTORY.rst

@@ -4,6 +4,12 @@ History
 -------
 
 
+6.0.0 (2015-04-21)
+++++++++++++++++++
+
+* No more media="screen" in CSS tags, complying to Bootstraps examples
+
+
 5.4.0 (2015-04-21)
 ++++++++++++++++++
 

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '5.4.0'
+__version__ = '6.0.0'

bootstrap3/tests.py

@@ -141,16 +141,18 @@ def test_settings(self):
         from .bootstrap import BOOTSTRAP3
         self.assertTrue(BOOTSTRAP3)
 
+    def test_bootstrap_javascript_tag(self):
+        res = render_template('{% bootstrap_javascript %}')
+        self.assertEqual(res.strip(), '<script src="//netdna.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>')
+
+    def test_bootstrap_css_tag(self):
+        res = render_template('{% bootstrap_css %}')
+        self.assertEqual(res.strip(), '<link href="//netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">')
+
     def test_settings_filter(self):
-        res = render_template(
-            '{% load bootstrap3 %}' +
-            '{{ "required_css_class"|bootstrap_setting }}')
+        res = render_template('{{ "required_css_class"|bootstrap_setting }}')
         self.assertEqual(res.strip(), 'bootstrap3-req')
-        res = render_template(
-            '{% load bootstrap3 %}' +
-            '{% if "javascript_in_head"|bootstrap_setting %}' +
-            'head{% else %}body{% endif %}'
-        )
+        res = render_template('{% if "javascript_in_head"|bootstrap_setting %}head{% else %}body{% endif %}')
         self.assertEqual(res.strip(), 'head')
 
     def test_required_class(self):

bootstrap3/utils.py

@@ -7,7 +7,6 @@
 from django.template import Variable, VariableDoesNotExist
 from django.template.base import FilterExpression, kwarg_re, TemplateSyntaxError
 
-
 from .text import text_value
 
 
@@ -97,14 +96,17 @@ def remove_css_class(css_classes, css_class):
     return ' '.join(classes_list)
 
 
-def render_link_tag(url, rel='stylesheet', media='all'):
+def render_link_tag(url, rel='stylesheet', media=None):
     """
     Build a link tag
     """
-    return render_tag(
-        'link',
-        attrs={'href': url, 'rel': rel, 'media': media},
-        close=False)
+    attrs = {
+        'href': url,
+        'rel': rel,
+    }
+    if media:
+        attrs['media'] = media
+    return render_tag('link', attrs=attrs, close=False)
 
 
 def render_tag(tag, attrs=None, content=None, close=True):