updated web portal html templates to use newer syntax for the {% url %} tag

svn path=/trunk/; revision=5083

20 files changed, 94 insertions, 71 deletions

diff --git a/rpkid/rpki/gui/app/templates/app/app_base.html b/rpkid/rpki/gui/app/templates/app/app_base.html
index 2738e4da..57bb6c2f 100644
--- a/rpkid/rpki/gui/app/templates/app/app_base.html
+++ b/rpkid/rpki/gui/app/templates/app/app_base.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{# this can be removed when django 1.4 is EOL, because it is the default behavior in 1.5 #}
+{% load url from future %}
 
 {# This template defines the common structure for the rpki.gui.app application. #}
 
@@ -9,19 +11,19 @@
 {# common navigation #}
 
 <ul class='unstyled'>
-  <li><a href="{% url rpki.gui.app.views.dashboard %}">dashboard</a></li>
-  <li><a href="{% url rpki.gui.app.views.route_view %}">routes</a></li>
+  <li><a href="{% url "rpki.gui.app.views.dashboard" %}">dashboard</a></li>
+  <li><a href="{% url "rpki.gui.app.views.route_view" %}">routes</a></li>
 </ul>
 
 <ul class='unstyled'>
-  <li><a href="{% url rpki.gui.app.views.conf_list %}" title="select a different resource handle to manage">select identity</a></li>
+  <li><a href="{% url "rpki.gui.app.views.conf_list" %}" title="select a different resource handle to manage">select identity</a></li>
 </ul>
 
 {% if request.user.is_superuser %}
 <ul class='unstyled'>
-  <li><a href="{% url rpki.gui.app.views.user_list %}" title="manage users"><i class="icon-user"></i> web users</a></li>
-  <li><a href="{% url rpki.gui.app.views.resource_holder_list %}" title="manage resource holders"><i class="icon-user"></i> resource holders</a></li>
-  <li><a href="{% url rpki.gui.app.views.client_list %}" title="manage repository clients">repository clients</a></li>
+  <li><a href="{% url "rpki.gui.app.views.user_list" %}" title="manage users"><i class="icon-user"></i> web users</a></li>
+  <li><a href="{% url "rpki.gui.app.views.resource_holder_list" %}" title="manage resource holders"><i class="icon-user"></i> resource holders</a></li>
+  <li><a href="{% url "rpki.gui.app.views.client_list" %}" title="manage repository clients">repository clients</a></li>
 </ul>
 {% endif %}
 
diff --git a/rpkid/rpki/gui/app/templates/app/child_detail.html b/rpkid/rpki/gui/app/templates/app/child_detail.html
index a30ad3e3..8178e179 100644
--- a/rpkid/rpki/gui/app/templates/app/child_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/child_detail.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="page-header">
@@ -37,11 +38,11 @@
 </div>
 
 {% block action %}
-<a class='btn' href="{% url rpki.gui.app.views.child_edit object.pk %}" title='Edit this child'><i class="icon-edit"></i> Edit</a>
-<a class='btn' href="{% url rpki.gui.app.views.child_add_asn object.pk %}" title='Delegate an ASN to this child'><i class="icon-plus-sign"></i> AS</a>
-<a class='btn' href="{% url rpki.gui.app.views.child_add_prefix object.pk %}" title='Delegate a prefix to this child'><i class="icon-plus-sign"></i> Prefix</a>
-<a class='btn' href="{% url rpki.gui.app.views.child_response object.pk %}" title='Download XML file to send to child'><i class="icon-download"></i> Export</a>
-<a class="btn" href="{% url rpki.gui.app.views.child_delete object.pk %}" title="Delete this child"><i class="icon-trash"></i> Delete</a>
+<a class='btn' href="{% url "rpki.gui.app.views.child_edit" object.pk %}" title='Edit this child'><i class="icon-edit"></i> Edit</a>
+<a class='btn' href="{% url "rpki.gui.app.views.child_add_asn" object.pk %}" title='Delegate an ASN to this child'><i class="icon-plus-sign"></i> AS</a>
+<a class='btn' href="{% url "rpki.gui.app.views.child_add_prefix" object.pk %}" title='Delegate a prefix to this child'><i class="icon-plus-sign"></i> Prefix</a>
+<a class='btn' href="{% url "rpki.gui.app.views.child_response" object.pk %}" title='Download XML file to send to child'><i class="icon-download"></i> Export</a>
+<a class="btn" href="{% url "rpki.gui.app.views.child_delete" object.pk %}" title="Delete this child"><i class="icon-trash"></i> Delete</a>
 {% endblock %}
 
 {% endblock %}
diff --git a/rpkid/rpki/gui/app/templates/app/client_detail.html b/rpkid/rpki/gui/app/templates/app/client_detail.html
index f596b84b..b6e2652a 100644
--- a/rpkid/rpki/gui/app/templates/app/client_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/client_detail.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="page-header">
@@ -17,7 +18,7 @@
 </table>
 
 {% block action %}
-<a class="btn" href="{% url rpki.gui.app.views.client_delete object.pk %}"><i class="icon-trash"></i> Delete</a>
-{% endblock %}
+<a class="btn" href="{% url "rpki.gui.app.views.client_delete" object.pk %}"><i class="icon-trash"></i> Delete</a>
+{% endblock action %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/rpkid/rpki/gui/app/templates/app/client_list.html b/rpkid/rpki/gui/app/templates/app/client_list.html
index 5024d8f6..12987c53 100644
--- a/rpkid/rpki/gui/app/templates/app/client_list.html
+++ b/rpkid/rpki/gui/app/templates/app/client_list.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="page-header">
@@ -9,13 +10,13 @@
 	<tbody>
 		{% for client in object_list %}
 		<tr>
-			<td><a href="{% url rpki.gui.app.views.client_detail client.pk %}">{{ client.handle }}</a></td>
+			<td><a href="{% url "rpki.gui.app.views.client_detail" client.pk %}">{{ client.handle }}</a></td>
 			<td>
-				<a class="btn btn-mini" href="{% url rpki.gui.app.views.client_delete client.pk %}" title="Delete"><i class="icon-trash"></i></a>
+				<a class="btn btn-mini" href="{% url "rpki.gui.app.views.client_delete" client.pk %}" title="Delete"><i class="icon-trash"></i></a>
 			</td>
 		</tr>
 		{% endfor %}
 	</tbody>
 </table>
-<a class="btn" href="{% url rpki.gui.app.views.client_import %}"><i class="icon-upload"></i> Import</a>
+<a class="btn" href="{% url "rpki.gui.app.views.client_import" %}"><i class="icon-upload"></i> Import</a>
 {% endblock content %}
diff --git a/rpkid/rpki/gui/app/templates/app/conf_list.html b/rpkid/rpki/gui/app/templates/app/conf_list.html
index f726ea75..dce6d59e 100644
--- a/rpkid/rpki/gui/app/templates/app/conf_list.html
+++ b/rpkid/rpki/gui/app/templates/app/conf_list.html
@@ -1,16 +1,17 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="page-header">
-<h1>Handle List</h1>
+  <h1>Handle List</h1>
 </div>
 
 <p>Please select a handle.</p>
 
 <ul>
-{% for c in conf_list %}
-<li><a href="{% url rpki.gui.app.views.conf_select %}?handle={{ c.handle }}&next={{ next_url }}">{{ c.handle }}</a></li>
-{% endfor %}
+  {% for c in conf_list %}
+  <li><a href="{% url "rpki.gui.app.views.conf_select" %}?handle={{ c.handle }}&next={{ next_url }}">{{ c.handle }}</a></li>
+  {% endfor %}
 </ul>
 
 {% endblock %}
diff --git a/rpkid/rpki/gui/app/templates/app/dashboard.html b/rpkid/rpki/gui/app/templates/app/dashboard.html
index 3be5927a..36e7c46e 100644
--- a/rpkid/rpki/gui/app/templates/app/dashboard.html
+++ b/rpkid/rpki/gui/app/templates/app/dashboard.html
@@ -1,8 +1,11 @@
 {% extends "app/app_base.html" %}
 
+{# this can be removed when django 1.4 is EOL, because it is the default behavior in 1.5 #}
+{% load url from future %}
+
 {% block sidebar_extra %}
 <ul class='unstyled'>
-  <li><a href="{% url rpki.gui.app.views.conf_export %}" title="download XML identity to send to parent"><i class="icon-download"></i> export identity</a></li>
+  <li><a href="{% url "rpki.gui.app.views.conf_export" %}" title="download XML identity to send to parent"><i class="icon-download"></i> export identity</a></li>
 </ul>
 {% endblock sidebar_extra %}
 
@@ -58,7 +61,7 @@
       {% endfor %}
       {% endif %}
     </table>
-    <a class='btn' href="{% url rpki.gui.app.views.refresh %}" title="refresh resource list from rpkid"><i class="icon-refresh"></i> refresh</a></li>
+    <a class='btn' href="{% url "rpki.gui.app.views.refresh" %}" title="refresh resource list from rpkid"><i class="icon-refresh"></i> refresh</a></li>
   </div>
   <div class='span6'>
     <h2>Unallocated Resources</h2>
@@ -81,7 +84,7 @@
       <tr>
 	<td>{{ addr }}</td>
 	<td>
-	  <a class="btn btn-mini" title="Create ROA using this prefix" href="{% url rpki.gui.app.views.roa_create_multi %}?roa={{ addr }}"><i class="icon-plus-sign"></i> ROA</a>
+	  <a class="btn btn-mini" title="Create ROA using this prefix" href="{% url "rpki.gui.app.views.roa_create_multi" %}?roa={{ addr }}"><i class="icon-plus-sign"></i> ROA</a>
 	</td>
       </tr>
       {% endfor %} <!-- addrs -->
@@ -96,7 +99,7 @@
       <tr>
 	<td>{{ addr }}</td>
 	<td>
-	  <a class="btn btn-mini" title='create roa using this prefix' href="{% url rpki.gui.app.views.roa_create_multi %}?roa={{ addr }}"><i class="icon-plus-sign"></i> ROA</a>
+	  <a class="btn btn-mini" title='create roa using this prefix' href="{% url "rpki.gui.app.views.roa_create_multi" %}?roa={{ addr }}"><i class="icon-plus-sign"></i> ROA</a>
 	</td>
       </tr>
       {% endfor %} <!-- addrs -->
@@ -120,13 +123,13 @@
     <td>{{ roa.prefixes.all.0.max_prefixlen }}</td>
     <td>{{ roa.asn }}</td>
     <td>
-      <a class="btn btn-mini" href="{% url rpki.gui.app.views.roa_detail roa.pk %}" title="Detail"><i class="icon-info-sign"></i></a>
-      <a class="btn btn-mini" href="{% url rpki.gui.app.views.roa_delete roa.pk %}" title="Delete"><i class="icon-trash"></i></a>
+      <a class="btn btn-mini" href="{% url "rpki.gui.app.views.roa_detail" roa.pk %}" title="Detail"><i class="icon-info-sign"></i></a>
+      <a class="btn btn-mini" href="{% url "rpki.gui.app.views.roa_delete" roa.pk %}" title="Delete"><i class="icon-trash"></i></a>
     </td>
   </tr>
   {% endfor %}
 </table>
-<a class="btn" href="{% url rpki.gui.app.views.roa_create_multi %}"><i class="icon-plus-sign"></i> Create</a>
+<a class="btn" href="{% url "rpki.gui.app.views.roa_create_multi" %}"><i class="icon-plus-sign"></i> Create</a>
 </div>
 
   <div class="span6">
@@ -142,14 +145,14 @@
     <td>{{ gbr.email_address }}</td>
     <td>{{ gbr.telephone }}</td>
     <td>
-      <a class="btn btn-mini" href="{% url gbr-detail gbr.pk %}" title="View"><i class="icon-info-sign"></i></a>
-      <a class="btn btn-mini" href="{% url gbr-edit gbr.pk %}" title="Edit"><i class="icon-edit"></i></a>
-      <a class="btn btn-mini" href="{% url gbr-delete gbr.pk %}" title="Delete"><i class="icon-trash"></i></a>
+      <a class="btn btn-mini" href="{% url "gbr-detail" gbr.pk %}" title="View"><i class="icon-info-sign"></i></a>
+      <a class="btn btn-mini" href="{% url "gbr-edit" gbr.pk %}" title="Edit"><i class="icon-edit"></i></a>
+      <a class="btn btn-mini" href="{% url "gbr-delete" gbr.pk %}" title="Delete"><i class="icon-trash"></i></a>
     </td>
   </tr>
   {% endfor %}
 </table>
-<a class="btn" href="{% url gbr-create %}"><i class="icon-plus-sign"></i> Create</a>
+<a class="btn" href="{% url "gbr-create" %}"><i class="icon-plus-sign"></i> Create</a>
 </div><!-- /span -->
 </div><!-- /row -->
 
@@ -164,12 +167,12 @@
       <tr>
       <td><a href="{{ child.get_absolute_url }}">{{ child.handle }}</a></td>
 	<td>
-	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.child_delete child.pk %}" title="Delete"><i class="icon-trash"></i></a>
+	  <a class="btn btn-mini" href="{% url "rpki.gui.app.views.child_delete" child.pk %}" title="Delete"><i class="icon-trash"></i></a>
 	</td>
       </tr>
       {% endfor %}
     </table>
-    <a class="btn" href="{% url rpki.gui.app.views.child_import %}"><i class="icon-upload"></i> Import</a>
+    <a class="btn" href="{% url "rpki.gui.app.views.child_import" %}"><i class="icon-upload"></i> Import</a>
   </div><!-- /span -->
   <div class="span6">
     <div class="page-header">
@@ -181,12 +184,12 @@
       <tr>
 	<td><a href="{{ parent.get_absolute_url }}">{{ parent.handle }}</a></td>
 	<td>
-	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.parent_delete parent.pk %}" title="Delete"><i class="icon-trash"></i></a>
+	  <a class="btn btn-mini" href="{% url "rpki.gui.app.views.parent_delete" parent.pk %}" title="Delete"><i class="icon-trash"></i></a>
 	</td>
       </tr>
       {% endfor %}
     </table>
-    <a class="btn" href="{% url rpki.gui.app.views.parent_import %}"><i class="icon-upload"></i> Import</a>
+    <a class="btn" href="{% url "rpki.gui.app.views.parent_import" %}"><i class="icon-upload"></i> Import</a>
   </div><!-- /span -->
 </div><!-- /row -->
 
@@ -201,12 +204,12 @@
       <tr>
 	<td><a href="{{ repo.get_absolute_url }}">{{ repo.handle }}</a></td>
 	<td>
-	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.repository_delete repo.pk %}" title="Delete"><i class="icon-trash"></i></a>
+	  <a class="btn btn-mini" href="{% url "rpki.gui.app.views.repository_delete" repo.pk %}" title="Delete"><i class="icon-trash"></i></a>
 	</td>
       </tr>
       {% endfor %}
     </table>
-    <a class="btn" href="{% url rpki.gui.app.views.repository_import %}"><i class="icon-upload"></i> Import</a>
+    <a class="btn" href="{% url "rpki.gui.app.views.repository_import" %}"><i class="icon-upload"></i> Import</a>
   </div><!-- /span -->
 </div><!-- /row -->
 {% endblock %}
diff --git a/rpkid/rpki/gui/app/templates/app/ghostbusterrequest_detail.html b/rpkid/rpki/gui/app/templates/app/ghostbusterrequest_detail.html
index 5849c11d..296f0f16 100644
--- a/rpkid/rpki/gui/app/templates/app/ghostbusterrequest_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/ghostbusterrequest_detail.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="page-header">
@@ -56,8 +57,8 @@
 
 {% block action %}
 {# the roarequest_confirm_delete template will override this section #}
-<a class="btn" href="{% url gbr-edit object.pk %}"><i class="icon-edit"></i> Edit</a>
-<a class="btn" href="{% url gbr-delete object.pk %}"><i class="icon-trash"></i> Delete</a>
-{% endblock %}
+<a class="btn" href="{% url "gbr-edit" object.pk %}"><i class="icon-edit"></i> Edit</a>
+<a class="btn" href="{% url "gbr-delete" object.pk %}"><i class="icon-trash"></i> Delete</a>
+{% endblock action %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/rpkid/rpki/gui/app/templates/app/object_confirm_delete.html b/rpkid/rpki/gui/app/templates/app/object_confirm_delete.html
index 26a21ccb..c4af9b26 100644
--- a/rpkid/rpki/gui/app/templates/app/object_confirm_delete.html
+++ b/rpkid/rpki/gui/app/templates/app/object_confirm_delete.html
@@ -5,6 +5,7 @@ dynamically extending from the *_detail.html template for a concrete object
 type.  The *DeleteView classes should set a "parent_template" variable which is
 string specifying the concrete template to inherit from.
 {% endcomment %}
+{% load url from future %}
 
 {% block action %}
 <div class="alert alert-warning alert-block">
@@ -15,6 +16,6 @@ string specifying the concrete template to inherit from.
 <form action='' method='POST'>
   {% csrf_token %}
   <input class='btn btn-danger' type='submit' value='Delete'>
-  <a class='btn' href="{% url rpki.gui.app.views.dashboard %}">Cancel</a>
+  <a class='btn' href="{% url "rpki.gui.app.views.dashboard" %}">Cancel</a>
 </form>
 {% endblock %}
diff --git a/rpkid/rpki/gui/app/templates/app/parent_detail.html b/rpkid/rpki/gui/app/templates/app/parent_detail.html
index aa0685ca..4dd1842f 100644
--- a/rpkid/rpki/gui/app/templates/app/parent_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/parent_detail.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="page-header">
@@ -59,8 +60,8 @@
 </div>
 
 {% block action %}
-<a class='btn' href='{% url rpki.gui.app.views.parent_export object.pk %}' title='Download XML to send to repository operator'><i class="icon-download"></i> Export</a>
-<a class="btn" href="{% url rpki.gui.app.views.parent_delete object.pk %}" title="Delete this parent"><i class="icon-trash"></i> Delete</a>
-{% endblock %}
+<a class='btn' href='{% url "rpki.gui.app.views.parent_export" object.pk %}' title='Download XML to send to repository operator'><i class="icon-download"></i> Export</a>
+<a class="btn" href="{% url "rpki.gui.app.views.parent_delete" object.pk %}" title="Delete this parent"><i class="icon-trash"></i> Delete</a>
+{% endblock action %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/rpkid/rpki/gui/app/templates/app/pubclient_list.html b/rpkid/rpki/gui/app/templates/app/pubclient_list.html
index 0296dcdf..1872e005 100644
--- a/rpkid/rpki/gui/app/templates/app/pubclient_list.html
+++ b/rpkid/rpki/gui/app/templates/app/pubclient_list.html
@@ -1,8 +1,9 @@
 {% extends "app/object_list.html" %}
+{% load url from future %}
 
 {% block actions %}
 <div class='actions'>
-  <a class='btn' href='{% url rpki.gui.app.views.pubclient_import %}'>Import</a>
+  <a class='btn' href='{% url "rpki.gui.app.views.pubclient_import" %}'>Import</a>
 </div>
 {% endblock actions %}
 
diff --git a/rpkid/rpki/gui/app/templates/app/repository_detail.html b/rpkid/rpki/gui/app/templates/app/repository_detail.html
index 57950593..92a43e54 100644
--- a/rpkid/rpki/gui/app/templates/app/repository_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/repository_detail.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="page-header">
@@ -13,6 +14,6 @@
 </table>
 
 {% block action %}
-<a class="btn" href="{% url rpki.gui.app.views.repository_delete object.pk %}" title="Delete this repository"><i class="icon-trash"></i> Delete</a>
-{% endblock %}
-{% endblock %}
+<a class="btn" href="{% url "rpki.gui.app.views.repository_delete" object.pk %}" title="Delete this repository"><i class="icon-trash"></i> Delete</a>
+{% endblock action %}
+{% endblock content %}
diff --git a/rpkid/rpki/gui/app/templates/app/resource_holder_list.html b/rpkid/rpki/gui/app/templates/app/resource_holder_list.html
index 3d1c2366..6635950b 100644
--- a/rpkid/rpki/gui/app/templates/app/resource_holder_list.html
+++ b/rpkid/rpki/gui/app/templates/app/resource_holder_list.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class='page-title'>
@@ -8,7 +9,7 @@
 <p>
 This page lists all of the resource holders that are currently managed by this server.
 Note that this is distinct from the
-<a href="{% url rpki.gui.app.views.user_list %}">list of web interface users</a>.
+<a href="{% url "rpki.gui.app.views.user_list" %}">list of web interface users</a>.
 </p>
 
 <table class='table table-striped'>
@@ -23,13 +24,14 @@ Note that this is distinct from the
     <tr>
       <td>{{ conf.handle }}</td>
       <td>
-	<a class='btn btn-small' href='{% url rpki.gui.app.views.resource_holder_edit conf.pk %}' title="Edit"><i class="icon-edit"></i></a>
-	<a class='btn btn-small' href='{% url rpki.gui.app.views.resource_holder_delete conf.pk %}' title="Delete"><i class="icon-trash"></i></a>
+	<a class='btn btn-small' href='{% url "rpki.gui.app.views.resource_holder_edit" conf.pk %}' title="Edit"><i class="icon-edit"></i></a>
+	<a class='btn btn-small' href='{% url "rpki.gui.app.views.resource_holder_delete" conf.pk %}' title="Delete"><i class="icon-trash"></i></a>
       </td>
     </tr>
     {% endfor %}
   </tbody>
 </table>
 
-<a class="btn" href="{% url rpki.gui.app.views.resource_holder_create %}"><i class="icon-plus-sign"></i> Create</a>
+<a class="btn" href="{% url "rpki.gui.app.views.resource_holder_create" %}"><i class="icon-plus-sign"></i> Create</a>
 {% endblock content %}
+{# vim: set ft=htmldjango: #}
diff --git a/rpkid/rpki/gui/app/templates/app/roa_detail.html b/rpkid/rpki/gui/app/templates/app/roa_detail.html
index 6f06842f..89a07fd8 100644
--- a/rpkid/rpki/gui/app/templates/app/roa_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/roa_detail.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class="page-header">
@@ -29,5 +30,5 @@
   </div>
 </div>
 
-<a class="btn" href="{% url rpki.gui.app.views.roa_delete object.pk %}"><i class="icon-trash"></i> Delete</a>
-{% endblock %}
+<a class="btn" href="{% url "rpki.gui.app.views.roa_delete" object.pk %}"><i class="icon-trash"></i> Delete</a>
+{% endblock content %}
diff --git a/rpkid/rpki/gui/app/templates/app/roarequest_confirm_delete.html b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_delete.html
index c5457c7d..28de172b 100644
--- a/rpkid/rpki/gui/app/templates/app/roarequest_confirm_delete.html
+++ b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_delete.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class='page-header'>
@@ -31,7 +32,7 @@
     <form method='POST' action='{{ request.get_full_path }}'>
       {% csrf_token %}
       <input class='btn btn-danger' type='submit' value='Delete'/>
-      <a class='btn' href="{% url rpki.gui.app.views.dashboard %}">Cancel</a>
+      <a class='btn' href="{% url "rpki.gui.app.views.dashboard" %}">Cancel</a>
     </form>
   </div>
 
diff --git a/rpkid/rpki/gui/app/templates/app/roarequest_confirm_form.html b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_form.html
index 4cebda49..446bb6a4 100644
--- a/rpkid/rpki/gui/app/templates/app/roarequest_confirm_form.html
+++ b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_form.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class='page-title'>
@@ -25,13 +26,13 @@
       </tr>
     </table>
 
-    <form method='POST' action='{% url rpki.gui.app.views.roa_create_confirm %}'>
+    <form method='POST' action='{% url "rpki.gui.app.views.roa_create_confirm" %}'>
       {% csrf_token %}
       {% include "app/bootstrap_form.html" %}
 
       <div class='form-actions'>
 	<input class='btn btn-primary' type='submit' value='Create'/>
-	<a class='btn' href='{% url rpki.gui.app.views.dashboard %}'>Cancel</a>
+	<a class='btn' href='{% url "rpki.gui.app.views.dashboard" %}'>Cancel</a>
       </div>
     </form>
   </div>
diff --git a/rpkid/rpki/gui/app/templates/app/roarequest_confirm_multi_form.html b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_multi_form.html
index cd0ed3c2..69b0542e 100644
--- a/rpkid/rpki/gui/app/templates/app/roarequest_confirm_multi_form.html
+++ b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_multi_form.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class='page-title'>
@@ -27,7 +28,7 @@
       {% endfor %}
     </table>
 
-    <form method='POST' action='{% url rpki.gui.app.views.roa_create_multi_confirm %}'>
+    <form method='POST' action='{% url "rpki.gui.app.views.roa_create_multi_confirm" %}'>
       {% csrf_token %}
       {{ formset.management_form }}
       {% for form in formset %}
@@ -36,7 +37,7 @@
 
       <div class='form-actions'>
 	<input class='btn btn-primary' type='submit' value='Create'/>
-	<a class='btn' href='{% url rpki.gui.app.views.dashboard %}'>Cancel</a>
+	<a class='btn' href='{% url "rpki.gui.app.views.dashboard" %}'>Cancel</a>
       </div>
     </form>
   </div>
diff --git a/rpkid/rpki/gui/app/templates/app/roarequest_form.html b/rpkid/rpki/gui/app/templates/app/roarequest_form.html
index e599179c..cded49f2 100644
--- a/rpkid/rpki/gui/app/templates/app/roarequest_form.html
+++ b/rpkid/rpki/gui/app/templates/app/roarequest_form.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {# This form is used for creating a new ROA request #}
 
@@ -33,7 +34,7 @@
       {% include "app/bootstrap_form.html" %}
       <div class="form-actions">
 	<input class="btn" type="submit" value="Preview">
-	<a class="btn" href="{% url rpki.gui.app.views.dashboard %}">Cancel</a>
+	<a class="btn" href="{% url "rpki.gui.app.views.dashboard" %}">Cancel</a>
       </div>
     </form>
   </div>
diff --git a/rpkid/rpki/gui/app/templates/app/roarequest_multi_form.html b/rpkid/rpki/gui/app/templates/app/roarequest_multi_form.html
index 91151036..5127733a 100644
--- a/rpkid/rpki/gui/app/templates/app/roarequest_multi_form.html
+++ b/rpkid/rpki/gui/app/templates/app/roarequest_multi_form.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class='page-title'>
@@ -21,7 +22,7 @@
 
   <div class="form-actions">
     <input class="btn" type="submit" value="Preview">
-    <a class="btn" href="{% url rpki.gui.app.views.dashboard %}">Cancel</a>
+    <a class="btn" href="{% url "rpki.gui.app.views.dashboard" %}">Cancel</a>
   </div>
 </form>
 {% endblock %}
diff --git a/rpkid/rpki/gui/app/templates/app/routes_view.html b/rpkid/rpki/gui/app/templates/app/routes_view.html
index f9b0ffad..190f9ed8 100644
--- a/rpkid/rpki/gui/app/templates/app/routes_view.html
+++ b/rpkid/rpki/gui/app/templates/app/routes_view.html
@@ -1,5 +1,5 @@
 {% extends "app/app_base.html" %}
-
+{% load url from future %}
 {% load bootstrap_pager %}
 
 {% block sidebar_extra %}
@@ -34,7 +34,7 @@ This view shows currently advertised routes for the prefixes listed in resource
     <td>{{ r.asn }}</td>
     <td>
       <span class='label {{ r.status_label }}'>{{ r.status }}</span>
-      <a href='{% url rpki.gui.app.views.route_detail r.pk %}' title='display ROAs covering this prefix'><i class="icon-info-sign"></i></a>
+      <a href='{% url "rpki.gui.app.views.route_detail" r.pk %}' title='display ROAs covering this prefix'><i class="icon-info-sign"></i></a>
     </td>
   </tr>
   {% endfor %}
@@ -42,4 +42,4 @@ This view shows currently advertised routes for the prefixes listed in resource
 
 {% bootstrap_pager request routes %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/rpkid/rpki/gui/app/templates/app/user_list.html b/rpkid/rpki/gui/app/templates/app/user_list.html
index 16ebf6c0..dfb0a7cd 100644
--- a/rpkid/rpki/gui/app/templates/app/user_list.html
+++ b/rpkid/rpki/gui/app/templates/app/user_list.html
@@ -1,4 +1,5 @@
 {% extends "app/app_base.html" %}
+{% load url from future %}
 
 {% block content %}
 <div class='page-title'>
@@ -7,7 +8,7 @@
 
 <p>
 This page lists all user accounts in the web interface.  Note that this is distinct from the
-<a href="{% url rpki.gui.app.views.resource_holder_list %}">list of resource holders</a>.
+<a href="{% url "rpki.gui.app.views.resource_holder_list" %}">list of resource holders</a>.
 </p>
 
 <table class='table table-striped'>
@@ -24,13 +25,13 @@ This page lists all user accounts in the web interface.  Note that this is disti
       <td>{{ user.username }}</td>
       <td>{{ user.email }}</td>
       <td>
-	<a class='btn btn-small' href='{% url rpki.gui.app.views.user_edit user.pk %}' title="Edit"><i class="icon-edit"></i></a>
-	<a class='btn btn-small' href='{% url rpki.gui.app.views.user_delete user.pk %}' title="Delete"><i class="icon-trash"></i></a>
+	<a class='btn btn-small' href='{% url "rpki.gui.app.views.user_edit" user.pk %}' title="Edit"><i class="icon-edit"></i></a>
+	<a class='btn btn-small' href='{% url "rpki.gui.app.views.user_delete" user.pk %}' title="Delete"><i class="icon-trash"></i></a>
       </td>
     </tr>
     {% endfor %}
   </tbody>
 </table>
 
-<a class='btn' href="{% url rpki.gui.app.views.user_create %}" title="create a new locally hosted resource handle"><i class="icon-plus-sign"></i> Create</a>
+<a class='btn' href="{% url "rpki.gui.app.views.user_create" %}" title="create a new locally hosted resource handle"><i class="icon-plus-sign"></i> Create</a>
 {% endblock content %}