Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 37 insertions, 97 deletions

diff --git a/templates/public/download.html b/templates/public/download.html
index 70b27b73..01e46f66 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -1,28 +1,35 @@
 {% extends "base.html" %}
 {% load cache %}
-{% load url from future %}
 {% load static from staticfiles %}
+{% load flags %}
 {% load wiki %}
 
 {% block title %}{{ BRANDING_DISTRONAME }} - Downloads{% endblock %}
+
+{% block head %}
+<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />
+<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} Releases" href="/feeds/releases/" />
+{% endblock %}
+
 {% block navbarclass %}anb-download{% endblock %}
 
 {% block content %}
 <div id="arch-downloads" class="box">
 
-    <h2>Arch Linux Downloads</h2>
+    <h2>{{BRANDING_DISTRONAME}} Downloads</h2>
 
-    {% with "2011.08.19" as version %}
     <h3>Release Info</h3>
 
-    <p>All available images can be burned to a CD, mounted as an ISO file,
-    or be directly written to a USB stick using a utility like `dd`. These
-    are intended for new installations only; an existing Arch Linux system
+    <p>The image can be burned to a CD, mounted as an ISO file,
+    or be directly written to a USB stick using a utility like `dd`. It
+    is intended for new installations only; an existing {{BRANDING_DISTRONAME}} system
     can always be updated with `pacman -Syu`.</p>
 
     <ul>
-        <li><strong>Current Release:</strong> <a href="{% wiki_url 'DeveloperWiki:' %}{{ version }}">{{ version }}</a></li>
-        <li><strong>Included Kernel:</strong> 3.0.3</li>
+        {% if release.version %}<li><strong>Current Release:</strong> {{ release.version }}</li>{% endif %}
+        {% if release.kernel_version %}<li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>{% endif %}
+        {% if release.file_size %}<li><strong>ISO Size:</strong> {{ release.file_size|filesizeformat }}</li>{% endif %}
+        <li><a href="https://wiki.archlinux.org/index.php/Installation_Guide">Installation Guide</a></li>
         <li><strong>Resources:</strong>
             <ul>
                 <li><a href="https://bugs.archlinux.org/index.php?project=6"
@@ -33,14 +40,11 @@
         </li>
     </ul>
 
-    <p><strong>Links and Instructions:</strong></p>
+    {% if release.info %}
+    <h3>Release Notes</h3>
 
-    <ul id="download-help">
-        <li><a href="https://www.archlinux.org/iso/{{ version }}/README"
-            title="Official download instructions">Readme and Instructions</a></li>
-        <li><a href="{% wiki_url 'Install_Guide' %}"
-            title="Official Installation Guide">{{BRANDING_DISTRONAME}} Install Guide</a></li>
-    </ul>
+    <div class="article-content">{{ release.info_html }}</div>
+    {% endif %}
 
     <h3>Existing {{BRANDING_SHORTNAME}} Users</h3>
 
@@ -54,82 +58,19 @@
     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>
 
