From 9c1a387a0fa6833e9462ad1ea5b9a1df80607d56 Mon Sep 17 00:00:00 2001
From: Michael Elkins <melkins@tislabs.com>
Date: Fri, 17 Jun 2016 17:45:07 +0000
Subject: Remove 'load url from future' as it is no longer needed in recent
 Django versions

See #823

svn path=/branches/tk705/; revision=6443
---
 rpki/gui/app/templates/app/alert_confirm_clear.html       | 1 -
 rpki/gui/app/templates/app/alert_confirm_delete.html      | 1 -
 rpki/gui/app/templates/app/alert_detail.html              | 1 -
 rpki/gui/app/templates/app/alert_list.html                | 1 -
 rpki/gui/app/templates/app/app_base.html                  | 1 -
 rpki/gui/app/templates/app/child_detail.html              | 1 -
 rpki/gui/app/templates/app/client_detail.html             | 1 -
 rpki/gui/app/templates/app/client_list.html               | 1 -
 rpki/gui/app/templates/app/conf_empty.html                | 1 -
 rpki/gui/app/templates/app/conf_list.html                 | 1 -
 rpki/gui/app/templates/app/dashboard.html                 | 1 -
 rpki/gui/app/templates/app/ghostbusterrequest_detail.html | 1 -
 rpki/gui/app/templates/app/object_confirm_delete.html     | 1 -
 rpki/gui/app/templates/app/parent_detail.html             | 1 -
 rpki/gui/app/templates/app/pubclient_list.html            | 1 -
 rpki/gui/app/templates/app/repository_detail.html         | 1 -
 rpki/gui/app/templates/app/resource_holder_list.html      | 1 -
 rpki/gui/app/templates/app/roa_detail.html                | 1 -
 rpki/gui/app/templates/app/roarequest_confirm_delete.html | 1 -
 rpki/gui/app/templates/app/roarequest_confirm_form.html   | 1 -
 rpki/gui/app/templates/app/roarequest_form.html           | 1 -
 rpki/gui/app/templates/app/routes_view.html               | 1 -
 rpki/gui/app/templates/app/user_list.html                 | 1 -
 23 files changed, 23 deletions(-)

(limited to 'rpki')

diff --git a/rpki/gui/app/templates/app/alert_confirm_clear.html b/rpki/gui/app/templates/app/alert_confirm_clear.html
index 5d7fcf04..d29f279f 100644
--- a/rpki/gui/app/templates/app/alert_confirm_clear.html
+++ b/rpki/gui/app/templates/app/alert_confirm_clear.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class='page-header'>
diff --git a/rpki/gui/app/templates/app/alert_confirm_delete.html b/rpki/gui/app/templates/app/alert_confirm_delete.html
index 78c84917..f4860285 100644
--- a/rpki/gui/app/templates/app/alert_confirm_delete.html
+++ b/rpki/gui/app/templates/app/alert_confirm_delete.html
@@ -1,5 +1,4 @@
 {% extends "app/alert_detail.html" %}
-{% load url from future %}
 
 {% block action %}
 <div class="row-fluid">
diff --git a/rpki/gui/app/templates/app/alert_detail.html b/rpki/gui/app/templates/app/alert_detail.html
index b3a73b7e..3a117e29 100644
--- a/rpki/gui/app/templates/app/alert_detail.html
+++ b/rpki/gui/app/templates/app/alert_detail.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 {% load app_extras %}
 
 {% block content %}
