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

8 files changed, 104 insertions, 12 deletions

diff --git a/templates/releng/add.html b/templates/releng/add.html
index ec3b6d8a..80afda80 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 
 {% block title %}{{ BRANDING_DISTRONAME }} - Test Result Entry{% endblock %}
 
diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html
index 447ba487..196f0c0a 100644
--- a/templates/releng/iso_overview.html
+++ b/templates/releng/iso_overview.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
-{% load url from future %}
 
 {% block content %}
 <div class="box">
@@ -37,8 +36,7 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
new file mode 100644
index 00000000..09507536
--- /dev/null
+++ b/templates/releng/release_detail.html
@@ -0,0 +1,46 @@
+{% extends "base.html" %}
+
+{% block title %}Arch Linux - Release: {{ release.version }}{% endblock %}
+
+{% block content %}
+<div class="release box">
+    <h2>{{ release.version }}</h2>
+
+    <ul>
+        <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="{% 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 %}
+        {% 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 %}
+        <li><strong>Download Size:</strong> {% if release.file_size %}{{ release.file_size|filesizeformat }}{% else %}Unknown{% endif %}</li>
+    </ul>
+
+    {% if release.info %}
+    <h3>Release Notes</h3>
+
+    <div class="article-content">{{ release.info_html }}</div>
+    {% endif %}
+
+    {% if release.torrent_data %}{% with release.torrent as torrent %}
+    <h3>Torrent Information</h3>
+
+    <ul>
+        <li><strong>Comment:</strong> {{ torrent.comment }}</li>
+        <li><strong>Creation Date:</strong> {{ torrent.creation_date|date:"DATETIME_FORMAT" }} UTC</li>
+        <li><strong>Created By:</strong> {{ torrent.created_by }}</li>
+        <li><strong>Announce URL:</strong> {{ torrent.announce }}</li>
+        <li><strong>File Name:</strong> {{ torrent.file_name }}</li>
+        <li><strong>File Length:</strong> {{ torrent.file_length|filesizeformat }}</li>
+        <li><strong>Piece Count:</strong> {{ torrent.piece_count }} pieces</li>
+        <li><strong>Piece Length:</strong> {{ torrent.piece_length|filesizeformat }}</li>
+        <li><strong>Computed Info Hash:</strong> {{ torrent.info_hash }}</li>
+        <li><strong>URL List Length:</strong> {{ torrent.url_list|length }} URLs</li>
+    </ul>
+    {% endwith %}{% endif %}
+</div>
+{% endblock %}
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
new file mode 100644
index 00000000..5f248264
--- /dev/null
+++ b/templates/releng/release_list.html
@@ -0,0 +1,54 @@
+{% extends "base.html" %}
+{% load static from staticfiles %}
+
+{% block title %}Arch Linux - Releases{% endblock %}
+
+{% block head %}
+<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="/feeds/releases/" />
+{% endblock %}
+
+{% block content %}
+<div id="release-list" class="box">
+    <h2>Releases</h2>
+
+    <table id="release-table" class="results">
+        <thead>
+            <tr>
+                <th>Release Date</th>
+                <th>Version</th>
+                <th>Kernel Version</th>
+                <th>Available?</th>
+                <th>Torrent</th>
+                <th>Magnet</th>
+                <th>Download Size</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for item in release_list %}
+            <tr class="{% cycle 'odd' 'even' %}">
+                <td>{{ item.release_date|date }}</td>
+                <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="{% 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>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $(".results").tablesorter({
+        widgets: ['zebra'],
+        sortList: [[0,1], [1,1]],
+        headers: { 4: { sorter: false }, 5: { sorter: false } }
+    });
+});
+</script>
+{% endblock %}
diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html
index 207a8ba3..67e5934d 100644
--- a/templates/releng/result_list.html
+++ b/templates/releng/result_list.html
@@ -1,12 +1,11 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
-{% load url from future %}
 
 {% block content %}
 <div class="box">
     <h2>Results for:
         {% if option %}{{ option.verbose_name|title }}: {{ value }}{% endif %}
-        {{ iso_name|default:"" }}
+        {% if iso_name %}{{ iso_name|default:"" }}{% endif %}
     </h2>
 
     <p><a href="{% url 'releng-test-overview' %}">Go back to testing results</a></p>
@@ -34,8 +33,7 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/templates/releng/result_section.html b/templates/releng/result_section.html
index 91a75613..5e0b6f62 100644
--- a/templates/releng/result_section.html
+++ b/templates/releng/result_section.html
@@ -1,6 +1,5 @@
-{% load url from future %}
 <tr>
-    <th>{% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}</td>
+    <th>{% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}</th>
     <th>Last Success</th>
     <th>Last Failure</th>
 </tr>
diff --git a/templates/releng/results.html b/templates/releng/results.html
index df98d1ac..71a31fef 100644
--- a/templates/releng/results.html
+++ b/templates/releng/results.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 {% load wiki %}
 
 {% block title %}{{ BRANDING_DISTRONAME }} - Release Engineering Testbuild Results{% endblock %}
diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html
index 1ad7260d..b772fad3 100644
--- a/templates/releng/thanks.html
+++ b/templates/releng/thanks.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 
 {% block title %}{{ BRANDING_DISTRONAME }} - Feedback - Thanks!{% endblock %}