From 8e10699d53281be53c88a3695de6aa496e084dc6 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 23 Mar 2012 20:09:38 -0500
Subject: Use 'url from future' everywhere

The old-style url template tag disappears in Django 1.5, so we can and
should convert to the new-style tag now.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/add.html            | 3 ++-
 templates/releng/iso_overview.html   | 3 ++-
 templates/releng/result_list.html    | 3 ++-
 templates/releng/result_section.html | 7 ++++---
 templates/releng/results.html        | 5 +++--
 templates/releng/thanks.html         | 7 ++++---
 6 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'templates/releng')

diff --git a/templates/releng/add.html b/templates/releng/add.html
index 8488b40..ed02984 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block title %}Arch Linux - Test Result Entry{% endblock %}
 
@@ -13,7 +14,7 @@
     installation properly.  Some options require you to check several things (such as
     config files), this will be mentioned alongside the option.</p>
     <p>There is also an overview of all feedback on the
-    <a href="{% url releng-test-overview %}">results page</a>.  Once we have
+    <a href="{% url 'releng-test-overview' %}">results page</a>.  Once we have
     builds that are properly tested (enough successful feedback for all
     important features of the ISO or a slightly earlier ISO), we can release new
     official media.</p>
diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html
index 5a4445b..76479c5 100644
--- a/templates/releng/iso_overview.html
+++ b/templates/releng/iso_overview.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="box">
     <h2>Failures and Successes for Testing ISOs</h2>
 
-    <p><a href="{% url releng-test-overview %}">Go back to testing results</a></p>
+    <p><a href="{% url 'releng-test-overview' %}">Go back to testing results</a></p>
 
     <table id="releng-result" class="results">
         <thead>
diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html
index 512e1bf..6226421 100644
--- a/templates/releng/result_list.html
+++ b/templates/releng/result_list.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="box">
@@ -7,7 +8,7 @@
         {{ iso_name|default:"" }}
     </h2>
 
-    <p><a href="{% url releng-test-overview %}">Go back to testing results</a></p>
+    <p><a href="{% url 'releng-test-overview' %}">Go back to testing results</a></p>
 
     <table id="releng-result" class="results">
         <thead>
diff --git a/templates/releng/result_section.html b/templates/releng/result_section.html
index 08e46fb..c82a553 100644
--- a/templates/releng/result_section.html
+++ b/templates/releng/result_section.html
@@ -1,3 +1,4 @@
+{% load url from future %}
 <tr>
     <th>{% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}</td>
     <th>Last Success</th>
@@ -6,20 +7,20 @@
 {% for item in option.values %}
 <tr>
     <td>
-        <a href="{% url releng-results-for option.name|lower item.value.pk %}">
+        <a href="{% url 'releng-results-for' option.name|lower item.value.pk %}">
             {{ item.value.name|lower }}
         </a>
     </td>
     <td>
         {% if item.success %}
-        <a href="{% url releng-results-iso item.success.pk %}">
+        <a href="{% url 'releng-results-iso' item.success.pk %}">
             {{ item.success.name }}
         </a>
         {% else %}Never succeeded{% endif %}
     </td>
     <td>
         {% if item.failure %}
-        <a href="{% url releng-results-iso item.failure.pk %}">
+        <a href="{% url 'releng-results-iso' item.failure.pk %}">
             {{ item.failure.name }}
         </a>
         {% else %}Never failed{% endif %}
diff --git a/templates/releng/results.html b/templates/releng/results.html
index 4ff3c86..71af708 100644
--- a/templates/releng/results.html
+++ b/templates/releng/results.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block title %}Arch Linux - Release Engineering Testbuild Results{% endblock %}
 
@@ -9,12 +10,12 @@
     <p>This is an overview screen showing a test results matrix of release
     engineering produced ISOs. Various options and configurations are shown
     with last success and last failure results, if known. To help improve ISO
-    quality, you are encouraged to <a href="{% url releng-test-submit %}">give feedback</a>
+    quality, you are encouraged to <a href="{% url 'releng-test-submit' %}">give feedback</a>
     if you have tested and used any ISOs. Both successful and failed results
     are encouraged and welcome.</p>
 
     <p>For a overview of which ISOs tested best, have a look at
-    the <a href="{% url releng-iso-overview %}">overview</a>.</p>
+    the <a href="{% url 'releng-iso-overview' %}">overview</a>.</p>
 
     <p>For more information, see the <a
     href="https://wiki.archlinux.org/index.php/DeveloperWiki:releng_testimages_feedback">documentation
diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html
index 80018b0..66d65a5 100644
--- a/templates/releng/thanks.html
+++ b/templates/releng/thanks.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block title %}Arch Linux - Feedback - Thanks!{% endblock %}
 
@@ -7,9 +8,9 @@
     <h2>Thanks!</h2>
     <p>Thank you for taking the time to give us this information!
     Your results have been succesfully added to our database.</p>
-    <p>You can now <a href="{% url releng-test-overview %}">go back to the results</a>,
-    <a href="{% url releng-test-submit %}">give more feedback</a>, or
-    have a look at the <a href="{% url releng-iso-overview %}">look at
+    <p>You can now <a href="{% url 'releng-test-overview' %}">go back to the results</a>,
+    <a href="{% url 'releng-test-submit' %}">give more feedback</a>, or
+    have a look at the <a href="{% url 'releng-iso-overview' %}">look at
     the ISO test overview</a>.</p>
 </div>
 {% endblock %}
-- 
cgit v1.2.3-24-g4f1b