Commit 8e10699d authored by Dan McGee's avatar Dan McGee
Browse files

Use 'url from future' everywhere



The old-style url template tag disappears in Django 1.5, so we can and
should convert to the new-style tag now.

Signed-off-by: default avatarDan McGee <dan@archlinux.org>
parent 90e08b48
<!DOCTYPE html>
{% load url from future %}<!DOCTYPE html>
<html lang="en">
<head>
<title>{% block title %}Arch Linux{% endblock %}</title>
......@@ -10,7 +10,7 @@
<link rel="apple-touch-icon" href="{{ STATIC_URL }}logos/apple-touch-icon-57x57.png" />
<link rel="apple-touch-icon" sizes="72x72" href="{{ STATIC_URL }}logos/apple-touch-icon-72x72.png" />
<link rel="apple-touch-icon" sizes="114x114" href="{{ STATIC_URL }}logos/apple-touch-icon-114x114.png" />
<link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch-packages as osp %}{{ osp }}" title="Arch Linux Packages" />
<link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch-packages' as osp %}{{ osp }}" title="Arch Linux Packages" />
{% block head %}{% endblock %}
</head>
<body class="{% if user.is_authenticated %}devmode {% endif %}{% block bodyclass %}{% endblock %}">
......@@ -25,7 +25,7 @@
<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
<li id="anb-download"><a href="{% url page-download as pdl %}{{ pdl }}" title="Get Arch Linux">Download</a></li>
<li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get Arch Linux">Download</a></li>
</ul>
</div>
</div><!-- #archnavbar -->
......@@ -34,20 +34,20 @@
<div id="archdev-navbar">
{% if user.is_authenticated %}
<ul>
<li><a href="{% url devel-index %}" title="Developer Dashboard">Dashboard</a></li>
<li><a href="{% url 'devel-index' %}" title="Developer Dashboard">Dashboard</a></li>
<li><a href="https://wiki.archlinux.org/index.php/DeveloperWiki"
title="Developer Wiki">DevWiki</a></li>
<li><a href="{% url news-list as newsl %}{{ newsl }}" title="Manage news articles">News</a></li>
<li><a href="{% url 'news-list' as newsl %}{{ newsl }}" title="Manage news articles">News</a></li>
<li><a href="/packages/signoffs/" title="Package signoffs">Signoffs</a></li>
<li><a href="/todo/" title="Developer todo lists">Todos</a></li>
<li><a href="{% url devel-clocks %}" title="Developer world clocks">Dev Clocks</a></li>
<li><a href="{% url 'devel-clocks' %}" title="Developer world clocks">Dev Clocks</a></li>
<li><a href="https://mailman.archlinux.org/mailman/private/arch-dev/"
title="arch-dev mailing list archives">Archives</a></li>
<li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li>
<li><a href="https://stats.archlinux.org/munin/"
title="Arch server monitoring">Server Monitoring</a></li>
{% if user.is_staff %}
<li><a href="{% url admin:index %}" title="Django Admin Interface">Django Admin</a></li>
<li><a href="{% url 'admin:index' %}" title="Django Admin Interface">Django Admin</a></li>
{% endif %}
<li><a href="/devel/profile/" title="Modify your account profile">Profile</a></li>
<li><a href="/logout/" title="Logout of the developer interface">Logout</a></li>
......
{% extends "base.html" %}
{% load cache cdn %}
{% load url from future %}
{% block title %}Arch Linux - Downloads{% endblock %}
{% block navbarclass %}anb-download{% endblock %}
......@@ -43,7 +44,7 @@ <h3>Existing Arch Users</h3>
<p>If you are an existing Arch user, there is no need to download a new ISO
to update your existing system. You may be looking for
<a href="{% url mirrorlist %}">an updated mirrorlist</a> instead.</p>
<a href="{% url 'mirrorlist' %}">an updated mirrorlist</a> instead.</p>
<h3>BitTorrent Download (recommended)</h3>
......@@ -125,7 +126,7 @@ <h3>Test ISO Info</h3>
<li><a href="{{ releng_pxeboot_url }}"
title="Arch Linux Netboot Live System">Boot latest snapshots over the network</a>
<img width="16" height="16" src="{% cdnprefix %}/media/new.png" alt="New"/></li>
<li><a href="{% url releng-test-overview %}"
<li><a href="{% url 'releng-test-overview' %}"
title="Release Engineering ISO feedback">Feedback</a></li>
</ul>
......
{% extends "base.html" %}
{% load markup cache cdn %}
{% load url from future %}
{% block head %}
<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="/feeds/news/" />
......@@ -30,13 +31,13 @@ <h2>A simple, lightweight distribution</h2>
title="Arch Wiki">wiki</a>
if you want to learn more about Arch.</p>
<p class="readmore"><a href="{% url page-about %}"
<p class="readmore"><a href="{% url 'page-about' %}"
title="Learn more about Arch Linux">Learn more...</a></p>
</div>
<div id="news">
<h3>
<a href="{% url news-list %}" title="Browse the news archives">Latest News</a>
<a href="{% url 'news-list' %}" title="Browse the news archives">Latest News</a>
<span class="arrow"></span>
</h3>
......@@ -57,7 +58,7 @@ <h4>
{% else %}
{% if forloop.counter0 == 5 %}
<h3>
<a href="{% url news-list %}"
<a href="{% url 'news-list' %}"
title="Browse the news archives">Older News</a>
<span class="arrow"></span>
</h3>
......@@ -137,7 +138,7 @@ <h4>Community</h4>
<h4>Support</h4>
<ul>
<li><a href="{% url page-donate %}" title="Help support Arch Linux">Donate</a></li>
<li><a href="{% url 'page-donate' %}" title="Help support Arch Linux">Donate</a></li>
<li><a href="http://schwag.archlinux.ca/"
title="USB keys, jewellery, case badges">Arch Schwag</a></li>
<li><a href="http://www.zazzle.com/archlinux*"
......@@ -149,9 +150,9 @@ <h4>Support</h4>
<h4>Tools</h4>
<ul>
<li><a href="{% url mirrorlist %}"
<li><a href="{% url 'mirrorlist' %}"
title="Get a custom mirrorlist from our database">Mirrorlist Updater</a></li>
<li><a href="{% url mirror-status %}"
<li><a href="{% url 'mirror-status' %}"
title="Check the status of all known mirrors">Mirror Status</a></li>
<li><a href="/packages/differences/"
title="See differences in packages between available architectures">Differences Reports</a>
......@@ -163,7 +164,7 @@ <h4>Development</h4>
<ul>
<li><a href="http://projects.archlinux.org/"
title="Official Arch projects (git)">Projects in Git</a></li>
<li><a href="{% url page-svn %}"
<li><a href="{% url 'page-svn' %}"
title="View SVN entries for packages">SVN Repositories</a></li>
<li><a href="https://wiki.archlinux.org/index.php/DeveloperWiki"
title="Developer Wiki articles">Developer Wiki</a></li>
......@@ -171,9 +172,9 @@ <h4>Development</h4>
title="View the available package groups">Package Groups</a></li>
<li><a href="/todolists/"
title="Developer Todo Lists">Todo Lists</a></li>
<li><a href="{% url releng-test-overview %}"
<li><a href="{% url 'releng-test-overview' %}"
title="Releng Testbuild Feedback">Releng Testbuild Feedback</a></li>
<li><a href="{% url visualize-index %}"
<li><a href="{% url 'visualize-index' %}"
title="View visualizations">Visualizations</a>
<img width="16" height="16" src="{% cdnprefix %}/media/new.png" alt="New"/></li>
</ul>
......@@ -181,17 +182,17 @@ <h4>Development</h4>
<h4>More Resources</h4>
<ul>
<li><a href="{% url page-keys %}"
<li><a href="{% url 'page-keys' %}"
title="Package/Database signing master keys">Signing Master Keys</a>
<img width="16" height="16" src="{% cdnprefix %}/media/new.png" alt="New"/></li>
<li><a href="https://wiki.archlinux.org/index.php/Arch_Linux_Press_Review"
title="Arch Linux in the media">Press Coverage</a></li>
<li><a href="{% url page-art %}" title="Arch logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
<li><a href="{% url news-list %}" title="News Archives">News Archives</a></li>
<li><a href="{% url 'page-art' %}" title="Arch logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
<li><a href="{% url 'news-list' %}" title="News Archives">News Archives</a></li>
<li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
<li><a href="{% url page-devs %}" title="Active developers">Developer Profiles</a></li>
<li><a href="{% url page-tus %}" title="Active Trusted Users (TUs)">Trusted User Profiles</a></li>
<li><a href="{% url page-fellows %}" title="Retired Developers">Fellows Profiles</a></li>
<li><a href="{% url 'page-devs' %}" title="Active developers">Developer Profiles</a></li>
<li><a href="{% url 'page-tus' %}" title="Active Trusted Users (TUs)">Trusted User Profiles</a></li>
<li><a href="{% url 'page-fellows' %}" title="Retired Developers">Fellows Profiles</a></li>
</ul>
</div>
......
{% extends "base.html" %}
{% load url from future %}
{% block title %}Arch Linux - Test Result Entry{% endblock %}
......@@ -13,7 +14,7 @@ <h2>Arch Releng Testbuild Feedback Entry</h2>
installation properly. Some options require you to check several things (such as
config files), this will be mentioned alongside the option.</p>
<p>There is also an overview of all feedback on the
<a href="{% url releng-test-overview %}">results page</a>. Once we have
<a href="{% url 'releng-test-overview' %}">results page</a>. Once we have
builds that are properly tested (enough successful feedback for all
important features of the ISO or a slightly earlier ISO), we can release new
official media.</p>
......
{% extends "base.html" %}
{% load url from future %}
{% block content %}
<div class="box">
<h2>Failures and Successes for Testing ISOs</h2>
<p><a href="{% url releng-test-overview %}">Go back to testing results</a></p>
<p><a href="{% url 'releng-test-overview' %}">Go back to testing results</a></p>
<table id="releng-result" class="results">
<thead>
......
{% extends "base.html" %}
{% load url from future %}
{% block content %}
<div class="box">
......@@ -7,7 +8,7 @@ <h2>Results for:
{{ iso_name|default:"" }}
</h2>
<p><a href="{% url releng-test-overview %}">Go back to testing results</a></p>
<p><a href="{% url 'releng-test-overview' %}">Go back to testing results</a></p>
<table id="releng-result" class="results">
<thead>
......
{% load url from future %}
<tr>
<th>{% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}</td>
<th>Last Success</th>
......@@ -6,20 +7,20 @@
{% for item in option.values %}
<tr>
<td>
<a href="{% url releng-results-for option.name|lower item.value.pk %}">
<a href="{% url 'releng-results-for' option.name|lower item.value.pk %}">
{{ item.value.name|lower }}
</a>
</td>
<td>
{% if item.success %}
<a href="{% url releng-results-iso item.success.pk %}">
<a href="{% url 'releng-results-iso' item.success.pk %}">
{{ item.success.name }}
</a>
{% else %}Never succeeded{% endif %}
</td>
<td>
{% if item.failure %}
<a href="{% url releng-results-iso item.failure.pk %}">
<a href="{% url 'releng-results-iso' item.failure.pk %}">
{{ item.failure.name }}
</a>
{% else %}Never failed{% endif %}
......
{% extends "base.html" %}
{% load url from future %}
{% block title %}Arch Linux - Release Engineering Testbuild Results{% endblock %}
......@@ -9,12 +10,12 @@ <h2>Release Engineering Testbuild Results</h2>
<p>This is an overview screen showing a test results matrix of release
engineering produced ISOs. Various options and configurations are shown
with last success and last failure results, if known. To help improve ISO
quality, you are encouraged to <a href="{% url releng-test-submit %}">give feedback</a>
quality, you are encouraged to <a href="{% url 'releng-test-submit' %}">give feedback</a>
if you have tested and used any ISOs. Both successful and failed results
are encouraged and welcome.</p>
<p>For a overview of which ISOs tested best, have a look at
the <a href="{% url releng-iso-overview %}">overview</a>.</p>
the <a href="{% url 'releng-iso-overview' %}">overview</a>.</p>
<p>For more information, see the <a
href="https://wiki.archlinux.org/index.php/DeveloperWiki:releng_testimages_feedback">documentation
......
{% extends "base.html" %}
{% load url from future %}
{% block title %}Arch Linux - Feedback - Thanks!{% endblock %}
......@@ -7,9 +8,9 @@
<h2>Thanks!</h2>
<p>Thank you for taking the time to give us this information!
Your results have been succesfully added to our database.</p>
<p>You can now <a href="{% url releng-test-overview %}">go back to the results</a>,
<a href="{% url releng-test-submit %}">give more feedback</a>, or
have a look at the <a href="{% url releng-iso-overview %}">look at
<p>You can now <a href="{% url 'releng-test-overview' %}">go back to the results</a>,
<a href="{% url 'releng-test-submit' %}">give more feedback</a>, or
have a look at the <a href="{% url 'releng-iso-overview' %}">look at
the ISO test overview</a>.</p>
</div>
{% endblock %}
{% extends "base.html" %}
{% load url from future %}
{% block title %}Arch Linux - Visualizations{% endblock %}
......@@ -34,11 +35,11 @@ <h2>Visualization of PGP Master and Signing Keys</h2>
<script type="text/javascript">
$(document).ready(function() {
var orderings = {
"repo": { url: "{% url visualize-byrepo %}", color_attr: "repo" },
"arch": { url: "{% url visualize-byarch %}", color_attr: "arch" },
"repo": { url: "{% url 'visualize-byrepo' %}", color_attr: "repo" },
"arch": { url: "{% url 'visualize-byarch' %}", color_attr: "arch" },
};
packages_treemap("#visualize-archrepo", orderings, "repo");
developer_keys("#visualize-keys", "{% url visualize-pgp_keys %}");
developer_keys("#visualize-keys", "{% url 'visualize-pgp_keys' %}");
});
</script>
{% endblock %}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment