From 4c912da4aca6c953ac35a3cb5b40aeff0588ba77 Mon Sep 17 00:00:00 2001
From: Rebecca Lovewell <rebecca@caktusgroup.com>
Date: Wed, 15 Jan 2014 08:57:57 -0500
Subject: [PATCH] Use {% load url from future %} in reviews templates

Using https://github.com/futurecolors/django-future-url
---
 .../templates/reviews/_review_table.html      |  3 ++-
 symposion/templates/reviews/base.html         | 11 +++++----
 .../reviews/result_notification.html          | 13 +++++++----
 .../reviews/result_notification_prepare.html  |  7 ++++--
 symposion/templates/reviews/review_admin.html |  5 +++-
 .../templates/reviews/review_assignment.html  |  7 ++++--
 .../templates/reviews/review_detail.html      |  5 +++-
 .../templates/reviews/review_review.html      |  7 ++++--
 symposion/templates/reviews/review_stats.html | 23 +++++++++++--------
 9 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/symposion/templates/reviews/_review_table.html b/symposion/templates/reviews/_review_table.html
index 9c1804b7..9e94cf83 100644
--- a/symposion/templates/reviews/_review_table.html
+++ b/symposion/templates/reviews/_review_table.html
@@ -1,3 +1,4 @@
+{% load url from future %}
 {% load i18n %}
 
 <table class="table table-striped table-bordered table-reviews">
@@ -18,7 +19,7 @@
             <tr class="{{ proposal.user_vote_css }}">
                 <td>{{ proposal.number }}</td>
                 <td>
-                    <a href="{% url review_detail proposal.pk %}">
+                    <a href="{% url 'review_detail' proposal.pk %}">
                         <small><strong>{{ proposal.speaker }}</strong></small>
                         <br />
                         {{ proposal.title }}
diff --git a/symposion/templates/reviews/base.html b/symposion/templates/reviews/base.html
index 695d9c8c..a09bde0e 100644
--- a/symposion/templates/reviews/base.html
+++ b/symposion/templates/reviews/base.html
@@ -1,5 +1,8 @@
 {% extends "site_base.html" %}
 
+{% load url from future %}
+
+
 {% load i18n %}
 {% load sitetree %}
 
@@ -60,25 +63,25 @@
                             {{ section }}
                         </li>
                         <li>
-                            <a href="{% url review_section section.section.slug %}">
+                            <a href="{% url 'review_section' section.section.slug %}">
                                 {% trans "All Reviews" %}
                             </a>
                         </li>
                         {% comment %}
                         <li>
-                            <a href="{% url review_section_assignments section.section.slug %}">
+                            <a href="{% url 'review_section_assignments' section.section.slug %}">
                                 {% trans "Your Assignments" %}
                             </a>
                         </li>
                         {% endcomment %}
                         <li>
-                            <a href="{% url review_status section.section.slug %}">
+                            <a href="{% url 'review_status' section.section.slug %}">
                                 {% trans "Voting Status" %}
                             </a>
                         </li>
                         {% if request.user.is_staff %}
                             <li>
-                                <a href="{% url result_notification section.section.slug 'accepted' %}">Result Notification</a>
+                                <a href="{% url 'result_notification' section.section.slug 'accepted' %}">Result Notification</a>
                             </li>
                         {% endif %}
                     {% endfor %}
diff --git a/symposion/templates/reviews/result_notification.html b/symposion/templates/reviews/result_notification.html
index cbd5c4c2..af250baa 100644
--- a/symposion/templates/reviews/result_notification.html
+++ b/symposion/templates/reviews/result_notification.html
@@ -1,5 +1,8 @@
 {% extends "reviews/base.html" %}
 
+{% load url from future %}
+
+
 {% load i18n %}
 
 {% block extra_style %}
@@ -13,14 +16,14 @@
 {% block body %}
     
     <ul class="nav nav-pills">
-        <li{% if status == 'accepted' %} class="active"{% endif %}><a href="{% url result_notification section_slug 'accepted' %}">accepted</a>
-        <li{% if status == 'rejected' %} class="active"{% endif %}><a href="{% url result_notification section_slug 'rejected' %}">rejected</a>
-        <li{% if status == 'standby' %} class="active"{% endif %}><a href="{% url result_notification section_slug 'standby' %}">standby</a>
+        <li{% if status == 'accepted' %} class="active"{% endif %}><a href="{% url 'result_notification' section_slug 'accepted' %}">accepted</a>
+        <li{% if status == 'rejected' %} class="active"{% endif %}><a href="{% url 'result_notification' section_slug 'rejected' %}">rejected</a>
+        <li{% if status == 'standby' %} class="active"{% endif %}><a href="{% url 'result_notification' section_slug 'standby' %}">standby</a>
     </ul>
     
     <h1>Result Notification</h1>
     
