Ticket #4105: simple_media_tag.patch

django/template/defaulttags.py

@@ -771 +771 @@
     return LoadNode()
 load = register.tag(load)
 
+#@register.simple_tag
+def media(path=''):
+    """
+    Returns an absolute URL pointing to the given media URL.
+
+    The optional first argument is the path to the file starting from
+    ``settings.MEDIA_URL``.
+
+    For example, if your ``MEDIA_URL`` is ``'http://media.example.com'``
+    then in your template you can get the URL for ``css/mystyle.css``
+    like this:
+
+        {% media 'css/mystyle.css' %}
+
+    The URL returned would be ``http://media.example.com/css/style.css``.
+
+    If no argument is given, the tag will just output the ``MEDIA_URL``
+    (appending a trailing slash if it does not end in one). For example,
+    ``{% media %}`` would return ``http://media.example.com/``.
+    """
+    import urlparse
+    url = settings.MEDIA_URL or ''
+    if path:
+        return urlparse.join(url, path)
+    elif not url.endswith('/'):
+        return '%s/' % url
+    return url
+media = register.simple_tag(media)
+
 #@register.tag
 def now(parser, token):
     """

docs/templates.txt

@@ -625 +625 @@
 
 See `Custom tag and filter libraries`_ for more information.
 
+media
+~~~~~
+
+Return an absolute URL pointing to the given media URL.
+
+The optional first argument is the path to the file starting from `MEDIA_URL`_
+in your Django settings.
+
+.. _MEDIA_URL: ../settings/#media-url
+
+For example, if your ``MEDIA_URL`` is ``'http://media.example.com'`` then in
+your template you can get the URL for ``css/mystyle.css`` like this::
+
+    {% media 'css/mystyle.css' %}
+
+The URL returned would be ``http://media.example.com/css/style.css``.
+
+If no argument is given, the tag will just output the ``MEDIA_URL`` (appending
+a trailing slash if it does not end in one). For example, ``{% media %}`` would
+return ``http://media.example.com/``.
+
 now
 ~~~