summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:57:27 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:57:27 -0500
commitdbb508b7222081b523ce3e0bd2b69f5fea6c7050 (patch)
treef5f3a97b9465504ed9e7633a0c385669b7463d3c /templates
parentfd788c5fcf9009540ad14a869dcebdfd30fb9d6f (diff)
parentb2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (diff)
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes Conflicts: templates/news/list.html templates/public/index.html
Diffstat (limited to 'templates')
-rw-r--r--templates/devel/clock.html1
-rw-r--r--templates/devel/index.html1
-rw-r--r--templates/devel/packages.html1
-rw-r--r--templates/devel/stats.html1
-rw-r--r--templates/mirrors/error_table.html1
-rw-r--r--templates/mirrors/mirror_details.html1
-rw-r--r--templates/mirrors/mirrors.html1
-rw-r--r--templates/mirrors/status_table.html1
-rw-r--r--templates/news/list.html2
-rw-r--r--templates/packages/differences.html1
-rw-r--r--templates/packages/groups.html1
-rw-r--r--templates/packages/packages_list.html1
-rw-r--r--templates/packages/search.html1
-rw-r--r--templates/packages/signoffs.html1
-rw-r--r--templates/packages/stale_relations.html1
-rw-r--r--templates/public/index.html4
-rw-r--r--templates/releng/release_list.html1
-rw-r--r--templates/todolists/list.html1
-rw-r--r--templates/todolists/view.html1
19 files changed, 21 insertions, 2 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index 5b2e358b..6ed890c1 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% load flags %}
{% load tz %}
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 919314c8..b6287110 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% load cache %}
{% load package_extras %}
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
index 51e98579..a67553bb 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% load attributes %}
{% load package_extras %}
diff --git a/templates/devel/stats.html b/templates/devel/stats.html
index 2dbe4755..9b3b1d28 100644
--- a/templates/devel/stats.html
+++ b/templates/devel/stats.html
@@ -1,3 +1,4 @@
+{% load cycle from future %}
{% load cache %}
{% cache 60 dev-dash-by-arch %}
diff --git a/templates/mirrors/error_table.html b/templates/mirrors/error_table.html
index 6054814f..cd7265af 100644
--- a/templates/mirrors/error_table.html
+++ b/templates/mirrors/error_table.html
@@ -1,3 +1,4 @@
+{% load cycle from future %}
{% load flags mirror_status %}
<table id="errorlog_mirrors" class="results">
<thead>
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index a06b81c1..5138f3b9 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% load mirror_status %}
{% load flags %}
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html
index 16c6fb3b..13701e5a 100644
--- a/templates/mirrors/mirrors.html
+++ b/templates/mirrors/mirrors.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% block title %}{{ BRANDING_DISTRONAME }} - Mirror Overview{% endblock %}
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index 28175420..6fc07a31 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -1,3 +1,4 @@
+{% load cycle from future %}
{% load flags mirror_status %}
<table id="{{ table_id }}" class="results">
<thead>
diff --git a/templates/news/list.html b/templates/news/list.html
index 3cd460ae..3295e333 100644
--- a/templates/news/list.html
+++ b/templates/news/list.html
@@ -1,4 +1,6 @@
{% extends "base.html" %}
+{% load cycle from future %}
+
{% block title %}{{ BRANDING_DISTRONAME }} - News{% endblock %}
{% block head %}
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index d5d782fb..0ff5e2ee 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% block title %}{{ BRANDING_DISTRONAME }} - Package Differences Reports{% endblock %}
diff --git a/templates/packages/groups.html b/templates/packages/groups.html
index c8f4aa5c..39a13389 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% block title %}{{ BRANDING_DISTRONAME }} - Package Groups{% if arch %} - {{ arch }}{% endif %}{% endblock %}
diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html
index 110634b6..9736d36c 100644
--- a/templates/packages/packages_list.html
+++ b/templates/packages/packages_list.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% load package_extras %}
diff --git a/templates/packages/search.html b/templates/packages/search.html
index e1d3ae30..074445d8 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load package_extras %}
{% block title %}{{ BRANDING_DISTRONAME }} - Package Database{% endblock %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 571cc32d..48202c60 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% load package_extras %}
diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index 233b2835..cd447a2e 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% block title %}{{ BRANDING_DISTRONAME }} - Stale Package Relations{% endblock %}
diff --git a/templates/public/index.html b/templates/public/index.html
index db14ee19..3a5d98d6 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -116,9 +116,9 @@
<li><a href="{% wiki_url %}"
title="Community documentation">Wiki</a></li>
<li><a href="{% wiki_url 'Installation Guide' %}"
- title="Official installation guide">Official Installation Guide</a></li>
+ title="Installation guide">Installation Guide</a></li>
<li><a href="{% wiki_url "Beginners'_Guide" %}"
- title="A good place to start for beginners">Unofficial Beginners' Guide</a></li>
+ title="A good place to start for beginners">Beginners' Guide</a></li>
<li><a href="{% wiki_url 'Migration' %}"
title="Free your Arch installation">Migration from Arch Linux</a></li>
</ul>
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index eb6f1d2c..79615640 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% block title %}{{ BRANDING_DISTRONAME }} - Releases{% endblock %}
diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index d950db94..0f1ccfd7 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% block title %}{{ BRANDING_DISTRONAME }} - Todo Lists{% endblock %}
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 28ce8580..5cc2be41 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% load package_extras %}
{% load todolists %}