-    <form method="post" action="{% url result_notification_prepare section_slug status %}">
+    <form method="post" action="{% url 'result_notification_prepare' section_slug status %}">
         
         {% csrf_token %}
         
@@ -54,7 +57,7 @@
                         <td><input class="action-select" type="checkbox" name="_selected_action" value="{{ proposal.pk }}"></td>
                         <td>{{ proposal.number }}</td>
                         <td>
-                            <a href="{% url review_detail proposal.pk %}">
+                            <a href="{% url 'review_detail' proposal.pk %}">
                                 <small><strong>{{ proposal.speaker }}</strong></small>
                                 <br />
                                 {{ proposal.title }}
diff --git a/symposion/templates/reviews/result_notification_prepare.html b/symposion/templates/reviews/result_notification_prepare.html
index 2248c204..bfe2e433 100644
--- a/symposion/templates/reviews/result_notification_prepare.html
+++ b/symposion/templates/reviews/result_notification_prepare.html
@@ -1,5 +1,8 @@
 {% extends "reviews/base.html" %}
 
+{% load url from future %}
+
+
 {% load i18n %}
 
 {% block body %}
@@ -23,7 +26,7 @@
         <div class="span6">
             <h2>Email</h2>
             
-            <form method="post" action="{% url result_notification_send section_slug status %}">
+            <form method="post" action="{% url 'result_notification_send' section_slug status %}">
                 
                 {% csrf_token %}
                 
@@ -42,7 +45,7 @@
                 {% include "reviews/_result_notification_prepare_help.html" %}
                 
                 <button type="submit" class="btn btn-primary">Send {{ proposals|length }} Email{{ proposals|length|pluralize }}</button>
-                <a class="btn" href="{% url result_notification section_slug status %}">Cancel</a>
+                <a class="btn" href="{% url 'result_notification' section_slug status %}">Cancel</a>
             </form>
         </div>
     </form>
diff --git a/symposion/templates/reviews/review_admin.html b/symposion/templates/reviews/review_admin.html
index 1e762416..24ac217f 100644
--- a/symposion/templates/reviews/review_admin.html
+++ b/symposion/templates/reviews/review_admin.html
@@ -1,5 +1,8 @@
 {% extends "reviews/base.html" %}
 
+{% load url from future %}
+
+
 {% block body %}
     <h1>Reviewers</h1>
     
@@ -30,7 +33,7 @@
         {% for reviewer in reviewers %}
         <tr>
             <td>
-                <a href="{% url review_list_user section_slug reviewer.pk %}">{{ reviewer.get_full_name }}</a>
+                <a href="{% url 'review_list_user' section_slug reviewer.pk %}">{{ reviewer.get_full_name }}</a>
             </td>
             <td>
                 {{ reviewer.total_votes }}
diff --git a/symposion/templates/reviews/review_assignment.html b/symposion/templates/reviews/review_assignment.html
index 8bcc1fef..448b85c0 100644
--- a/symposion/templates/reviews/review_assignment.html
+++ b/symposion/templates/reviews/review_assignment.html
@@ -1,5 +1,8 @@
 {% extends "reviews/base.html" %}
 
+{% load url from future %}
+
+
 {% block body %}
     <h1>Review Assignments</h1>
     
@@ -13,12 +16,12 @@
             {% for assignment in assignments %}
                 <tr>
                     <td>
-                        <a href="{% url review_detail assignment.proposal.pk %}">
+                        <a href="{% url 'review_detail' assignment.proposal.pk %}">
                             {{ assignment.proposal.title }}
                         </a>
                     </td>
                     <td>
-                        <form method="post" action="{% url review_assignment_opt_out assignment.pk %}">
+                        <form method="post" action="{% url 'review_assignment_opt_out' assignment.pk %}">
                             {% csrf_token %}
                             <input type="submit" value="Opt-out" />
                         </form>
diff --git a/symposion/templates/reviews/review_detail.html b/symposion/templates/reviews/review_detail.html
index 9a2de066..98b4043a 100644
--- a/symposion/templates/reviews/review_detail.html
+++ b/symposion/templates/reviews/review_detail.html
@@ -1,5 +1,8 @@
 {% extends "reviews/base.html" %}
 
+{% load url from future %}
+
+
 {% load i18n %}
 {% load markitup_tags %}
 {% load bootstrap_tags %}
@@ -126,7 +129,7 @@
                             </div>
                             {% if is_manager %}
                                 <div class="pull-right">