diff --git a/rpki/gui/app/templates/app/alert_list.html b/rpki/gui/app/templates/app/alert_list.html
index dd0530e4..236e8049 100644
--- a/rpki/gui/app/templates/app/alert_list.html
+++ b/rpki/gui/app/templates/app/alert_list.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class="page-header">
diff --git a/rpki/gui/app/templates/app/app_base.html b/rpki/gui/app/templates/app/app_base.html
index 4fb5f731..9ed92cba 100644
--- a/rpki/gui/app/templates/app/app_base.html
+++ b/rpki/gui/app/templates/app/app_base.html
@@ -1,6 +1,5 @@
 {% 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 %}
 {% load app_extras %}
 
 {# This template defines the common structure for the rpki.gui.app application. #}
diff --git a/rpki/gui/app/templates/app/child_detail.html b/rpki/gui/app/templates/app/child_detail.html
index 8178e179..56f086ed 100644
--- a/rpki/gui/app/templates/app/child_detail.html
+++ b/rpki/gui/app/templates/app/child_detail.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class="page-header">
diff --git a/rpki/gui/app/templates/app/client_detail.html b/rpki/gui/app/templates/app/client_detail.html
index 3117e859..391ba6a9 100644
--- a/rpki/gui/app/templates/app/client_detail.html
+++ b/rpki/gui/app/templates/app/client_detail.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class="page-header">
diff --git a/rpki/gui/app/templates/app/client_list.html b/rpki/gui/app/templates/app/client_list.html
index 12987c53..61c8d2a8 100644
--- a/rpki/gui/app/templates/app/client_list.html
+++ b/rpki/gui/app/templates/app/client_list.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class="page-header">
diff --git a/rpki/gui/app/templates/app/conf_empty.html b/rpki/gui/app/templates/app/conf_empty.html
index efe06f14..f3f5d91d 100644
--- a/rpki/gui/app/templates/app/conf_empty.html
+++ b/rpki/gui/app/templates/app/conf_empty.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 
 {% block content %}
 
diff --git a/rpki/gui/app/templates/app/conf_list.html b/rpki/gui/app/templates/app/conf_list.html
index dce6d59e..4183195a 100644
--- a/rpki/gui/app/templates/app/conf_list.html
+++ b/rpki/gui/app/templates/app/conf_list.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class="page-header">
diff --git a/rpki/gui/app/templates/app/dashboard.html b/rpki/gui/app/templates/app/dashboard.html
index c042af12..dd94f3d4 100644
--- a/rpki/gui/app/templates/app/dashboard.html
+++ b/rpki/gui/app/templates/app/dashboard.html
@@ -1,7 +1,6 @@
 {% 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 %}
   <li class="divider"></li>
diff --git a/rpki/gui/app/templates/app/ghostbusterrequest_detail.html b/rpki/gui/app/templates/app/ghostbusterrequest_detail.html
index 296f0f16..29ae80d7 100644
--- a/rpki/gui/app/templates/app/ghostbusterrequest_detail.html
+++ b/rpki/gui/app/templates/app/ghostbusterrequest_detail.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class="page-header">
diff --git a/rpki/gui/app/templates/app/object_confirm_delete.html b/rpki/gui/app/templates/app/object_confirm_delete.html
index c4af9b26..56e12a90 100644
--- a/rpki/gui/app/templates/app/object_confirm_delete.html
+++ b/rpki/gui/app/templates/app/object_confirm_delete.html
@@ -5,7 +5,6 @@ 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">
diff --git a/rpki/gui/app/templates/app/parent_detail.html b/rpki/gui/app/templates/app/parent_detail.html
index 4dd1842f..b93d1ab8 100644
--- a/rpki/gui/app/templates/app/parent_detail.html
+++ b/rpki/gui/app/templates/app/parent_detail.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class="page-header">
diff --git a/rpki/gui/app/templates/app/pubclient_list.html b/rpki/gui/app/templates/app/pubclient_list.html
index 1872e005..5e15f8e0 100644
--- a/rpki/gui/app/templates/app/pubclient_list.html
+++ b/rpki/gui/app/templates/app/pubclient_list.html
@@ -1,5 +1,4 @@
 {% extends "app/object_list.html" %}
-{% load url from future %}
 
 {% block actions %}
 <div class='actions'>
diff --git a/rpki/gui/app/templates/app/repository_detail.html b/rpki/gui/app/templates/app/repository_detail.html
index 92a43e54..e53c450c 100644
--- a/rpki/gui/app/templates/app/repository_detail.html
+++ b/rpki/gui/app/templates/app/repository_detail.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class="page-header">
diff --git a/rpki/gui/app/templates/app/resource_holder_list.html b/rpki/gui/app/templates/app/resource_holder_list.html
index 6525e74d..a7342421 100644
--- a/rpki/gui/app/templates/app/resource_holder_list.html
+++ b/rpki/gui/app/templates/app/resource_holder_list.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class='page-header'>
diff --git a/rpki/gui/app/templates/app/roa_detail.html b/rpki/gui/app/templates/app/roa_detail.html
index ec76579d..33c1d19a 100644
--- a/rpki/gui/app/templates/app/roa_detail.html
+++ b/rpki/gui/app/templates/app/roa_detail.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 {% load app_extras %}
 
 {% block content %}
diff --git a/rpki/gui/app/templates/app/roarequest_confirm_delete.html b/rpki/gui/app/templates/app/roarequest_confirm_delete.html
index 7dc3ec2b..3730e01e 100644
--- a/rpki/gui/app/templates/app/roarequest_confirm_delete.html
+++ b/rpki/gui/app/templates/app/roarequest_confirm_delete.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 {% load app_extras %}
 
 {% block content %}
diff --git a/rpki/gui/app/templates/app/roarequest_confirm_form.html b/rpki/gui/app/templates/app/roarequest_confirm_form.html
index 446bb6a4..532e76ad 100644
--- a/rpki/gui/app/templates/app/roarequest_confirm_form.html
+++ b/rpki/gui/app/templates/app/roarequest_confirm_form.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class='page-title'>
diff --git a/rpki/gui/app/templates/app/roarequest_form.html b/rpki/gui/app/templates/app/roarequest_form.html
index 3a29131d..7f278d07 100644
--- a/rpki/gui/app/templates/app/roarequest_form.html
+++ b/rpki/gui/app/templates/app/roarequest_form.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {# This form is used for creating a new ROA request #}
 
diff --git a/rpki/gui/app/templates/app/routes_view.html b/rpki/gui/app/templates/app/routes_view.html
index 885f3fa9..739c0441 100644
--- a/rpki/gui/app/templates/app/routes_view.html
+++ b/rpki/gui/app/templates/app/routes_view.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 {% load bootstrap_pager %}
 {% load app_extras %}
 
diff --git a/rpki/gui/app/templates/app/user_list.html b/rpki/gui/app/templates/app/user_list.html
index 1b419ded..b11b16bc 100644
--- a/rpki/gui/app/templates/app/user_list.html
+++ b/rpki/gui/app/templates/app/user_list.html
@@ -1,5 +1,4 @@
 {% extends "app/app_base.html" %}
-{% load url from future %}
 
 {% block content %}
 <div class='page-header'>
-- 
cgit v1.2.3