summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-01-28 22:27:44 +0100
committerDan McGee <dan@archlinux.org>2013-01-28 22:27:44 +0100
commita471316a58a9c62b869696fe36d72abcbf9f2ab1 (patch)
tree411d625c73ffc6d29722fda3b5c41699a77ae36f /templates
parentbc539b6ed174fed1545aabaa4ceb7a7f925cbbed (diff)
downloadarchweb-a471316a58a9c62b869696fe36d72abcbf9f2ab1.tar.gz
archweb-a471316a58a9c62b869696fe36d72abcbf9f2ab1.tar.xz
Use torrent view and checksums where appropriate
We no longer need to link externally to these items since we have all the data available in the web application now. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'templates')
-rw-r--r--templates/public/download.html12
-rw-r--r--templates/releng/release_detail.html5
-rw-r--r--templates/releng/release_list.html2
3 files changed, 10 insertions, 9 deletions
diff --git a/templates/public/download.html b/templates/public/download.html
index 2949084..f385ea2 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -56,8 +56,8 @@
<p>If you can spare the bytes, please leave the client open after your
download is finished, so you can seed it back to others.
<em>A web-seed capable client is recommended for fastest download speeds.</em></p>
- <p><a href="https://www.archlinux.org/{{ release.iso_url }}.torrent"
- title="Download for both architectures">Download torrent for {{ release.version }}</a>
+ <p><a href="{% url 'releng-release-torrent' release.version %}"
+ title="Download torrent">Download torrent for {{ release.version }}</a>
(<a href="{{ release.magnet_uri }}">Magnet</a>)
{% if release.file_size %}({{ release.file_size|filesizeformat }}){% endif %}
</p>
@@ -81,11 +81,9 @@
<ul>
<li><a href="https://www.archlinux.org/{{ release.iso_url }}.sig"
- title="Get the latest PGP signature">PGP signature</a></li>
- <li><a href="https://www.archlinux.org/{{ release.dir_path }}sha1sums.txt"
- title="Get the latest SHA1 checksums">SHA1 checksums</a></li>
- <li><a href="https://www.archlinux.org/{{ release.dir_path }}md5sums.txt"
- title="Get the latest MD5 checksums">MD5 checksums</a></li>
+ title="PGP signature">PGP signature</a></li>
+ {% if release.md5_sum %}<li><strong>MD5:</strong> {{ release.md5_sum }}</li>{% endif %}
+ {% if release.sha1_sum %}<li><strong>SHA1:</strong> {{ release.sha1_sum }}</li>{% endif %}
</ul>
{% cache 600 download-mirrors %}
diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
index ea54be6..01c0319 100644
--- a/templates/releng/release_detail.html
+++ b/templates/releng/release_detail.html
@@ -1,4 +1,6 @@
{% extends "base.html" %}
+{% load url from future %}
+
{% block title %}Arch Linux - Release: {{ release.version }}{% endblock %}
{% block content %}
@@ -9,7 +11,8 @@
<li><strong>Release Date:</strong> {{ release.release_date|date }}</li>
{% if release.kernel_version %}<li><strong>Kernel Version:</strong> {{ release.kernel_version }}</li>{% endif %}
<li><strong>Available:</strong> {{ release.available|yesno }}</li>
- {% if release.available %}<li><strong>Download:</strong> <a href="https://www.archlinux.org/{{ release.iso_url }}.torrent"
+ {% if release.available %}<li><strong>Download:</strong> <a
+ href="{% url 'releng-release-torrent' release.version %}"
title="Download torrent for {{ release.version }}">Torrent</a>,
<a href="{{ release.magnet_uri }}">Magnet</a></li>{% endif %}
{% if release.torrent_infohash %}<li><strong>Torrent Info Hash:</strong> {{ release.torrent_infohash }}</li>{% endif %}
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index 8400854..ef53a93 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -31,7 +31,7 @@
<td><a href="{{ item.get_absolute_url }}" title="Release details for {{ item.version }}">{{ item.version }}</a></td>
<td>{{ item.kernel_version|default:"" }}</td>
<td class="available-{{ item.available|yesno }}">{{ item.available|yesno|capfirst }}</td>
- <td>{% if item.available %}<a href="https://www.archlinux.org/{{ item.iso_url }}.torrent"
+ <td>{% if item.available %}<a href="{% url 'releng-release-torrent' item.version %}"
title="Download torrent for {{ item.version }}">Torrent</a>{% endif %}</td>
<td>{% if item.available %}<a href="{{ item.magnet_uri }}">Magnet</a>{% endif %}</td>
<td>{% if item.file_size %}{{ item.file_size|filesizeformat }}{% endif %}</td>