From cfb4f1bc6a45ddfc068acabc6efb9a4e350dd544 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 28 Apr 2011 14:46:36 -0500 Subject: isotests: make the various pages a bit more useful Instructions are nice, as are links to other pages that actually flow with the style of the rest of the site. Also fix the styling of the labels on the results entry page as it looked a bit funky before. Signed-off-by: Dan McGee --- isotests/views.py | 2 ++ media/archweb.css | 3 +++ templates/isotests/add.html | 17 +++++++----- templates/isotests/result_list.html | 53 ++++++++++++++++++++++--------------- templates/isotests/results.html | 41 +++++++++++++++++----------- 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 %} -Go back to results -

Arch Releng Testbuild Feedback Entry

-
{% csrf_token %} - {{ form.as_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 + results page.

+ +
{% csrf_token %} + {{ form.as_p }} + +
+
{% 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 %} -Go back to results -Give feedback -
-

- Results for : +

Results for: {% if option %} {{ option }}: {{ value }} {% endif %} - - {% if iso_name %} - {{ iso_name }} - {% endif %} + {{ iso_name|default:"" }}

- - - - - - - {% for test in test_list %} - - - - - - {% endfor %} +

Go back to testing results

+ +
isonicknamesuccess?
{{ test.iso.name }}{{ test.user_name }}{{ test.success|yesno }}
+ + + + + + + + + + {% for test in test_list %} + + + + + + + {% endfor %} +
IsoSubmitted ByDate SubmittedSuccess
{{ test.iso.name }}{{ test.user_name }}{{ test.created|date }}{{ test.success|yesno }}
+{% load cdn %}{% jquery %} + + + {% 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 %} -Give feedback -
-

Arch Releng Testbuild Feedback results

+

Release Engineering Testbuild Results

+ +

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 give feedback + if you have tested and used any ISOs. Both successful and failed results + are encouraged and welcome.

+ +

All ISOs referenced on this page are available from + {{ iso_url }}.

+ {% if architecture_list %} @@ -44,7 +53,7 @@ {% endif %} {% if iso_type_list %} @@ -78,7 +87,7 @@ {% endif %} {% if boot_type_list %} @@ -112,7 +121,7 @@ {% endif %} {% if hardware_type_list %} @@ -146,7 +155,7 @@ {% endif %} {% if install_type_list %} @@ -180,7 +189,7 @@ {% endif %} {% if source_list %} @@ -214,7 +223,7 @@ {% endif %} {% if clock_choices_list %} @@ -248,7 +257,7 @@ {% endif %} {% if filesystem_list %} @@ -282,7 +291,7 @@ {% endif %} {% if module_list %} @@ -316,7 +325,7 @@ {% endif %} {% if filesystem_list %} @@ -350,7 +359,7 @@ {% endif %} {% if module_list %} @@ -384,7 +393,7 @@ {% endif %} {% 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 %} -Go back to results -Give more feedback -

Thanks!

- Thank you for taking the time to give us this information! - Your results have been succesfully added to our database. +

Thank you for taking the time to give us this information! + Your results have been succesfully added to our database.

+

You can now go back to the results, + or give more feedback.

{% endblock %} -- cgit v1.2.3-55-g3dc8
-

image arch

+

Architecture
-

image type

+

Image Type
-

image boot

+

Boot Type
-

hardware type

+

Hardware Type
-

install type

+

Install Type
-

source selection

+

Source Selection
-

clock

+

Clock Choice
-

partitioning/filesystems

+

Partitioning & Filesystems
-

fancy stuff

+

Fancy Stuff
-

rollback: partitioning/filesystems

+

Rollback: Partitioning & Filesystems
-

rollback: fancy stuff

+

Rollback: Fancy Stuff
-

bootloader

+

Bootloader