summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-02-26 18:45:14 -0600
committerDan McGee <dan@archlinux.org>2013-02-26 18:45:14 -0600
commitf85cc0482a44ced9aed372b8972d31040ed4043b (patch)
treef0790247018bfa5c243fff623f917d7a7a8bf0cf /templates
parent1457f78594a25f8cfb8ad1f9b3cd6d071a3d6a93 (diff)
parenta25cc4ff459ab0070ce48730f6c6fdc227860f08 (diff)
Merge branch 'django-1.5'
Conflicts: requirements.txt requirements_prod.txt
Diffstat (limited to 'templates')
-rw-r--r--templates/base.html2
-rw-r--r--templates/packages/removed.html1
-rw-r--r--templates/public/download.html1
-rw-r--r--templates/public/index.html1
-rw-r--r--templates/public/keys.html1
-rw-r--r--templates/releng/add.html1
-rw-r--r--templates/releng/iso_overview.html1
-rw-r--r--templates/releng/release_detail.html1
-rw-r--r--templates/releng/release_list.html1
-rw-r--r--templates/releng/result_list.html1
-rw-r--r--templates/releng/result_section.html1
-rw-r--r--templates/releng/results.html1
-rw-r--r--templates/releng/thanks.html1
-rw-r--r--templates/visualize/index.html1
14 files changed, 1 insertions, 14 deletions
diff --git a/templates/base.html b/templates/base.html
index cc507fbf..15bb7e28 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,4 +1,4 @@
-{% load url from future %}{% load static from staticfiles %}<!DOCTYPE html>
+{% load static from staticfiles %}<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
diff --git a/templates/packages/removed.html b/templates/packages/removed.html
index ea20ce80..f188b6db 100644
--- a/templates/packages/removed.html
+++ b/templates/packages/removed.html
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load url from future %}
{% load package_extras %}
{% block title %}Arch Linux - Not Available - {{ name }} {{ version }} ({{ arch.name }}){% endblock %}
diff --git a/templates/public/download.html b/templates/public/download.html
index c68cf66b..7936efb5 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
{% load cache %}
-{% load url from future %}
{% load static from staticfiles %}
{% load flags %}
diff --git a/templates/public/index.html b/templates/public/index.html
index dad6a05b..abdb0277 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
{% load cache %}
-{% load url from future %}
{% load static from staticfiles %}
{% block head %}
diff --git a/templates/public/keys.html b/templates/public/keys.html
index ad2dd19d..91b53075 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
{% load static from staticfiles %}
-{% load url from future %}
{% load pgp %}
{% block title %}Arch Linux - Master Signing Keys{% endblock %}
diff --git a/templates/releng/add.html b/templates/releng/add.html
index ed02984e..d060395d 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load url from future %}
{% block title %}Arch Linux - Test Result Entry{% endblock %}
diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html
index 23ef0135..196f0c0a 100644
--- a/templates/releng/iso_overview.html
+++ b/templates/releng/iso_overview.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
{% load static from staticfiles %}
-{% load url from future %}
{% block content %}
<div class="box">
diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
index 01c0319e..09507536 100644
--- a/templates/releng/release_detail.html
+++ b/templates/releng/release_detail.html
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load url from future %}
{% block title %}Arch Linux - Release: {{ release.version }}{% endblock %}
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index ef53a93d..5f248264 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load url from future %}
{% load static from staticfiles %}
{% block title %}Arch Linux - Releases{% endblock %}
diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html
index f6a825dc..67e5934d 100644
--- a/templates/releng/result_list.html
+++ b/templates/releng/result_list.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
{% load static from staticfiles %}
-{% load url from future %}
{% block content %}
<div class="box">
diff --git a/templates/releng/result_section.html b/templates/releng/result_section.html
index ae951ebe..5e0b6f62 100644
--- a/templates/releng/result_section.html
+++ b/templates/releng/result_section.html
@@ -1,4 +1,3 @@
-{% load url from future %}
<tr>
<th>{% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}</th>
<th>Last Success</th>
diff --git a/templates/releng/results.html b/templates/releng/results.html
index c19b42a6..59d8351d 100644
--- a/templates/releng/results.html
+++ b/templates/releng/results.html
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load url from future %}
{% block title %}Arch Linux - Release Engineering Testbuild Results{% endblock %}
diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html
index 66d65a5c..2462dafd 100644
--- a/templates/releng/thanks.html
+++ b/templates/releng/thanks.html
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load url from future %}
{% block title %}Arch Linux - Feedback - Thanks!{% endblock %}
diff --git a/templates/visualize/index.html b/templates/visualize/index.html
index 1e932d9b..2b79d601 100644
--- a/templates/visualize/index.html
+++ b/templates/visualize/index.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
{% load static from staticfiles %}
-{% load url from future %}
{% block title %}Arch Linux - Visualizations{% endblock %}