--- /dev/null
+Description: Remove {% load url from future %}
+ The {% load url from future %} is deprecated in Django 1.9 and raises an
+ exception durring tests.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-01-11
+
+--- horizon-8.0.0.orig/horizon/templates/auth/_login.html
++++ horizon-8.0.0/horizon/templates/auth/_login.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal-header %}{% trans "Log In" %}{% endblock %}
+ {% block modal_class %}login {% if hide %}modal{% endif %}{% endblock %}
+--- horizon-8.0.0.orig/horizon/templates/horizon/_script_i18n.html
++++ horizon-8.0.0/horizon/templates/horizon/_script_i18n.html
+@@ -1,3 +1,2 @@
+-{% load url from future %}
+ {% comment %} Django's JavaScript i18n Implementation {% endcomment %}
+ <script type="text/javascript" src="{% url 'horizon:jsi18n' 'horizon' %}"></script>
+--- horizon-8.0.0.orig/horizon/templates/horizon/_sidebar.html
++++ horizon-8.0.0/horizon/templates/horizon/_sidebar.html
+@@ -1,5 +1,4 @@
+ {% load horizon i18n %}
+-{% load url from future %}
+
+ <ul id="sidebar-accordion" class="nav nav-pills nav-stacked">
+ {% for dashboard, panel_info in components %}
+--- horizon-8.0.0.orig/horizon/templates/horizon/common/_breadcrumb.html
++++ horizon-8.0.0/horizon/templates/horizon/common/_breadcrumb.html
+@@ -1,4 +1,3 @@
+-{% load url from future %}
+ {% load i18n %}
+ {% with subfolders=breadcrumb.get_subfolders %}
+ <ul class="breadcrumb">
+--- horizon-8.0.0.orig/horizon/templates/horizon/common/_region_selector.html
++++ horizon-8.0.0/horizon/templates/horizon/common/_region_selector.html
+@@ -1,4 +1,3 @@
+-{% load url from future %}
+ {% if regions.support %}
+ <a href="#" class="dropdown-toggle" role="button" aria-expanded="false">
+ {{ regions.current.name }}
+--- horizon-8.0.0.orig/horizon/templates/horizon/common/_sidebar.html
++++ horizon-8.0.0/horizon/templates/horizon/common/_sidebar.html
+@@ -1,5 +1,4 @@
+ {% load branding horizon i18n %}
+-{% load url from future %}
+
+ <div id='sidebar'>
+ {% horizon_nav %}
+--- horizon-8.0.0.orig/horizon/templates/horizon/jasmine/jasmine.html
++++ horizon-8.0.0/horizon/templates/horizon/jasmine/jasmine.html
+@@ -1,4 +1,3 @@
+-{% load url from future %}
+ <!DOCTYPE html>
+ <html>
+ <head>
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+ <h3>{% trans "Template Overview" %}</h3>
+ <div class="status row detail">
+ <dl class="dl-horizontal">
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+ <h3>{% trans "Node Groups" %}</h3>
+ <div class="status row detail">
+ {% for node_group in template.node_groups %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_upload_file.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_upload_file.html
+@@ -1,7 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+
+-{% load url from future %}
+-
+ {% load i18n %}
+
+ {% block form_id %}upload_file{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_create_cluster.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_create_cluster.html
+@@ -1,7 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+
+-{% load url from future %}
+-
+ {% load i18n %}
+
+ {% block form_id %}create_cluster_form{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_details.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+ <h3>{% trans "Cluster Overview" %}</h3>
+ <div class="status row detail">
+ <dl class="dl-horizontal">
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_nodegroups_details.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_nodegroups_details.html
+@@ -1,7 +1,5 @@
+ {% load i18n sizeformat %}
+
+-{% load url from future %}
+-
+
+ <h3>{% trans "Node Groups" %}</h3>
+ <div class="status row detail">
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_edit_tags.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_edit_tags.html
+@@ -1,7 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+
+-{% load url from future %}
+-
+ {% load i18n %}
+
+ {% block form_id %}edit_tags_form{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_register_image.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_register_image.html
+@@ -1,7 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+
+-{% load url from future %}
+-
+ {% load i18n %}
+
+ {% block form_id %}register_image_form{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/job_binaries/templates/data_processing.job_binaries/_create.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/job_binaries/templates/data_processing.job_binaries/_create.html
+@@ -1,7 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+
+-{% load url from future %}
+-
+ {% load i18n %}
+
+ {% block form_id %}create-job-binary{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/job_executions/templates/data_processing.job_executions/_details.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/job_executions/templates/data_processing.job_executions/_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+ <h3>{% trans "Job Overview" %}</h3>
+ <div class="status row detail">
+ <dl class="dl-horizontal">
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/jobs/templates/data_processing.jobs/_details.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/jobs/templates/data_processing.jobs/_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+ <h3>{% trans "Job Template" %}</h3>
+ <div class="status row detail">
+ <dl class="dl-horizontal">
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/nodegroup_templates/templates/data_processing.nodegroup_templates/_details.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/nodegroup_templates/templates/data_processing.nodegroup_templates/_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+ <h3>{% trans "Template Overview" %}</h3>
+ <div class="status row detail">
+ <dl class="dl-horizontal">
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_job_type_select.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_job_type_select.html
+@@ -1,7 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+
+-{% load url from future %}
+-
+ {% load i18n %}
+
+ {% block form_id %}create-job-binary{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_plugin_select.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_plugin_select.html
+@@ -1,7 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+
+-{% load url from future %}
+-
+ {% load i18n %}
+
+ {% block form_id %}create-job-binary{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html
+@@ -1,6 +1,5 @@
+ {% extends 'base.html' %}
+ {% load i18n %}
+-{% load url from future %}
+ {% block title %}{% trans "Data Processing" %}{% endblock %}
+
+ {% block main %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html
+@@ -1,6 +1,5 @@
+ {% extends 'base.html' %}
+ {% load i18n %}
+-{% load url from future %}
+ {% block title %}{% trans "Data Processing" %}{% endblock %}
+
+ {% block main %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/wizard.html
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/wizard.html
+@@ -1,6 +1,5 @@
+ {% extends 'base.html' %}
+ {% load i18n %}
+-{% load url from future %}
+ {% block title %}{% trans "Data Processing" %}{% endblock %}
+
+ {% block main %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_add_shard.html
++++ horizon-8.0.0/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_add_shard.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}add_shard_form{% endblock %}
+ {% block form_action %}{% url "horizon:project:database_clusters:add_shard" cluster_id %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_launch.html
++++ horizon-8.0.0/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_launch.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}launch_form{% endblock %}
+ {% block form_action %}{% url "horizon:project:database_clusters:launch" %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_reset_password.html
++++ horizon-8.0.0/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_reset_password.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}reset_password_form{% endblock %}
+ {% block form_action %}{% url "horizon:project:database_clusters:reset_password" cluster_id %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html
++++ horizon-8.0.0/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+
+ <h3>{% trans "Instance Overview" %}</h3>
+
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html
++++ horizon-8.0.0/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}resize_instance_form{% endblock %}
+ {% block form_action %}{% url "horizon:project:databases:resize_instance" instance_id %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html
++++ horizon-8.0.0/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}resize_volume_form{% endblock %}
+ {% block form_action %}{% url "horizon:project:databases:resize_volume" instance_id %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}edit_aggregate_form{% endblock %}
+ {% block form_action %}{% url 'horizon:admin:aggregates:update' id %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}disable_service_form{% endblock %}
+ {% block form_action %}{% url 'horizon:admin:hypervisors:compute:disable_service' compute_host %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}evacuate_host_form{% endblock %}
+ {% block form_action %}{% url 'horizon:admin:hypervisors:compute:evacuate_host' compute_host %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}evacuate_host_form{% endblock %}
+ {% block form_action %}{% url 'horizon:admin:hypervisors:compute:migrate_host' compute_host %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}live_migrate_form{% endblock %}
+ {% block form_action %}{% url 'horizon:admin:instances:live_migrate' instance_id %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}create_metadata_form{% endblock %}
+ {% block form_action %}{% url 'horizon:admin:metadata_defs:create' %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_resource_types.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_resource_types.html
+@@ -1,6 +1,5 @@
+ {% extends 'admin/metadata_defs/resource_types.html' %}
+ {% load i18n %}
+-{% load url from future %}
+ {% block title %}
+ {% trans "Namespace Resource Type Associations" %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}create_usage_report_form{% endblock %}
+ {% block form_action %}{% url 'horizon:admin:metering:create' %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/metering/templates/metering/stats.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/metering/templates/metering/stats.html
+@@ -1,5 +1,4 @@
+ {% load i18n %}
+-{% load url from future %}
+
+ <div id="samples_url" url="{% url "horizon:admin:metering:samples" %}"></div>
+ <div id="ceilometer-stats">
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}create_network_form{% endblock %}
+ {% block form_action %}{% url 'horizon:admin:networks:create' %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/_detail_overview.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/_detail_overview.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+
+ <div class="detail">
+ <dl class="dl-horizontal">
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/volumes/templates/volumes/snapshots/_detail_overview.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/volumes/templates/volumes/snapshots/_detail_overview.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat parse_date %}
+-{% load url from future %}
+
+ <h3>{% trans "Volume Snapshot Overview" %}</h3>
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/_update_volume_type.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/_update_volume_type.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}{% endblock %}
+ {% block form_action %}{% url 'horizon:admin:volumes:volume_types:update_type' volume_type.id %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal_id %}extra_specs_modal{% endblock %}
+ {% block modal-header %}{% trans "Volume Type Extra Specs" %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal_id %}qos_specs_modal{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form_add_members.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal-header %}{% trans "Add Group Assignment" %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal-header %}{% trans "User Credentials" %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/download.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/download.html
+@@ -1,6 +1,5 @@
+ {% extends 'base.html' %}
+ {% load i18n %}
+-{% load url from future %}
+ {% block title %}{% blocktrans %}Download Key Pair{% endblocktrans %}{% endblock %}
+
+ {% block main %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal-header %}{% trans "Container Details" %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}copy_object_form{% endblock %}
+ {% block form_action %}{% url 'horizon:project:containers:object_copy' container_name object_name %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}create_container_form{% endblock %}
+ {% block form_action %}{% url 'horizon:project:containers:create' %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}create_directory_form{% endblock %}
+ {% block form_action %}{% url 'horizon:project:containers:create_pseudo_folder' container_name %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal-header %}{% trans "Object Details" %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}update_object_form{% endblock %}
+ {% block ng_controller %}DummyController{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}upload_object_form{% endblock %}
+ {% block form_name %}uploadForm{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/containers/templates/containers/index.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/containers/templates/containers/index.html
+@@ -1,6 +1,5 @@
+ {% extends 'base.html' %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block title %}{% trans "Containers" %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_firewall_details.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_firewall_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat parse_date %}
+-{% load url from future %}
+
+ <div class="info row detail">
+ <hr class="header_rule">
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_policy_details.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_policy_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat parse_date %}
+-{% load url from future %}
+
+ <div class="info row detail">
+ <hr class="header_rule">
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_rule_details.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_rule_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat parse_date %}
+-{% load url from future %}
+
+ <div class="info row detail">
+ <hr class="header_rule">
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html
+@@ -1,7 +1,6 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+-
++
+ {% block form_id %}password_instance_form{% endblock %}
+
+ {% block form_action %}{% url "horizon:project:instances:decryptpassword" instance_id keypair_name %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_console.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_console.html
+@@ -1,5 +1,4 @@
+ {% load i18n %}
+-{% load url from future %}
+
+ <h3>{% trans "Instance Console" %}</h3>
+ {% if console_url %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_log.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_log.html
+@@ -1,5 +1,4 @@
+ {% load i18n %}
+-{% load url from future %}
+
+ <div class="clearfix">
+ <h3 class="pull-left">{% trans "Instance Console Log" %}</h3>
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+
+ <h3>{% trans "Instance Overview" %}</h3>
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}rebuild_instance_form{% endblock %}
+ {% block form_action %}{% url "horizon:project:instances:rebuild" instance_id %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html
+@@ -1,5 +1,4 @@
+ {% load i18n %}
+-{% load url from future %}
+ <!DOCTYPE html>
+ <html>
+ <head>
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n horizon humanize %}
+-{% load url from future %}
+
+ {% block form_id %}{% endblock %}
+ {% block form_action %}{% url 'horizon:project:network_topology:createrouter' %}?{{ request.GET.urlencode }}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/index.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/index.html
+@@ -1,6 +1,5 @@
+ {% extends 'base.html' %}
+ {% load i18n %}
+-{% load url from future %}
+ {% block title %}{% trans "Network Topology" %}{% endblock %}
+
+ {% block main %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}create_network_form{% endblock %}
+ {% block form_action %}{% url 'horizon:project:networks:create' %}{% endblock %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/networks/templates/networks/create.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/networks/templates/networks/create.html
+@@ -1,6 +1,5 @@
+ {% extends 'horizon/common/_workflow.html' %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal-footer %}
+ {% if workflow.wizard %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+
+ <div class="detail">
+ <dl class="dl-horizontal">
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat %}
+-{% load url from future %}
+
+ <h3>{% trans "Subnet Overview" %}</h3>
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}add_routerroute_form{% endblock %}
+ {% block form_action %}{% url 'horizon:project:routers:addrouterroute' router.id %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}add_routerrule_form{% endblock %}
+ {% block form_action %}{% url 'horizon:project:routers:addrouterrule' router.id %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}add_interface_form{% endblock %}
+ {% block form_action %}{% url form_url router.id %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_id %}setgateway_form{% endblock %}
+ {% block form_action %}{% url 'horizon:project:routers:setgateway' router.id %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal-header %}{% trans "Stack Preview" %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/_detail_overview.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/_detail_overview.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat parse_date %}
+-{% load url from future %}
+
+ <h3>
+ {% blocktrans with backup_display_name=backup.display_name %}Volume Backup Overview: {{ backup_display_name }}{% endblocktrans %}
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/_detail_overview.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/_detail_overview.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat parse_date %}
+-{% load url from future %}
+
+ <h3>{% trans "Volume Snapshot Overview" %}</h3>
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block form_class %}{{ block.super }} horizontal {% if show_attach %}split_half{% else %} no_split{% endif %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html
+@@ -1,6 +1,5 @@
+ {% extends "horizon/common/_modal_form.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block modal-body-right %}
+ <div class="quota-dynamic">
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_detail_overview.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_detail_overview.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat parse_date %}
+-{% load url from future %}
+
+ <h3>{% trans "Volume Overview" %}</h3>
+
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat parse_date %}
+-{% load url from future %}
+
+ <div class="info row detail">
+ <hr class="header_rule">
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/vpn/templates/vpn/_vpnservice_details.html
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/vpn/templates/vpn/_vpnservice_details.html
+@@ -1,5 +1,4 @@
+ {% load i18n sizeformat parse_date %}
+-{% load url from future %}
+
+ <div class="info row detail">
+ <hr class="header_rule">
+--- horizon-8.0.0.orig/openstack_dashboard/templates/403.html
++++ horizon-8.0.0/openstack_dashboard/templates/403.html
+@@ -1,6 +1,5 @@
+ {% extends "base.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block title %} - {% trans "Forbidden" %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/templates/404.html
++++ horizon-8.0.0/openstack_dashboard/templates/404.html
+@@ -1,6 +1,5 @@
+ {% extends "base.html" %}
+ {% load i18n %}
+-{% load url from future %}
+
+ {% block title %} - {% trans "Page Not Found" %}{% endblock %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/templates/_header.html
++++ horizon-8.0.0/openstack_dashboard/templates/_header.html
+@@ -1,5 +1,4 @@
+ {% load branding i18n %}
+-{% load url from future %}
+ {% load context_selection %}
+
+ <nav class="navbar navbar-default">
+--- horizon-8.0.0.orig/openstack_dashboard/templates/context_selection/_project_list.html
++++ horizon-8.0.0/openstack_dashboard/templates/context_selection/_project_list.html
+@@ -1,5 +1,4 @@
+ {% load i18n %}
+-{% load url from future %}
+
+ {% with dashboard_url=request.horizon.dashboard.get_absolute_url %}
+ <ul>
+--- horizon-8.0.0.orig/openstack_dashboard/templates/context_selection/_region_list.html
++++ horizon-8.0.0/openstack_dashboard/templates/context_selection/_region_list.html
+@@ -1,5 +1,4 @@
+ {% load i18n %}
+-{% load url from future %}
+
+ {% with panel_url=request.horizon.panel.get_absolute_url %}
+ <ul>
+--- horizon-8.0.0.orig/openstack_dashboard/templates/horizon/_script_i18n.html
++++ horizon-8.0.0/openstack_dashboard/templates/horizon/_script_i18n.html
+@@ -1,3 +1,2 @@
+-{% load url from future %}
+ {% comment %} Django's JavaScript i18n Implementation {% endcomment %}
+ <script type="text/javascript" src="{% url 'horizon:jsi18n' 'horizon+openstack_dashboard' %}"></script>
+--- horizon-8.0.0.orig/openstack_dashboard/templates/horizon/_scripts.html
++++ horizon-8.0.0/openstack_dashboard/templates/horizon/_scripts.html
+@@ -1,5 +1,4 @@
+ {% load compress %}
+-{% load url from future %}
+ {% load firstof from future %}
+ {% load datepicker_locale from horizon %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/themes/material/templates/_header.html
++++ horizon-8.0.0/openstack_dashboard/themes/material/templates/_header.html
+@@ -1,5 +1,4 @@
+ {% load branding i18n %}
+-{% load url from future %}
+ {% load context_selection %}
+ {% load compress %}
+
+--- horizon-8.0.0.orig/openstack_dashboard/themes/material/templates/horizon/_sidebar.html
++++ horizon-8.0.0/openstack_dashboard/themes/material/templates/horizon/_sidebar.html
+@@ -1,5 +1,4 @@
+ {% load horizon i18n %}
+-{% load url from future %}
+
+ <div class="sidebar-wrapper">
+ <ul id="sidebar-drawer" class="nav nav-pills nav-stacked">
Code Review / openstack-build / horizon-build.git / commitdiff