diff options
| -rw-r--r-- | isotests/views.py | 2 | ||||
| -rw-r--r-- | media/archweb.css | 3 | ||||
| -rw-r--r-- | templates/isotests/add.html | 17 | ||||
| -rw-r--r-- | templates/isotests/result_list.html | 53 | ||||
| -rw-r--r-- | templates/isotests/results.html | 41 | ||||
| -rw-r--r-- | templates/isotests/thanks.html | 9 |
6 files changed, 76 insertions, 49 deletions
diff --git a/isotests/views.py b/isotests/views.py index 0bb92356..1d118d3a 100644 --- a/isotests/views.py +++ b/isotests/views.py @@ -1,4 +1,5 @@ from django import forms +from django.conf import settings from django.http import HttpResponseRedirect from django.views.generic.simple import direct_to_template @@ -80,6 +81,7 @@ def view_results(request): 'filesystem_list': filesystem_list, 'module_list': module_list, 'bootloader_list': bootloader_list, + 'iso_url': settings.ISO_LIST_URL, } return direct_to_template(request, 'isotests/results.html', context) diff --git a/media/archweb.css b/media/archweb.css index 4b0b9e89..936edc79 100644 --- a/media/archweb.css +++ b/media/archweb.css @@ -260,6 +260,9 @@ ul.admin-actions li { display: inline; padding-left: 1.5em; } #dev-signoffs .signoff-no { color: red; } #dev-signoffs .signed-username { color: #888; margin-left: 0.5em; } +/* iso testing feedback form */ +#releng-feedback label { width: auto; display: inline; font-weight: normal; } + /* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a { color: white !important; } #archnavbar.anb-packages ul li#anb-packages a { color: white !important; } diff --git a/templates/isotests/add.html b/templates/isotests/add.html index b173720f..dadcdd10 100644 --- a/templates/isotests/add.html +++ b/templates/isotests/add.html @@ -3,13 +3,18 @@ {% block title %}Arch Linux - Test Result Entry{% endblock %} {% block content %} -<a href="/isotests/">Go back to results</a> - <div class="box"> <h2>Arch Releng Testbuild Feedback Entry</h2> - <form action="" method="post">{% csrf_token %} - {{ form.as_p }} - <input type="submit" value="Submit" /> - </form> + + <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="/isotests/">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/isotests/result_list.html b/templates/isotests/result_list.html index 06042b1c..ac0475b6 100644 --- a/templates/isotests/result_list.html +++ b/templates/isotests/result_list.html @@ -1,34 +1,43 @@ {% extends "base.html" %} {% block content %} -<a href="/isotests/">Go back to results</a> -<a href="/isotests/add/">Give feedback</a> - <div class="box"> - <h2> - Results for : + <h2>Results for: {% if option %} {{ option }}: {{ value }} {% endif %} - - {% if iso_name %} - {{ iso_name }} - {% endif %} + {{ iso_name|default:"" }} </h2> - <table> - <tr> - <th>iso</th> - <th>nickname</th> - <th>success?</th> - </tr> - {% for test in test_list %} - <tr> - <td>{{ test.iso.name }}</td> - <td>{{ test.user_name }}</td> - <td>{{ test.success|yesno }}</td> - </tr> - {% endfor %} + <p><a href="/isotests/">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/isotests/results.html b/templates/isotests/results.html index 8cd47119..d8835121 100644 --- a/templates/isotests/results.html +++ b/templates/isotests/results.html @@ -1,16 +1,25 @@ {% extends "base.html" %} -{% block title %}Arch Linux - Testresults{% endblock %} +{% block title %}Arch Linux - Release Engineering Testbuild Results{% endblock %} {% block content %} -<a href="/isotests/add/">Give feedback</a> - <div class="box"> - <h2>Arch Releng Testbuild Feedback results</h2> + <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="/isotests/add/">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> <tr> <td> - <h3>image arch</h3> + <h3>Architecture</h3> </td> </tr> {% if architecture_list %} @@ -44,7 +53,7 @@ {% endif %} <tr> <td> - <h3>image type</h3> + <h3>Image Type</h3> </td> </tr> {% if iso_type_list %} @@ -78,7 +87,7 @@ {% endif %} <tr> <td> - <h3>image boot</h3> + <h3>Boot Type</h3> </td> </tr> {% if boot_type_list %} @@ -112,7 +121,7 @@ {% endif %} <tr> <td> - <h3>hardware type</h3> + <h3>Hardware Type</h3> </td> </tr> {% if hardware_type_list %} @@ -146,7 +155,7 @@ {% endif %} <tr> <td> - <h3>install type</h3> + <h3>Install Type</h3> </td> </tr> {% if install_type_list %} @@ -180,7 +189,7 @@ {% endif %} <tr> <td> - <h3>source selection</h3> + <h3>Source Selection</h3> </td> </tr> {% if source_list %} @@ -214,7 +223,7 @@ {% endif %} <tr> <td> - <h3>clock</h3> + <h3>Clock Choice</h3> </td> </tr> {% if clock_choices_list %} @@ -248,7 +257,7 @@ {% endif %} <tr> <td> - <h3>partitioning/filesystems</h3> + <h3>Partitioning & Filesystems</h3> </td> </tr> {% if filesystem_list %} @@ -282,7 +291,7 @@ {% endif %} <tr> <td> - <h3>fancy stuff</h3> + <h3>Fancy Stuff</h3> </td> </tr> {% if module_list %} @@ -316,7 +325,7 @@ {% endif %} <tr> <td> - <h4>rollback: partitioning/filesystems</h4> + <h3>Rollback: Partitioning & Filesystems</h3> </td> </tr> {% if filesystem_list %} @@ -350,7 +359,7 @@ {% endif %} <tr> <td> - <h4>rollback: fancy stuff</h4> + <h3>Rollback: Fancy Stuff</h4> </td> </tr> {% if module_list %} @@ -384,7 +393,7 @@ {% endif %} <tr> <td> - <h3>bootloader</h3> + <h3>Bootloader</h3> </td> </tr> {% if bootloader_list %} diff --git a/templates/isotests/thanks.html b/templates/isotests/thanks.html index aa4fea24..8929c0db 100644 --- a/templates/isotests/thanks.html +++ b/templates/isotests/thanks.html @@ -3,12 +3,11 @@ {% block title %}Arch Linux - Feedback - Thanks!{% endblock %} {% block content %} -<a href="/isotests/">Go back to results</a> -<a href="/isotests/add">Give more feedback</a> - <div class="box"> <h2>Thanks!</h2> - Thank you for taking the time to give us this information! - Your results have been succesfully added to our database. + <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="/isotests/">go back to the results</a>, + or <a href="/isotests/add/">give more feedback</a>.</p> </div> {% endblock %} |