Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	devel/views.py
	feeds.py
	templates/devel/index.html
	templates/packages/flag.html
	templates/public/index.html
	todolists/views.py
	urls.py

1 files changed, 29 insertions, 0 deletions

diff --git a/templates/releng/results.html b/templates/releng/results.html
new file mode 100644
index 00000000..c3e7d99a
--- /dev/null
+++ b/templates/releng/results.html
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block title %}Arch Linux - Release Engineering Testbuild Results{% endblock %}
+
+{% block content %}
+<div class="box">
+    <h2>Release Engineering Testbuild Results</h2>
+
+    <p>This is an overview screen showing a test results matrix of release
+    engineering produced ISOs. Various options and configurations are shown
+    with last success and last failure results, if known. To help improve ISO
+    quality, you are encouraged to <a href="{% url releng-test-submit %}">give feedback</a>
+    if you have tested and used any ISOs. Both successful and failed results
+    are encouraged and welcome.</p>
+
+    <p>For more information, see the <a
+    href="https://wiki.archlinux.org/index.php/DeveloperWiki:releng_testimages_feedback">documentation
+    on the wiki</a>.</p>
+
+    <p>All ISOs referenced on this page are available from
+    <a href="{{ iso_url }}">{{ iso_url }}</a>.</p>
+
+    <table>
+        {% for option in options %}
+        {% include "releng/result_section.html" %}
+        {% endfor %}
+    </table>
+</div>
+{% endblock %}