Merge lp:~cjohnston/helipad/ci-django-15-urls into lp:helipad/ci

[Chris Johnston]

Updates URLs to work with django 1.5

As we are looking forward to upgrading django to 1.5, we need to ensure that the URLs work for django 1.5

[Francis Ginther (fginther)]

Verified that all urls are moved to the new format as documented here:
https://docs.djangoproject.com/en/dev/releases/1.5/

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'templates/ci/daily_release_overview.html'
--- templates/ci/daily_release_overview.html	2013-08-01 17:52:24 +0000
+++ templates/ci/daily_release_overview.html	2013-09-19 21:57:04 +0000
@@ -1,7 +1,6 @@
 {% extends "ci/ci_layout.html" %}
-{% load dashboard_extras %}
-{% load ci_extras %}
-{% load percentage %}
+{% load url from future %}
+{% load dashboard_extras ci_extras percentage %}
 
 {% block page_name %}Daily release status for {% if show_filter %}{{ show_filter }}{% else %}all stacks{% endif %}{% endblock %}
 
@@ -31,11 +30,11 @@
   </h3>
   <ul class='left_nav'>
     <li>
-    <a href='{% url ci_daily_overview %}'>All</a>
+    <a href='{% url "ci_daily_overview" %}'>All</a>
     </li>
     {% for release in release_list %}
     <li>
-      <a href='{% url ci_daily_overview %}?show={{ release }} '>{{ release }}</a>
+      <a href='{% url "ci_daily_overview" %}?show={{ release }} '>{{ release }}</a>
     </li>
     {% endfor %}
   </ul>

=== modified file 'templates/ci/job.html'
--- templates/ci/job.html	2013-07-29 21:52:02 +0000
+++ templates/ci/job.html	2013-09-19 21:57:04 +0000
@@ -1,4 +1,5 @@
 {% extends "layout.html" %}
+{% load url from future %}
 {% load dashboard_extras %}
 
 {% block page_name %}Upstream merger builds for {{ job.name }}{% endblock %}
@@ -29,7 +30,7 @@
     </li>
     {% for result in result_list %}
     <li>
-      <a href='{% url ci_job job.name %}?show={{ result.name }}'>{{ result.name }}</a>
+      <a href='{% url "ci_job" job.name %}?show={{ result.name }}'>{{ result.name }}</a>
     </li>
     {% endfor %}
   </ul>

=== modified file 'templates/ci/project_detail.html'
--- templates/ci/project_detail.html	2013-07-31 22:07:43 +0000
+++ templates/ci/project_detail.html	2013-09-19 21:57:04 +0000
@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
-{% load dashboard_extras staticfiles %}
-{% load percentage %}
+{% load url from future %}
+{% load dashboard_extras staticfiles percentage %}
 {% block extra_headers %}
 <link type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/nvd3/0.9/nv.d3.css" rel="stylesheet" />
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/d3/3.2.2/d3.min.js"></script>
@@ -29,7 +29,7 @@
   //]]>
 </script>
 <script type="text/javascript">
-  d3.json('{% url ci_api_project project.launchpad_project.name %}', function(data) { 
+  d3.json('{% url "ci_api_project" project.launchpad_project.name %}', function(data) { 
     nv.addGraph(function() {
         var chart = nv.models.lineChart()
         .width(1100).height(400);
@@ -90,7 +90,7 @@
       {% for job in job_list %}
       <tr>
         <td>
-		<a href='{% url ci_job job.name %}'>{{ job.name }}</a>
+		<a href='{% url "ci_job" job.name %}'>{{ job.name }}</a>
         </td>
         <td>
           <a href='{{ job.last_build.url }}'>{{ job.last_build.number }}</a>

=== modified file 'templates/ci/project_list.html'
--- templates/ci/project_list.html	2013-08-07 19:00:37 +0000
+++ templates/ci/project_list.html	2013-09-19 21:57:04 +0000
@@ -1,4 +1,5 @@
 {% extends "ci/ci_layout.html" %}
+{% load url from future %}
 {% load dashboard_extras percentage staticfiles %}
 
 {% block page_name %}Upstream merger results for all projects{% endblock %}
@@ -32,11 +33,11 @@
   </h3>
   <ul class='left_nav'>
     <li>
-    <a href='{% url ci_projects %}'>All</a>
+    <a href='{% url "ci_projects" %}'>All</a>
     </li>
     {% for release in release_list %}
     <li>
-      <a href='{% url ci_projects %}?show={{ release }} '>{{ release }}</a>
+      <a href='{% url "ci_projects" %}?show={{ release }} '>{{ release }}</a>
     </li>
     {% endfor %}
   </ul>
@@ -72,7 +73,7 @@
       {% for project in project_list %}
       <tr>
         <td>
-          <a href='{% url ci_project project.name %}'>{{ project.name }}</a>
+          <a href='{% url "ci_project" project.name %}'>{{ project.name }}</a>
         </td>
         <td>
           {{ project.ci_project.last_successful_build.timestamp }}

=== modified file 'templates/ci/stack_list.html'
--- templates/ci/stack_list.html	2013-07-22 17:41:38 +0000
+++ templates/ci/stack_list.html	2013-09-19 21:57:04 +0000
@@ -1,6 +1,6 @@
 {% extends "ci/ci_layout.html" %}
-{% load dashboard_extras %}
-{% load ci_extras %}
+{% load url from future %}
+{% load dashboard_extras ci_extras %}
 
 {% block page_name %}CI{% endblock %}
 
@@ -30,11 +30,11 @@
   </h3>
   <ul class='left_nav'>
     <li>
-    <a href='{% url stacks %}'>All</a>
+    <a href='{% url "stacks" %}'>All</a>
     </li>
     {% for release in release_list %}
     <li>
-      <a href='{% url stacks %}?show={{ release }} '>{{ release }}</a>
+      <a href='{% url "stacks" %}?show={{ release }} '>{{ release }}</a>
     </li>
     {% endfor %}
   </ul>
@@ -53,7 +53,7 @@
       {% for stack in stack_list %}
       <tr>
         <td>
-          <a href='{% url stacks %}{{ stack.name }}/'>{{ stack.name }}</a>
+          <a href='{% url "stacks" %}{{ stack.name }}/'>{{ stack.name }}</a>
         </td>
 	<td class='{{ stack.status|stack_status_color }}'>
           {{ stack.status }}