Merge pull request getsentry#809 from eternicode/django-1.5-url-tag

Django 1.5 compatibility: url tag
efinal · Feb 28, 2013 · 0ded17f · 0ded17f
2 parents 72b353b + b9b787e
commit 0ded17f
Show file tree

Hide file tree

Showing 81 changed files with 328 additions and 247 deletions.
diff --git a/example/templates/layout.html b/example/templates/layout.html
@@ -1,3 +1,4 @@
+{% load url from future %}
 {% load i18n %}
 {% load sentry_helpers %}
 
@@ -6,7 +7,7 @@
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8">
         <meta name="robots" content="NONE,NOARCHIVE">
-        <link href="{% url sentry-media "sentry" "styles/global.min.css" %}" rel="stylesheet" type="text/css"/>
+        <link href="{% url 'sentry-media' "sentry" "styles/global.min.css" %}" rel="stylesheet" type="text/css"/>
         <title>{% block title %}Sentry{% endblock %}</title>
         {% block meta %}
         {% endblock %}

diff --git a/src/sentry/templates/sentry/404.html b/src/sentry/templates/sentry/404.html
@@ -1,5 +1,6 @@
 {% extends "sentry/layout.html" %}
 
+{% load url from future %}
 {% load i18n %}
 
 {% block title %}{% trans "Page Not Found" %} | {{ block.super }}{% endblock %}
@@ -13,6 +14,6 @@
             <h2>{% trans "Page Not Found" %}</h2>
         </div>
         <p class="alert-message notice">{% trans "The page you are looking for was not found." %}</p>
-        <p><a href="{% url sentry %}">{% trans "Return to the dashboard" %}</a></p>
+        <p><a href="{% url 'sentry' %}">{% trans "Return to the dashboard" %}</a></p>
     </section>
 {% endblock %}
diff --git a/src/sentry/templates/sentry/account/appearance.html b/src/sentry/templates/sentry/account/appearance.html
@@ -1,5 +1,6 @@
 {% extends "sentry/account/base.html" %}
 
+{% load url from future %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load sentry_helpers %}
@@ -9,7 +10,7 @@
 {% block breadcrumb %}
     {{ block.super }}
     <li class="divider"></li>
-    <li><a href="{% url sentry-account-settings %}">{% trans "Account" %}</a></li>
+    <li><a href="{% url 'sentry-account-settings' %}">{% trans "Account" %}</a></li>
 {% endblock %}
 
 {% block heading %}

diff --git a/src/sentry/templates/sentry/account/base.html b/src/sentry/templates/sentry/account/base.html
@@ -1,13 +1,14 @@
 {% extends "sentry/layout.html" %}
 
+{% load url from future %}
 {% load i18n %}
 {% load sentry_helpers %}
 
 {% block title %}{% trans "Settings" %} | {{ block.super }}{% endblock %}
 
 {% block page_header %}
     <ul class="breadcrumb">
-        <li><a href="{% url sentry %}" class="dashboard-btn" title="{% trans "Dashboard" %}"><i aria-hidden="true" class="icon-list"></i></a></li>
+        <li><a href="{% url 'sentry' %}" class="dashboard-btn" title="{% trans "Dashboard" %}"><i aria-hidden="true" class="icon-list"></i></a></li>
         <li class="divider"></li>
         <li><a href="#">{% trans "Settings" %}</a></li>
         {% block breadcrumb %}{% endblock %}
@@ -34,9 +35,9 @@
 {% block sidebar %}
     <ul class="nav nav-list">
         <li class="nav-header">{% trans "Settings" %}</li>
