From c292dcfc6bf96ebf5f34342beb1367aa5361f7c4 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 28 Apr 2011 13:19:42 -0500 Subject: isotests: various changes and updates * isotests/fixtures/clockchoices.json: changed 'default' to 'unchanged' * isotests/fixtures/filesystems.json: removed 'check the installed system' line from one of the options * isotests/fixtures/modules.json: added 'ext2','ext3','ext4','swap','xfs','jfs','reiserFS' * isotests/models.py: * Added RollbackOption abstract class that adds the functions get_rollback_success_test and get_rollback_failed_test on top of the IsoOption abstract class for use with the Filesystem and Module classes since Test uses these both in 2 ways (regular and rollback). This keeps them seperated. * renamed the related names of these properties from rollback_test to rollback_test_set (seems more in-tune with the other relations) * isotests/views.py: * changed the order of the fields, the automatic order makes no sense. * Added help texts to the fields success, filesystem, rollback_filesystem and rollback_modules. * Removed help text from modules (made no sense) * Added a website field, should remain empty, a simplistic way to hopefully reduce spambot entries. * templates/isotests/results.html: * Removed the rollback yes/no section * The rollback labels should check get_rollback_success_test and get_rollback_failed_test. * Rollback checkbox removed. * Clearly tell users that success must only be selected if everything works right. * Clearly tell users to only fill in the rollback options if they did a rollback. * Added a thanks page that tells people thanks. * Added links between the pages. * Added links to lists with tests of either a specific iso or of any iso where a specific option was selected. Signed-off-by: Dan McGee Conflicts: templates/isotests/results.html --- templates/isotests/add.html | 2 + templates/isotests/result_list.html | 34 +++ templates/isotests/results.html | 595 +++++++++++++++++++++++++----------- templates/isotests/thanks.html | 14 + templates/public/index.html | 2 + 5 files changed, 465 insertions(+), 182 deletions(-) create mode 100644 templates/isotests/result_list.html create mode 100644 templates/isotests/thanks.html (limited to 'templates') diff --git a/templates/isotests/add.html b/templates/isotests/add.html index 07d3ed81..466beb8c 100644 --- a/templates/isotests/add.html +++ b/templates/isotests/add.html @@ -3,6 +3,8 @@ {% block title %}Arch Linux - Test Result Entry{% endblock %} {% block content %} +Go back to results +

Arch releng iso build test result entry

{% csrf_token %} diff --git a/templates/isotests/result_list.html b/templates/isotests/result_list.html new file mode 100644 index 00000000..06042b1c --- /dev/null +++ b/templates/isotests/result_list.html @@ -0,0 +1,34 @@ +{% extends "base.html" %} + +{% block content %} +Go back to results +Give feedback + +
+

+ Results for : + {% if option %} + {{ option }}: {{ value }} + {% endif %} + + {% if iso_name %} + {{ iso_name }} + {% endif %} +

+ + + + + + + + {% for test in test_list %} + + + + + + {% endfor %} +
isonicknamesuccess?
{{ test.iso.name }}{{ test.user_name }}{{ test.success|yesno }}
+
+{% endblock %} diff --git a/templates/isotests/results.html b/templates/isotests/results.html index b773056a..5d605e87 100644 --- a/templates/isotests/results.html +++ b/templates/isotests/results.html @@ -3,188 +3,419 @@ {% block title %}Arch Linux - Testresults{% endblock %} {% block content %} +Give feedback +
-

Arch releng iso build test results

- - - - - {% if architecture_list %} - {% for architecture in architecture_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if iso_type_list %} - {% for iso_type in iso_type_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if boot_type_list %} - {% for boot_type in boot_type_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if hardware_type_list %} - {% for hardware_type in hardware_type_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if install_type_list %} - {% for install_type in install_type_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if source_list %} - {% for source in source_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if clock_choices_list %} - {% for clock_choice in clock_choices_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if filesystem_list %} - {% for filesystem in filesystem_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if module_list %} - {% for module in module_list %} - - - - - - {% endfor %} - {% endif %} - - - - - - - - - - - - - {% if filesystem_list %} - {% for filesystem in filesystem_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if module_list %} - {% for module in module_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if bootloader_list %} - {% for bootloader in bootloader_list %} - - - - - - {% endfor %} - {% endif %} -
-

image arch

-
{{ architecture.name }}{{ architecture.get_success_test|default_if_none:"Never succeeded" }}{{ architecture.get_failed_test|default_if_none:"Never failed" }}
-

image type

-
{{ iso_type.name }}{{ iso_type.get_success_test|default_if_none:"Never succeeded" }}{{ iso_type.get_failed_test|default_if_none:"Never failed" }}
-

image boot

-
{{ boot_type.name }}{{ boot_type.get_success_test|default_if_none:"Never succeeded" }}{{ boot_type.get_failed_test|default_if_none:"Never failed" }}
-

hardware type

-
{{ hardware_type.name }}{{ hardware_type.get_success_test|default_if_none:"Never succeeded" }}{{ hardware_type.get_failed_test|default_if_none:"Never failed" }}
-

install type

-
{{ install_type.name }}{{ install_type.get_success_test|default_if_none:"Never succeeded" }}{{ install_type.get_failed_test|default_if_none:"Never failed" }}
-

