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, 46 insertions, 0 deletions

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 %}