-        <li{% if page == 'settings' %} class="active"{% endif %}><a href="{% url sentry-account-settings %}">{% trans "Account" %}</a></li>
-        <li{% if page == 'appearance' %} class="active"{% endif %}><a href="{% url sentry-account-settings-appearance %}">{% trans "Appearance" %}</a></li>
-        <li{% if page == 'notifications' %} class="active"{% endif %}><a href="{% url sentry-account-settings-notifications %}">{% trans "Notifications" %}</a></li>
-        <li{% if page == 'identities' %} class="active"{% endif %}><a href="{% url sentry-account-settings-identities %}">{% trans "Identities" %}</a></li>
+        <li{% if page == 'settings' %} class="active"{% endif %}><a href="{% url 'sentry-account-settings' %}">{% trans "Account" %}</a></li>
+        <li{% if page == 'appearance' %} class="active"{% endif %}><a href="{% url 'sentry-account-settings-appearance' %}">{% trans "Appearance" %}</a></li>
+        <li{% if page == 'notifications' %} class="active"{% endif %}><a href="{% url 'sentry-account-settings-notifications' %}">{% trans "Notifications" %}</a></li>
+        <li{% if page == 'identities' %} class="active"{% endif %}><a href="{% url 'sentry-account-settings-identities' %}">{% trans "Identities" %}</a></li>
     </ul>
 {% endblock %}
diff --git a/src/sentry/templates/sentry/account/identities.html b/src/sentry/templates/sentry/account/identities.html
@@ -1,5 +1,6 @@
 {% extends "sentry/account/base.html" %}
 
+{% load url from future %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load sentry_helpers %}
@@ -9,7 +10,7 @@
 {% block breadcrumb %}
     {{ block.super }}
     <li class="divider"></li>
-    <li><a href="{% url sentry-account-settings-identities %}">{% trans "Identities" %}</a></li>
+    <li><a href="{% url 'sentry-account-settings-identities' %}">{% trans "Identities" %}</a></li>
 {% endblock %}
 
 {% block heading %}
@@ -35,7 +36,7 @@
                     <tr>
                         <td>{{ identity.provider|title }}</td>
                         <td style="text-align: center;">
-                            <a href="{% url socialauth_disconnect_individual identity.provider identity.id %}?next={% filter urlencode %}{% absolute_uri %}{% endfilter %}">Disconnect</a>
+                            <a href="{% url 'socialauth_disconnect_individual' identity.provider identity.id %}?next={% filter urlencode %}{% absolute_uri %}{% endfilter %}">Disconnect</a>
                         </td>
                     </tr>
                 {% endfor %}
@@ -48,7 +49,7 @@
         </fieldset>
         <ul class="auth-options">
             {% for engine in AUTH_PROVIDERS %}
-                <li><a href="{% url socialauth_associate_begin engine %}?next={% filter urlencode %}{% absolute_uri %}{% endfilter %}" class="auth-{{ engine }}">Identify with {{ engine|title }}</a></li>
+                <li><a href="{% url 'socialauth_associate_begin' engine %}?next={% filter urlencode %}{% absolute_uri %}{% endfilter %}" class="auth-{{ engine }}">Identify with {{ engine|title }}</a></li>
             {% endfor %}
         </ul>
     {% endif %}

diff --git a/src/sentry/templates/sentry/account/notifications.html b/src/sentry/templates/sentry/account/notifications.html
@@ -1,5 +1,6 @@
 {% extends "sentry/account/base.html" %}
 
+{% load url from future %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load sentry_helpers %}
@@ -9,7 +10,7 @@
 {% block breadcrumb %}
     {{ block.super }}
     <li class="divider"></li>
-    <li><a href="{% url sentry-account-settings-notifications %}">{% trans "Notifications" %}</a></li>
+    <li><a href="{% url 'sentry-account-settings-notifications' %}">{% trans "Notifications" %}</a></li>
 {% endblock %}
 
 {% block heading %}

diff --git a/src/sentry/templates/sentry/account/recover/failure.html b/src/sentry/templates/sentry/account/recover/failure.html
@@ -1,5 +1,6 @@
 {% extends "sentry/layout.html" %}
 