-                                    <form class="form-inline" action="{% url review_delete review.id %}" method="POST">
+                                    <form class="form-inline" action="{% url 'review_delete' review.id %}" method="POST">
                                         {% csrf_token %}
                                         <button class="btn btn-mini btn-danger" type="submit">Delete</button>
                                     </form>
diff --git a/symposion/templates/reviews/review_review.html b/symposion/templates/reviews/review_review.html
index 2168e899..7f753ddc 100644
--- a/symposion/templates/reviews/review_review.html
+++ b/symposion/templates/reviews/review_review.html
@@ -1,5 +1,8 @@
 {% extends "site_base.html" %}
 
+{% load url from future %}
+
+
 {% load markitup_tags %}
 {% load uni_form_tags %}
 
@@ -55,7 +58,7 @@
 
     <h2>Review</h2>
     
-    <form method="POST" action="{% url review_review proposal.pk %}" class="uniForm">
+    <form method="POST" action="{% url 'review_review' proposal.pk %}" class="uniForm">
         {% csrf_token %}
         <fieldset class="inlineLabels">
             {{ review_form|as_uni_form }}
@@ -67,7 +70,7 @@
     
     <h2>Comment</h2>
     
-    <form method="POST" action="{% url review_comment proposal.pk %}" class="uniForm">
+    <form method="POST" action="{% url 'review_comment' proposal.pk %}" class="uniForm">
         {% csrf_token %}
         <fieldset>
             {{ comment_form|as_uni_form }}
diff --git a/symposion/templates/reviews/review_stats.html b/symposion/templates/reviews/review_stats.html
index 8f4a09cb..40936af5 100644
--- a/symposion/templates/reviews/review_stats.html
+++ b/symposion/templates/reviews/review_stats.html
@@ -1,15 +1,18 @@
 {% extends "reviews/base.html" %}
 
+{% load url from future %}
+
+
 {% block body %}
     <h1>Voting Status ({{ section_slug }})</h1>
     
     {% if key %}
         <div class="breadcrumbs">
-            <a href="{% url review_status section_slug "positive" %}">Positive</a> |
-            <a href="{% url review_status section_slug "negative" %}">Negative</a> |
-            <a href="{% url review_status section_slug "indifferent" %}">Indifferent</a> |
-            <a href="{% url review_status section_slug "controversial" %}">Controversial</a>  |
-            <a href="{% url review_status section_slug "too_few" %}">Too Few</a> 
+            <a href="{% url 'review_status' section_slug "positive" %}">Positive</a> |
+            <a href="{% url 'review_status' section_slug "negative" %}">Negative</a> |
+            <a href="{% url 'review_status' section_slug "indifferent" %}">Indifferent</a> |
+            <a href="{% url 'review_status' section_slug "controversial" %}">Controversial</a>  |
+            <a href="{% url 'review_status' section_slug "too_few" %}">Too Few</a> 
         </div>
 
         <div>
@@ -42,35 +45,35 @@
         
         <dl>
             <dt>
-                <a href="{% url review_status section_slug "positive" %}">Positive</a>
+                <a href="{% url 'review_status' section_slug "positive" %}">Positive</a>
                 <span class="badge">{{ proposals.positive|length }}</span>
             </dt>
             <dd>
                 proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one +1 and no &minus;1s
             </dd>
             <dt>
-                <a href="{% url review_status section_slug "negative" %}">Negative</a>
+                <a href="{% url 'review_status' section_slug "negative" %}">Negative</a>
                 <span class="badge">{{ proposals.negative|length }}</span>
             </dt>
             <dd>
                 proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one &minus;1 and no +1s
             </dd>
             <dt>
-                <a href="{% url review_status section_slug "indifferent" %}">Indifferent</a>
+                <a href="{% url 'review_status' section_slug "indifferent" %}">Indifferent</a>
                 <span class="badge">{{ proposals.indifferent|length }}</span>
             </dt>
             <dd>
                 proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and neither a +1 or a &minus;1
             </dd>
             <dt>
-                <a href="{% url review_status section_slug "controversial" %}">Controversial</a>
+                <a href="{% url 'review_status' section_slug "controversial" %}">Controversial</a>
                 <span class="badge">{{ proposals.controversial|length }}</span>
             </dt>
             <dd>
                 proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and both a +1 and &minus;1
             </dd>
             <dt>
-                <a href="{% url review_status section_slug "too_few" %}">Too Few Reviews</a>
+                <a href="{% url 'review_status' section_slug "too_few" %}">Too Few Reviews</a>
                 <span class="badge">{{ proposals.too_few|length }}</span>
             </dt>
             <dd>