-    <table id="download-torrents" class="pretty1">
-        <thead>
-            <tr>
-                <th>Format</th>
-                <th class="cpu-arch">i686 CPU</th>
-                <th class="cpu-arch">x86-64 CPU</th>
-                <th class="cpu-arch">Dual Architecture</th>
-                <th>Description</th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <td>
-                    Netinstall Image
-                </td><td class="cpu-arch">
-                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-i686.iso.torrent" 
-                        title="Download for i686 architecture">Download</a>
-                </td><td class="cpu-arch">
-                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-x86_64.iso.torrent" 
-                    title="Download for x86-64 architecture">Download</a>
-                </td><td class="cpu-arch">
-                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-dual.iso.torrent" 
-                    title="Download for both architectures">Download</a>
-                </td><td class="wrap">
-                    Downloads and installs packages versions via mirrors for absolute freshness.
-                </td>
-            </tr><tr>
-                <td>
-                    Core Image
-                </td><td class="cpu-arch">
-                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-i686.iso.torrent" 
-                    title="Download for i686 architecture">Download</a>
-                </td><td class="cpu-arch">
-                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-x86_64.iso.torrent" 
-                    title="Download for x86-64 architecture">Download</a>
-                </td><td class="cpu-arch">
-                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-dual.iso.torrent" 
-                    title="Download for both architectures">Download</a>
-                </td><td class="wrap">
-                    Core packages are included on the media. Good for basic off-line installation.
-                </td>
-            </tr>
-        </tbody>
-    </table>
-
-    <h3>Get Arch Linux on CD</h3>
-
-    <p>The following suppliers donate a portion of their proceeds to the
-    Arch Linux project:</p>
-
-    <ul id="cd-vendors-donate">
-        <li><a href="http://www.osdisc.com/cgi-bin/view.cgi/products/linux/arch?affiliate=archlinux"
-            title="Purchase a CD from OSDisc">Purchase a CD from OSDisc</a></li>
-        <li><a href="http://www.shoplinuxonline.com/index.php?main_page=index&amp;cPath=1_46&amp;zenid=ecd15b48affe8976130bc575c1276ee4"
-            title="Purchase a CD from Shop Linux Online">Purchase a CD from Shop Linux Online</a></li>
-    </ul>
-
-    <p>Arch Linux CDs are also available for purchase from these suppliers:</p>
-
-    <ul id="cd-vendors">
-        <li><a href="http://www.linuxcd.org/view_distro.php?id_distro=48" 
-            title="Purchase a CD from LinuxCD">Purchase a CD from LinuxCD</a></li>
-    </ul>
+    {% if release %}<ul>
+        <li><a href="{{ release.magnet_uri }}"
+            title="Magnet link">Magnet link for {{ release.version }}</a></li>
+        <li><a href="{% url 'releng-release-torrent' release.version %}"
+            title="Download torrent">Torrent for {{ release.version }}</a></li>
+    </ul>{% endif %}
 
-    <h3>Test ISO Info</h3>
+    <h3>Netboot</h3>
 
-    <p>We provide daily snapshot ISOs. Those are largely untested,
-    but may be more up to date than the releases.</p>
+    <p>If you have a wired connection, you can boot the latest release directly over the network.</p>
     <ul>
-        <li><a href="{{ releng_iso_url }}"
-            title="Release Engineering ISO download">Download snapshots</a></li>
         <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="{% static "new.png" %}" alt="New"/></li>
-        <li><a href="{% url 'releng-test-overview' %}"
-            title="Release Engineering ISO feedback">Feedback</a></li>
+            title="{{BRANDING_DISTRONAME}} Netboot Live System">{{BRANDING_DISTRONAME}} Linux Netboot</a></li>
     </ul>
 
     <h3>HTTP Direct Downloads</h3>
@@ -144,30 +85,29 @@
     <p>File integrity checksums for the latest releases can be found below:</p>
 
     <ul>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/sha1sums.txt" 
-            title="Get the latest SHA1 checksums">SHA1 checksums</a></li>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/md5sums.txt" 
-            title="Get the latest MD5 checksums">MD5 checksums</a></li>
+        <li><a href="https://www.archlinux.org/{{ release.iso_url }}.sig"
+            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 %}
     <div id="download-mirrors">
-        {% regroup mirror_urls by real_country as grouped_urls %}
+        {% regroup mirror_urls by country as grouped_urls %}
         {% for country in grouped_urls %}
-        {% if country.grouper %}<h5><img src="{{ country.grouper.flag }}" alt=""/> {{ country.grouper.name }}</h5>
+        {% if country.grouper %}<h5>{% country_flag country.grouper %}{{ country.grouper.name }}</h5>
         {% 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 }}{{ release.dir_path }}"
+                title="Download from {{ mirror_url.url }}">{{ mirror_url.mirror.name }}</a></li>
             {% endfor %}
         </ul>
         {% endfor %}
     </div>
     {% endcache %}
-    {% endwith %}
 
-    <p>If you want to become an Official Arch Linux Mirror please follow the
+    <p>If you want to become an Official {{BRANDING_DISTRONAME}} Mirror please follow the
     instructions listed <a href="{% wiki_url 'DeveloperWiki:NewMirrors' %}">here</a>.</p>
 
 </div>