+{% load url from future %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 
@@ -13,7 +14,7 @@
         <div class="page-header">
             <h2>{% trans "Recover Account" %}</h2>
         </div>
-        {% url sentry-recover-account as link %}
+        {% url 'sentry-recover-account' as link %}
         <p>{% blocktrans %}We were unable to confirm your identity. Either the link you followed is invalid, or it has expired. You can always <a href="{{ link }}">try again</a>.{% endblocktrans %}</p>
     </section>
-{% endblock %}
+{% endblock %}
diff --git a/src/sentry/templates/sentry/account/settings.html b/src/sentry/templates/sentry/account/settings.html
@@ -1,5 +1,6 @@
 {% extends "sentry/account/base.html" %}
 
+{% load url from future %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load sentry_helpers %}
@@ -9,7 +10,7 @@
 {% block breadcrumb %}
     {{ block.super }}
     <li class="divider"></li>
-    <li><a href="{% url sentry-account-settings %}">{% trans "Account" %}</a></li>
+    <li><a href="{% url 'sentry-account-settings' %}">{% trans "Account" %}</a></li>
 {% endblock %}
 
 {% block heading %}

diff --git a/src/sentry/templates/sentry/admin/base.html b/src/sentry/templates/sentry/admin/base.html
@@ -1,5 +1,6 @@
 {% extends "sentry/layout.html" %}
 
+{% load url from future %}
 {% load i18n %}
 
 {% block title %}{% trans "Admin" %} | {{ block.super }}{% endblock %}
@@ -14,8 +15,8 @@
 {% block sidebar %}
     <h6>{% trans "Overview" %}</h6>
     <ul class="nav nav-tabs nav-stacked">
-        <li{% block admin-nav-projects %}{% endblock %}><a href="{% url sentry-admin-projects %}">{% trans "Projects" %}</a></li>
-        <li{% block admin-nav-users %}{% endblock %}><a href="{% url sentry-admin-users %}">{% trans "Users" %}</a></li>
+        <li{% block admin-nav-projects %}{% endblock %}><a href="{% url 'sentry-admin-projects' %}">{% trans "Projects" %}</a></li>
+        <li{% block admin-nav-users %}{% endblock %}><a href="{% url 'sentry-admin-users' %}">{% trans "Users" %}</a></li>
     </ul>
 
     {% with PLUGINS.for_site as plugins %}
@@ -24,7 +25,7 @@ <h6>{% trans "Plugins" %}</h6>
             <ul class="nav nav-tabs nav-stacked">
                 {% for p in PLUGINS.for_site %}
                     <li{% if plugin and plugin.slug == p.slug %} class="active"{% endif %}>
-                        <a href="{% url sentry-admin-configure-plugin p.slug %}">{{ p.get_conf_title }}</a>
+                        <a href="{% url 'sentry-admin-configure-plugin' p.slug %}">{{ p.get_conf_title }}</a>
                     </li>
                 {% endfor %}
             </ul>
@@ -33,13 +34,13 @@ <h6>{% trans "Plugins" %}</h6>
 
     <h6>{% trans "Server Status" %}</h6>
     <ul class="nav nav-tabs nav-stacked">
-        <li{% block admin-nav-status %}{% endblock %}><a href="{% url sentry-admin-status %}">{% trans "Environment" %}</a></li>
-        <li{% block admin-nav-packages %}{% endblock %}><a href="{% url sentry-admin-packages-status %}">{% trans "Packages" %}</a></li>
-        <li{% block admin-nav-mail %}{% endblock %}><a href="{% url sentry-admin-mail-status %}">{% trans "Mail" %}</a></li>
+        <li{% block admin-nav-status %}{% endblock %}><a href="{% url 'sentry-admin-status' %}">{% trans "Environment" %}</a></li>
+        <li{% block admin-nav-packages %}{% endblock %}><a href="{% url 'sentry-admin-packages-status' %}">{% trans "Packages" %}</a></li>
+        <li{% block admin-nav-mail %}{% endblock %}><a href="{% url 'sentry-admin-mail-status' %}">{% trans "Mail" %}</a></li>
     </ul>
     <h6>{% trans "Statistics" %}</h6>
     <ul class="nav nav-tabs nav-stacked">
-        <li{% block admin-nav-stats %}{% endblock %}><a href="{% url sentry-admin-stats %}">{% trans "Overview" %}</a></li>
+        <li{% block admin-nav-stats %}{% endblock %}><a href="{% url 'sentry-admin-stats' %}">{% trans "Overview" %}</a></li>
     </ul>
 {% endblock %}
 

diff --git a/src/sentry/templates/sentry/admin/plugins/configure.html b/src/sentry/templates/sentry/admin/plugins/configure.html
@@ -1,13 +1,14 @@
 {% extends "sentry/admin/base.html" %}
 
+{% load url from future %}
 {% load i18n %}
 {% load sentry_helpers %}
 
 {% block title %}Configure {{ title }} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
     <li class="divider"></li>
-    <li><a href="{% url sentry-admin-configure-plugin plugin.slug %}">Configure {{ title }}</a></li>
+    <li><a href="{% url 'sentry-admin-configure-plugin' plugin.slug %}">Configure {{ title }}</a></li>
 {% endblock %}
 
 {% block inner %}

diff --git a/src/sentry/templates/sentry/admin/projects/list.html b/src/sentry/templates/sentry/admin/projects/list.html
@@ -1,5 +1,6 @@
 {% extends "sentry/admin/base.html" %}
 
+{% load url from future %}
 {% load i18n %}
 {% load sentry_helpers %}
 {% load sentry_admin_helpers %}
@@ -10,7 +11,7 @@
 
 {% block breadcrumb %}
     <li class="divider"></li>
-    <li><a href="{% url sentry-admin-projects %}">{% trans "Projects" %}</a></li>
+    <li><a href="{% url 'sentry-admin-projects' %}">{% trans "Projects" %}</a></li>
 {% endblock %}
 
 {% block main %}
@@ -50,9 +51,9 @@
                     {% for project, avg_events in project_list.paginator.objects|with_event_counts %}
                         <tr>
                             <td>
-                                <strong>{{ project.name }}</strong> <a href="{% url sentry-stream project.team.slug project.slug %}">[view]</a><br/>
+                                <strong>{{ project.name }}</strong> <a href="{% url 'sentry-stream' project.team.slug project.slug %}">[view]</a><br/>
                                 {% if project.owner %}
-                                    <small>Owned by <a href="{% url sentry-admin-edit-user project.owner.pk %}">
+                                    <small>Owned by <a href="{% url 'sentry-admin-edit-user' project.owner.pk %}">
                                         {% if project.owner.email %}
                                             {{ project.owner.email }}
                                         {% else %}

diff --git a/src/sentry/templates/sentry/admin/stats.html b/src/sentry/templates/sentry/admin/stats.html
@@ -2,14 +2,15 @@
 
 {% block admin-nav-stats %} class="active"{% endblock %}
 
+{% load url from future %}
 {% load i18n %}
 {% load sentry_helpers %}
 
 {% block title %}{% trans "Stats" %} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
     <li class="divider"></li>
-    <li><a href="{% url sentry-admin-stats %}">{% trans "Stats" %}</a></li>
+    <li><a href="{% url 'sentry-admin-stats' %}">{% trans "Stats" %}</a></li>
 {% endblock %}
 
 {% block inner %}

diff --git a/src/sentry/templates/sentry/admin/status/env.html b/src/sentry/templates/sentry/admin/status/env.html
@@ -2,14 +2,15 @@
 
 {% block admin-nav-status %} class="active"{% endblock %}
 
+{% load url from future %}
 {% load i18n %}
 {% load sentry_helpers %}
 
 {% block title %}{% trans "Server Status" %} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
     <li class="divider"></li>
-    <li><a href="{% url sentry-admin-status %}">{% trans "Server Status" %}</a></li>
+    <li><a href="{% url 'sentry-admin-status' %}">{% trans "Server Status" %}</a></li>
 {% endblock %}
 
 {% block inner %}

diff --git a/src/sentry/templates/sentry/admin/status/mail.html b/src/sentry/templates/sentry/admin/status/mail.html
@@ -2,6 +2,7 @@
 
 {% block admin-nav-queue %} class="active"{% endblock %}
 
+{% load url from future %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load sentry_helpers %}
@@ -10,7 +11,7 @@
 
 {% block breadcrumb %}
     <li class="divider"></li>
-    <li><a href="{% url sentry-admin-mail-status %}">{% trans "Mail Configuration" %}</a></li>
+    <li><a href="{% url 'sentry-admin-mail-status' %}">{% trans "Mail Configuration" %}</a></li>
 {% endblock %}
 
 {% block inner %}

diff --git a/src/sentry/templates/sentry/admin/status/packages.html b/src/sentry/templates/sentry/admin/status/packages.html
@@ -2,14 +2,15 @@
 
 {% block admin-nav-packages %} class="active"{% endblock %}
 
+{% load url from future %}
 {% load i18n %}
 {% load sentry_helpers %}
 
 {% block title %}{% trans "Packages" %} | {{ block.super }}{% endblock %}
 
 {% block breadcrumb %}
     <li class="divider"></li>
-    <li><a href="{% url sentry-admin-packages-status %}">{% trans "Packages" %}</a></li>
+    <li><a href="{% url 'sentry-admin-packages-status' %}">{% trans "Packages" %}</a></li>
 {% endblock %}
 
 {% block inner %}

diff --git a/src/sentry/templates/sentry/admin/users/edit.html b/src/sentry/templates/sentry/admin/users/edit.html
@@ -1,5 +1,6 @@
 {% extends "sentry/admin/users/list.html" %}
 
+{% load url from future %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load sentry_admin_helpers %}
@@ -10,7 +11,7 @@
 {% block breadcrumb %}
     {{ block.super }}
     <li class="divider"></li>
-    <li><a href="{% url sentry-admin-edit-user the_user.pk %}">{{ the_user.username }}</a></li>
+    <li><a href="{% url 'sentry-admin-edit-user' the_user.pk %}">{{ the_user.username }}</a></li>
 {% endblock %}
 
 {% block main %}
@@ -24,7 +25,7 @@
             <fieldset class="form-actions">
                 <button type="submit" class="btn btn-primary">{% trans "Save Changes" %}</button>
                 {% if the_user.id != request.user.id %}
-                    <a href="{% url sentry-admin-remove-user the_user.pk %}" class="btn btn-danger">{% trans "Remove User" %}</a>
+                    <a href="{% url 'sentry-admin-remove-user' the_user.pk %}" class="btn btn-danger">{% trans "Remove User" %}</a>
                 {% else %}
                     <a href="#" class="btn disabled btn-danger">{% trans "Cannot remove yourself" %}</a>
                 {% endif %}
@@ -49,7 +50,7 @@ <h3>{% trans "Projects" %}</h3>
                     {% for project, avg_events in project_list|with_event_counts %}
                         <tr>
                             <td>
-                                {{ project.name }} <a href="{% url sentry-stream project.team.slug project.slug %}">[view]</a>
+                                {{ project.name }} <a href="{% url 'sentry-stream' project.team.slug project.slug %}">[view]</a>
                                 </a>
                             </td>
                             <td style="text-align:center; vertical-align:middle;">

diff --git a/src/sentry/templates/sentry/admin/users/list.html b/src/sentry/templates/sentry/admin/users/list.html
@@ -1,5 +1,6 @@
 {% extends "sentry/admin/base.html" %}
 
+{% load url from future %}
 {% load i18n %}
 {% load sentry_helpers %}
 
@@ -9,11 +10,11 @@
 
 {% block breadcrumb %}
     <li class="divider"></li>
-    <li><a href="{% url sentry-admin-users %}">{% trans "Users" %}</a></li>
+    <li><a href="{% url 'sentry-admin-users' %}">{% trans "Users" %}</a></li>
 {% endblock %}
 
 {% block page_header %}
-    <a href="{% url sentry-admin-new-user %}" class="btn pull-right btn-primary">{% trans "Create a new user" %}</a>
+    <a href="{% url 'sentry-admin-new-user' %}" class="btn pull-right btn-primary">{% trans "Create a new user" %}</a>
     {{ block.super }}
 {% endblock %}
 
@@ -48,7 +49,7 @@
                 {% for user in user_list.paginator.objects %}
                     <tr>
                         <td>
-                            <a href="{% url sentry-admin-edit-user user.pk %}">
+                            <a href="{% url 'sentry-admin-edit-user' user.pk %}">
                                 {{ user.username }}
                             </a>
                             {% if not user.is_active %}