From f7331a0eca351300685ebee494e810d8c82c35b1 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 20 Nov 2012 19:16:25 -0600
Subject: Add Release model to releng

This should prevent the need for monthly template updates from Pierre
and Thomas; best to just let them enter the data themselves and have it
show up on the website.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/public/download.html | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'templates')

diff --git a/templates/public/download.html b/templates/public/download.html
index 2fddd4e..d0754e5 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -7,7 +7,6 @@
 {% block navbarclass %}anb-download{% endblock %}
 
 {% block content %}
-{% with version="2012.11.01" kernel_version="3.6.4" torrent_infohash="f86f84c74edc90336f94f0837afa3071ada2aaa8" %}
 <div id="arch-downloads" class="box">
 
     <h2>Arch Linux Downloads</h2>
@@ -20,8 +19,8 @@
     can always be updated with `pacman -Syu`.</p>
 
     <ul>
-        <li><strong>Current Release:</strong> {{ version }}</li>
-        <li><strong>Included Kernel:</strong> {{ kernel_version }}</li>
+        <li><strong>Current Release:</strong> {{ release.version }}</li>
+        <li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>
         <li><a href="https://wiki.archlinux.org/index.php/Installation_Guide">Installation Guide</a></li>
         <li><strong>Resources:</strong>
             <ul>
@@ -45,9 +44,9 @@
     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>
     <ul>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-dual.iso.torrent"
-                    title="Download for both architectures">Download archlinux-{{version}}-dual.iso.torrent</a>
-            (<a href="magnet:?xt=urn:btih:{{torrent_infohash}}&amp;dn=archlinux-{{version}}-dual.iso&amp;tr=udp://tracker.archlinux.org:6969&amp;tr=http://tracker.archlinux.org:6969/announce">Magnet</a>)</li>
+        <li><a href="https://www.archlinux.org/iso/{{ release.version }}/archlinux-{{ release.version }}-dual.iso.torrent"
+                    title="Download for both architectures">Download archlinux-{{ release.version }}-dual.iso.torrent</a>
+                (<a href="magnet:?{% if release.torrent_infohash %}xt=urn:btih:{{ release.torrent_infohash }}&amp;{% endif %}dn=archlinux-{{ release.version }}-dual.iso&amp;tr=udp://tracker.archlinux.org:6969&amp;tr=http://tracker.archlinux.org:6969/announce">Magnet</a>)</li>
     </ul>
 
     <h3>Netboot</h3>
@@ -70,11 +69,11 @@
     <p>File integrity checksums for the latest releases can be found below:</p>
 
     <ul>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-dual.iso.sig"
+        <li><a href="https://www.archlinux.org/iso/{{ release.version }}/archlinux-{{ release.version }}-dual.iso.sig"
             title="Get the latest PGP signature">PGP signature</a></li>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/sha1sums.txt"
+        <li><a href="https://www.archlinux.org/iso/{{ release.version }}/sha1sums.txt"
             title="Get the latest SHA1 checksums">SHA1 checksums</a></li>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/md5sums.txt"
+        <li><a href="https://www.archlinux.org/iso/{{ release.version }}/md5sums.txt"
             title="Get the latest MD5 checksums">MD5 checksums</a></li>
     </ul>
 
@@ -86,8 +85,8 @@
         {% else %}<h5>Worldwide</h5>{% endif %}
         <ul>
             {% for mirror_url in country.list %}
-            <li><a href="{{ mirror_url.url }}iso/{{ version }}/"
-                title="Download from {{ mirror_url.url }}iso/{{ version }}/">{{ mirror_url.mirror.name }}</a></li>
+            <li><a href="{{ mirror_url.url }}iso/{{ release.version }}/"
+                title="Download from {{ mirror_url.url }}iso/{{ release.version }}/">{{ mirror_url.mirror.name }}</a></li>
             {% endfor %}
         </ul>
         {% endfor %}
@@ -98,5 +97,4 @@
     instructions listed <a href="https://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.</p>
 
 </div>
-{% endwith %}
 {% endblock %}
-- 
cgit v1.2.3-24-g4f1b