source selection

-
{{ source.name }}{{ source.get_success_test|default_if_none:"Never succeeded" }}{{ source.get_failed_test|default_if_none:"Never failed" }}
-

clock

-
{{ clock_choice.name }}{{ clock_choice.get_success_test|default_if_none:"Never succeeded" }}{{ clock_choice.get_failed_test|default_if_none:"Never failed" }}
-

partitioning/filesystems

-
{{ filesystem.name }}{{ filesystem.get_success_test|default_if_none:"Never succeeded" }}{{ filesystem.get_failed_test|default_if_none:"Never failed" }}
-

fancy stuff

-
{{ module.name }}{{ module.get_success_test|default_if_none:"Never succeeded" }}{{ module.get_failed_test|default_if_none:"Never failed" }}
-

rollback

-
yes
no
-

rollback: partitioning/filesystems

-
{{ filesystem.name }}{{ filesystem.get_success_test|default_if_none:"Never succeeded" }}{{ filesystem.get_failed_test|default_if_none:"Never failed" }}
-

rollback: fancy stuff

-
{{ module.name }}{{ module.get_success_test|default_if_none:"Never succeeded" }}{{ module.get_failed_test|default_if_none:"Never failed" }}
-

bootloader

-
{{ bootloader.name }}{{ bootloader.get_success_test|default_if_none:"Never succeeded" }}{{ bootloader.get_failed_test|default_if_none:"Never failed" }}
+

Arch releng iso build test results

+ + + + + {% if architecture_list %} + {% for architecture in architecture_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if iso_type_list %} + {% for iso_type in iso_type_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if boot_type_list %} + {% for boot_type in boot_type_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if hardware_type_list %} + {% for hardware_type in hardware_type_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if install_type_list %} + {% for install_type in install_type_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if source_list %} + {% for source in source_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if clock_choices_list %} + {% for clock_choice in clock_choices_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if filesystem_list %} + {% for filesystem in filesystem_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if module_list %} + {% for module in module_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if filesystem_list %} + {% for filesystem in filesystem_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if module_list %} + {% for module in module_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if bootloader_list %} + {% for bootloader in bootloader_list %} + + + + + + {% endfor %} + {% endif %} +
+

image arch

+
+ + {{ architecture.name }} + + + {% if architecture.get_success_test %} + + {{ architecture.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if architecture.get_failed_test %} + + {{ architecture.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

image type

+
+ + {{ iso_type.name }} + + + {% if iso_type.get_success_test %} + + {{ iso_type.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if iso_type.get_failed_test %} + + {{ iso_type.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

image boot

+
+ + {{ boot_type.name }} + + + {% if boot_type.get_success_test %} + + {{ boot_type.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if boot_type.get_failed_test %} + + {{ boot_type.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

hardware type

+
+ + {{ hardware_type.name }} + + + {% if hardware_type.get_success_test %} + + {{ hardware_type.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if hardware_type.get_failed_test %} + + {{ hardware_type.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

install type

+
+ + {{ install_type.name }} + + + {% if install_type.get_success_test %} + + {{ install_type.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if install_type.get_failed_test %} + + {{ install_type.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

source selection

+
+ + {{ source.name }} + + + {% if source.get_success_test %} + + {{ source.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if source.get_failed_test %} + + {{ source.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

clock

+
+ + {{ clock_choice.name }} + + + {% if clock_choice.get_success_test %} + + {{ clock_choice.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if clock_choice.get_failed_test %} + + {{ clock_choice.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

partitioning/filesystems

+
+ + {{ filesystem.name }} + + + {% if filesystem.get_success_test %} + + {{ filesystem.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if filesystem.get_failed_test %} + + {{ filesystem.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

fancy stuff

+
+ + {{ module.name }} + + + {% if module.get_success_test %} + + {{ module.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if module.get_failed_test %} + + {{ module.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

rollback: partitioning/filesystems

+
+ + {{ filesystem.name }} + + + {% if filesystem.get_rollback_success_test %} + + {{ filesystem.get_rollback_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if filesystem.get_rollback_failed_test %} + + {{ filesystem.get_rollback_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

rollback: fancy stuff

+
+ + {{ module.name }} + + + {% if module.get_rollback_success_test %} + + {{ module.get_rollback_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if module.get_rollback_failed_test %} + + {{ module.get_rollback_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
+

bootloader

+
+ + {{ bootloader.name }} + + + {% if bootloader.get_success_test %} + + {{ bootloader.get_success_test.name }} + + {% else %} + Never succeeded + {% endif %} + + {% if bootloader.get_failed_test %} + + {{ bootloader.get_failed_test.name }} + + {% else %} + Never failed + {% endif %} +
{% endblock %} diff --git a/templates/isotests/thanks.html b/templates/isotests/thanks.html new file mode 100644 index 00000000..aa4fea24 --- /dev/null +++ b/templates/isotests/thanks.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} + +{% 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. +
+{% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index 132412f6..aa651217 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -119,6 +119,8 @@

Community

title="Arch communities in your native language">International Communities
  • Related Projects
    • +
  • Releng-testbuild-feedback

    • Support

    -- cgit v1.2.3-54-g00ecf