Merge pull request #153 from philippbosch/1.9-compatibility

Django 1.9 compatibility

Author: selwin

django_rq/templates/django_rq/clear_queue.html

@@ -1,5 +1,7 @@
 {% extends "admin/base_site.html" %}
 
+{% load admin_static %}
+
 {% block extrastyle %}
     {{ block.super }}
     <style>
@@ -9,7 +11,7 @@
             width: 80%;
         }
     </style>
-    <link href="{{ STATIC_URL }}admin/css/forms.css" type="text/css" rel="stylesheet">
+    <link href="{% static 'admin/css/forms.css' %}" type="text/css" rel="stylesheet">
 {% endblock %}
 
 {% block breadcrumbs %}

django_rq/templates/django_rq/confirm_action.html

@@ -1,5 +1,7 @@
 {% extends "admin/base_site.html" %}
 
+{% load admin_static %}
+
 {% block extrastyle %}
     {{ block.super }}
     <style>
@@ -9,7 +11,7 @@
             width: 80%;
         }
     </style>
-    <link href="{{ STATIC_URL }}admin/css/forms.css" type="text/css" rel="stylesheet">
+    <link href="{% static 'admin/css/forms.css' %}" type="text/css" rel="stylesheet">
 {% endblock %}
 
 {% block breadcrumbs %}

django_rq/templates/django_rq/delete_job.html

@@ -1,5 +1,7 @@
 {% extends "admin/base_site.html" %}
 
+{% load admin_static %}
+
 {% block extrastyle %}
     {{ block.super }}
     <style>
@@ -9,7 +11,7 @@
             width: 80%;
         }
     </style>
-    <link href="{{ STATIC_URL }}admin/css/forms.css" type="text/css" rel="stylesheet">
+    <link href="{% static 'admin/css/forms.css' %}" type="text/css" rel="stylesheet">
 {% endblock %}
 
 {% block breadcrumbs %}

django_rq/templates/django_rq/job_detail.html

@@ -1,5 +1,7 @@
 {% extends "admin/base_site.html" %}
 
+{% load admin_static %}
+
 {% block extrastyle %}
     {{ block.super }}
     <style>
@@ -11,7 +13,7 @@
             padding-top: 3px;
         }
     </style>
-    <link href="{{ STATIC_URL }}admin/css/forms.css" type="text/css" rel="stylesheet">
+    <link href="{% static 'admin/css/forms.css' %}" type="text/css" rel="stylesheet">
 {% endblock %}
 
 {% block breadcrumbs %}

django_rq/templates/django_rq/jobs.html

@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 
-{% load admin_static %}
+{% load admin_static jquery_path %}
 
 {% block extrastyle %}
     {{ block.super }}
@@ -9,7 +9,7 @@
 
 {% block extrahead %}
     {{ block.super }}
-    <script type="text/javascript" src="{% static "admin/js/jquery.js" %}"></script>
+    <script type="text/javascript" src="{% get_jquery_path as jquery_path %}{% static jquery_path %}"></script>
     <script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
     <script type="text/javascript" src="{% static "admin/js/actions.js" %}"></script>
     <script type="text/javascript">

django_rq/templatetags/__init__.py

@@ -0,0 +1,20 @@
+from distutils.version import LooseVersion
+from django import template
+from django.utils.version import get_version
+
+
+register = template.Library()
+
+if LooseVersion(get_version()) >= LooseVersion('1.9'):
+    JQUERY_PATH = 'admin/js/vendor/jquery/jquery.js'
+
+    # `assignment_tag` is deprecated as of 1.9, `simple_tag` should be used
+    tag_decorator = register.simple_tag
+else:
+    JQUERY_PATH = 'admin/js/jquery.js'
+    tag_decorator = register.assignment_tag
+
+
+@register.assignment_tag
+def get_jquery_path():
+    return JQUERY_PATH