Merge branch 'releng'

6 files changed, 127 insertions, 0 deletions

diff --git a/templates/public/index.html b/templates/public/index.html
index 132412f6..5b79a1fe 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -119,6 +119,8 @@
             title="Arch communities in your native language">International Communities</a></li>
         <li><a href="https://wiki.archlinux.org/index.php/Related_Projects"
             title="Projects that are in some way related to Arch Linux">Related Projects</a></li>
+		<li><a href="{% url releng-test-overview %}"
+            title="Releng Testbuild Feedback">Releng Testbuild Feedback</a></li>
     </ul>
 
     <h4>Support</h4>
diff --git a/templates/releng/add.html b/templates/releng/add.html
new file mode 100644
index 00000000..3678532d
--- /dev/null
+++ b/templates/releng/add.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+
+{% block title %}Arch Linux - Test Result Entry{% endblock %}
+
+{% block content %}
+<div class="box">
+    <h2>Arch Releng Testbuild Feedback Entry</h2>
+
+    <p>This page allows you to submit feedback after testing and using a
+    release engineering install ISO. If you do not currently have feedback to
+    submit, you may want to take a look at the current
+    <a href="{% url releng-test-overview %}">results page</a>.</p>
+
+    <div id="releng-feedback"> <form action="" method="post">{% csrf_token %}
+            {{ form.as_p }}
+            <input type="submit" value="Submit" />
+        </form>
+    </div>
+</div>
+{% endblock %}
diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html
new file mode 100644
index 00000000..b3ae025b
--- /dev/null
+++ b/templates/releng/result_list.html
@@ -0,0 +1,41 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="box">
+    <h2>Results for:
+        {% if option %}{{ option|title }}: {{ value }}{% endif %}
+        {{ iso_name|default:"" }}
+    </h2>
+
+    <p><a href="{% url releng-test-overview %}">Go back to testing results</a></p>
+
+    <table id="releng-result" class="results">
+        <thead>
+            <tr>
+                <th>Iso</th>
+                <th>Submitted By</th>
+                <th>Date Submitted</th>
+                <th>Success</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for test in test_list %}
+            <tr>
+                <td>{{ test.iso.name }}</td>
+                <td>{{ test.user_name }}</td>
+                <td>{{ test.created|date }}</td>
+                <td>{{ test.success|yesno }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $(".results:not(:has(tbody tr.empty))").tablesorter({widgets: ['zebra']});
+});
+</script>
+{% endblock %}
diff --git a/templates/releng/result_section.html b/templates/releng/result_section.html
new file mode 100644
index 00000000..52f03339
--- /dev/null
+++ b/templates/releng/result_section.html
@@ -0,0 +1,26 @@
+<tr>
+    <td><h3>{% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}</h3></td>
+</tr>
+{% for item in option.values %}
+<tr>
+    <td>
+        <a href="{% url releng-results-for option.name|lower item.value.pk %}">
+            {{ item.value.name|lower }}
+        </a>
+    </td>
+    <td>
+        {% if item.success %}
+        <a href="{% url releng-results-iso item.success.pk %}">
+            {{ item.success.name }}
+        </a>
+        {% else %}Never succeeded{% endif %}
+    </td>
+    <td>
+        {% if item.failure %}
+        <a href="{% url releng-results-iso item.failure.pk %}">
+            {{ item.failure.name }}
+        </a>
+        {% else %}Never failed{% endif %}
+    </td>
+</tr>
+{% endfor %}
diff --git a/templates/releng/results.html b/templates/releng/results.html
new file mode 100644
index 00000000..4aca1f10
--- /dev/null
+++ b/templates/releng/results.html
@@ -0,0 +1,25 @@
+{% 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 a 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>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 %}
diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html
new file mode 100644
index 00000000..b261426d
--- /dev/null
+++ b/templates/releng/thanks.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+{% block title %}Arch Linux - Feedback - Thanks!{% endblock %}
+
+{% block content %}
+<div class="box">
+    <h2>Thanks!</h2>
+    <p>Thank you for taking the time to give us this information!
+    Your results have been succesfully added to our database.</p>
+    <p>You can now <a href="{% url releng-test-overview %}">go back to the results</a>,
+    or <a href="{% url releng-test-submit %}">give more feedback</a>.</p>
+</div>
+{% endblock %}