Merge tag 'release_2012-03-25'

Django 1.4 upgrade and a bunch of other stuff

2 files changed, 13 insertions, 0 deletions

diff --git a/retro/templatetags/__init__.py b/retro/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/retro/templatetags/__init__.py
diff --git a/retro/templatetags/retro.py b/retro/templatetags/retro.py
new file mode 100644
index 00000000..c7fd9f00
--- /dev/null
+++ b/retro/templatetags/retro.py
@@ -0,0 +1,13 @@
+from django import template
+from django.contrib.staticfiles.storage import staticfiles_storage
+
+register = template.Library()
+
+
+@register.simple_tag
+def retro_static(year, path):
+    """Like the built-in {% static %} tag but with a little extra magic."""
+    full_path = "%s/%s" % (year, path)
+    return staticfiles_storage.url(full_path)
+
+# vim: set ts=4 sw=4 et: