From 1547c7c49a1852852ffbac0737d0ffdf54addda9 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 1 Mar 2011 18:47:03 +0100 Subject: isotests: entry and listing of release engineering tests Add a new project for entry and listing of testing results for our release ISOs. This will assist the release engineering team with determining a good ISO to make into the real deal. Signed-off-by: Dan McGee --- templates/isotests/add.html | 13 +++++++++++++ templates/isotests/iso_list.html | 18 ++++++++++++++++++ templates/isotests/test_list.html | 18 ++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 templates/isotests/add.html create mode 100644 templates/isotests/iso_list.html create mode 100644 templates/isotests/test_list.html (limited to 'templates') diff --git a/templates/isotests/add.html b/templates/isotests/add.html new file mode 100644 index 0000000..07d3ed8 --- /dev/null +++ b/templates/isotests/add.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} + +{% block title %}Arch Linux - Test Result Entry{% endblock %} + +{% block content %} +
+

Arch releng iso build test result entry

+
{% csrf_token %} + {{ form.as_p }} + +
+
+{% endblock %} diff --git a/templates/isotests/iso_list.html b/templates/isotests/iso_list.html new file mode 100644 index 0000000..f94bbe1 --- /dev/null +++ b/templates/isotests/iso_list.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block title %}Arch Linux - Testresults{% endblock %} + +{% block content %} +{% if object_list %} +
+

Arch releng iso buid test results

+
    + {% for iso in object_list %} +
  • {{ iso }}
    • + {% endfor %} +
+ {% else %} +

No tests are available.

+ {% endif %} +
+{% endblock %} diff --git a/templates/isotests/test_list.html b/templates/isotests/test_list.html new file mode 100644 index 0000000..1ef39a4 --- /dev/null +++ b/templates/isotests/test_list.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block title %}Arch Linux - Testresults{% endblock %} + +{% block content %} +
+

Arch releng iso build test results

+ {% if object_list %} + + {% else %} +

No test results are available.

+ {% endif %} +
+{% endblock %} -- cgit v1.2.3-24-g4f1b From f4229daac60fa90cbf8d77bfdffd88a467869b3c Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 1 Mar 2011 20:43:37 +0100 Subject: isotests: view updates, choices->models, show results, admin * Started changing the view portion * Changed choices to models * Show the latest failed/succeeded tests on results page * Added some more admin pages Signed-off-by: Dan McGee --- templates/isotests/results.html | 190 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 templates/isotests/results.html (limited to 'templates') diff --git a/templates/isotests/results.html b/templates/isotests/results.html new file mode 100644 index 0000000..3e43ae4 --- /dev/null +++ b/templates/isotests/results.html @@ -0,0 +1,190 @@ +{% extends "base.html" %} + +{% block title %}Arch Linux - Testresults{% endblock %} + +{% block content %} +
+

Arch releng iso build test results

+ + + + + {% if arch_choices %} + {% for arch in arch_choices %} + + + + + + {% endfor %} + {% endif %} + + + + {% if isotype_choices %} + {% for isotype in isotype_choices %} + + + + + + {% endfor %} + {% endif %} + + + + {% if boottype_choices %} + {% for boottype in boottype_choices %} + + + + + + {% endfor %} + {% endif %} + + + + {% if hardware_list %} + {% for hardware in hardware_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if installtype_list %} + {% for installtype in installtype_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if source_list %} + {% for source in source_list %} + + + + + + {% endfor %} + {% endif %} + + + + {% if clock_choices %} + {% for clock in clock_choices %} + + + + + + {% 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

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

image type

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

image boot

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

hardware type

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

install type

+
{{ installtype.name }}{{ installtype.get_success_test|default_if_none:"Never succeeded" }}{{ installtype.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.name }}{{ clock.get_success_test|default_if_none:"Never succeeded" }}{{ clock.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" }}
+
+{% endblock %} -- cgit v1.2.3-24-g4f1b From 00e096ddf0654d32e67ac8bc47f3de01ed7e740b Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 28 Apr 2011 13:00:27 -0500 Subject: isotests: style cleanup, ui improvements * Using radio buttons for widgets is smarter. * Model names cleanup. * Test.ms: totally un-descriptive field name, should be modules. * models, Iso: Likely need more than a date field here. Removed date and added name. * get_success_test/get_failed_test: now on abstract superclass * tests.py: I wasn't using these, so I might as well remove it. * admin.py: convention is not to use * imports. * models.py: "# Create your models here." -> not needed. * urls.py: I wasn't using info_dict anymore; I had a blank second pattern definition, and I should follow indentation patterns from elsewhere in the project. * views.py, add: switched to using mostly direct_to_template to avoid some of the boilerplate. * isotest/templates: was old, not used. * I had 4 + 1 templates, but only two views- these other ones were old, unnecessary and not wired up. Signed-off-by: Dan McGee --- templates/isotests/iso_list.html | 18 -- templates/isotests/results.html | 364 +++++++++++++++++++------------------- templates/isotests/test_list.html | 18 -- 3 files changed, 182 insertions(+), 218 deletions(-) delete mode 100644 templates/isotests/iso_list.html delete mode 100644 templates/isotests/test_list.html (limited to 'templates') diff --git a/templates/isotests/iso_list.html b/templates/isotests/iso_list.html deleted file mode 100644 index f94bbe1..0000000 --- a/templates/isotests/iso_list.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Arch Linux - Testresults{% endblock %} - -{% block content %} -{% if object_list %} -
-

Arch releng iso buid test results

-
    - {% for iso in object_list %} -
  • {{ iso }}
    • - {% endfor %} -
- {% else %} -

No tests are available.

- {% endif %} -
-{% endblock %} diff --git a/templates/isotests/results.html b/templates/isotests/results.html index 3e43ae4..b773056 100644 --- a/templates/isotests/results.html +++ b/templates/isotests/results.html @@ -4,187 +4,187 @@ {% block content %}
-

Arch releng iso build test results

- - - - - {% if arch_choices %} - {% for arch in arch_choices %} - - - - - - {% endfor %} - {% endif %} - - - - {% if isotype_choices %} - {% for isotype in isotype_choices %} - - - - - - {% endfor %} - {% endif %} - - - - {% if boottype_choices %} - {% for boottype in boottype_choices %} - - - - - - {% endfor %} - {% endif %} - - - - {% if hardware_list %} - {% for hardware in hardware_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if installtype_list %} - {% for installtype in installtype_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if source_list %} - {% for source in source_list %} - - - - - - {% endfor %} - {% endif %} - - - - {% if clock_choices %} - {% for clock in clock_choices %} - - - - - - {% 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

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

image type

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

image boot

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

hardware type

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

install type

-
{{ installtype.name }}{{ installtype.get_success_test|default_if_none:"Never succeeded" }}{{ installtype.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.name }}{{ clock.get_success_test|default_if_none:"Never succeeded" }}{{ clock.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 }}{{ 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" }}
{% endblock %} diff --git a/templates/isotests/test_list.html b/templates/isotests/test_list.html deleted file mode 100644 index 1ef39a4..0000000 --- a/templates/isotests/test_list.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Arch Linux - Testresults{% endblock %} - -{% block content %} -
-

Arch releng iso build test results

- {% if object_list %} - - {% else %} -

No test results are available.

- {% endif %} -
-{% endblock %} -- cgit v1.2.3-24-g4f1b 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 07d3ed8..466beb8 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 0000000..06042b1 --- /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 b773056..5d605e8 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 0000000..aa4fea2 --- /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 132412f..aa65121 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -119,6 +119,8 @@ title="Arch communities in your native language">International Communities
  • Related Projects
    • +
  • Releng-testbuild-feedback

    • Support

    -- cgit v1.2.3-24-g4f1b From 1ea5be1a0693d8f24b5d147092fd4a15c7fdd4a7 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 28 Apr 2011 13:11:44 -0500 Subject: isotests: Cleaned up the page titles and syncisos command Signed-off-by: Dan McGee --- templates/isotests/add.html | 2 +- templates/isotests/results.html | 2 +- templates/public/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/isotests/add.html b/templates/isotests/add.html index 466beb8..b173720 100644 --- a/templates/isotests/add.html +++ b/templates/isotests/add.html @@ -6,7 +6,7 @@ Go back to results
    -

    Arch releng iso build test result entry

    +

    Arch Releng Testbuild Feedback Entry

    {% csrf_token %} {{ form.as_p }} diff --git a/templates/isotests/results.html b/templates/isotests/results.html index 5d605e8..8cd4711 100644 --- a/templates/isotests/results.html +++ b/templates/isotests/results.html @@ -6,7 +6,7 @@ Give feedback
    -

    Arch releng iso build test results

    +

    Arch Releng Testbuild Feedback results

    - - -{% for item in option.values %} - - - - - -{% endfor %} diff --git a/templates/isotests/results.html b/templates/isotests/results.html deleted file mode 100644 index 033fdbf..0000000 --- a/templates/isotests/results.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Arch Linux - Release Engineering Testbuild Results{% endblock %} - -{% block content %} -
    -

    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 }}.

    - -
    diff --git a/templates/public/index.html b/templates/public/index.html index aa65121..773d478 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -120,7 +120,7 @@
  • Related Projects
  • Releng-testbuild-feedback
    • + title="Releng Testbuild Feedback">Releng Testbuild Feedback

    Support

    -- cgit v1.2.3-24-g4f1b 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 --- templates/isotests/add.html | 17 +++++++----- templates/isotests/result_list.html | 53 ++++++++++++++++++++++--------------- templates/isotests/results.html | 41 +++++++++++++++++----------- templates/isotests/thanks.html | 9 +++---- 4 files changed, 71 insertions(+), 49 deletions(-) (limited to 'templates') diff --git a/templates/isotests/add.html b/templates/isotests/add.html index b173720..dadcdd1 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 06042b1..ac0475b 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 8cd4711..d883512 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 aa4fea2..8929c0d 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-24-g4f1b From 1ff9c0fc5db1aab393eed5751e94ed8ac127c0c2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 28 Apr 2011 17:44:43 -0500 Subject: isotests: massive overview refactor Copy pasted code sucks. Fix it. Also, ensure 500 errors aren't going to be popping up when people start typing invalid URLs for fun, among a lot of other small fixes going in here. Signed-off-by: Dan McGee --- templates/isotests/result_list.html | 4 +- templates/isotests/result_section.html | 26 +++ templates/isotests/results.html | 411 +-------------------------------- 3 files changed, 30 insertions(+), 411 deletions(-) create mode 100644 templates/isotests/result_section.html (limited to 'templates') diff --git a/templates/isotests/result_list.html b/templates/isotests/result_list.html index ac0475b..29ad19e 100644 --- a/templates/isotests/result_list.html +++ b/templates/isotests/result_list.html @@ -3,9 +3,7 @@ {% block content %}

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

    diff --git a/templates/isotests/result_section.html b/templates/isotests/result_section.html new file mode 100644 index 0000000..52f0333 --- /dev/null +++ b/templates/isotests/result_section.html @@ -0,0 +1,26 @@ +
     + + +{% for item in option.values %} + + + + + +{% endfor %} diff --git a/templates/isotests/results.html b/templates/isotests/results.html index d883512..033fdbf 100644 --- a/templates/isotests/results.html +++ b/templates/isotests/results.html @@ -9,7 +9,7 @@

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

    @@ -17,414 +17,9 @@ {{ iso_url }}.

    -

    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

    {% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}

    + + {{ item.value.name|lower }} + + + {% if item.success %} + + {{ item.success.name }} + + {% else %}Never succeeded{% endif %} + + {% if item.failure %} + + {{ item.failure.name }} + + {% else %}Never failed{% endif %} +
    - - - - {% if architecture_list %} - {% for architecture in architecture_list %} - - - - - + {% for option in options %} + {% include "isotests/result_section.html" %} {% 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 %}
    -

    Architecture

    -
    - - {{ 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 %} -
    -

    Boot Type

    -
    - - {{ 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 Choice

    -
    - - {{ 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 %} -- cgit v1.2.3-24-g4f1b From 11962fab9da3839564fb132109267b8cd6feb6ac Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 28 Apr 2011 17:52:16 -0500 Subject: Remove more hardcoded isotests links Signed-off-by: Dan McGee --- templates/isotests/add.html | 2 +- templates/isotests/result_list.html | 2 +- templates/isotests/thanks.html | 4 ++-- templates/public/index.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'templates') diff --git a/templates/isotests/add.html b/templates/isotests/add.html index dadcdd1..3678532 100644 --- a/templates/isotests/add.html +++ b/templates/isotests/add.html @@ -9,7 +9,7 @@

    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.

    + results page.

    {% csrf_token %} {{ form.as_p }} diff --git a/templates/isotests/result_list.html b/templates/isotests/result_list.html index 29ad19e..b3ae025 100644 --- a/templates/isotests/result_list.html +++ b/templates/isotests/result_list.html @@ -7,7 +7,7 @@ {{ iso_name|default:"" }} -

    Go back to testing results

    +

    Go back to testing results

    diff --git a/templates/isotests/thanks.html b/templates/isotests/thanks.html index 8929c0d..b261426 100644 --- a/templates/isotests/thanks.html +++ b/templates/isotests/thanks.html @@ -7,7 +7,7 @@

    Thanks!

    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.

    +

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

    {% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index 773d478..5b79a1f 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -119,7 +119,7 @@ title="Arch communities in your native language">International Communities
  • Related Projects
    • -
  • Releng Testbuild Feedback
    • -- cgit v1.2.3-24-g4f1b From bfe6afcd7ac5ae7b6f07caa7b02a33fec710ebda Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 28 Apr 2011 17:58:13 -0500 Subject: Rename isotests to releng Signed-off-by: Dan McGee --- templates/isotests/add.html | 20 ----------------- templates/isotests/result_list.html | 41 ---------------------------------- templates/isotests/result_section.html | 26 --------------------- templates/isotests/results.html | 25 --------------------- templates/isotests/thanks.html | 13 ----------- templates/releng/add.html | 20 +++++++++++++++++ templates/releng/result_list.html | 41 ++++++++++++++++++++++++++++++++++ templates/releng/result_section.html | 26 +++++++++++++++++++++ templates/releng/results.html | 25 +++++++++++++++++++++ templates/releng/thanks.html | 13 +++++++++++ 10 files changed, 125 insertions(+), 125 deletions(-) delete mode 100644 templates/isotests/add.html delete mode 100644 templates/isotests/result_list.html delete mode 100644 templates/isotests/result_section.html delete mode 100644 templates/isotests/results.html delete mode 100644 templates/isotests/thanks.html create mode 100644 templates/releng/add.html create mode 100644 templates/releng/result_list.html create mode 100644 templates/releng/result_section.html create mode 100644 templates/releng/results.html create mode 100644 templates/releng/thanks.html (limited to 'templates') diff --git a/templates/isotests/add.html b/templates/isotests/add.html deleted file mode 100644 index 3678532..0000000 --- a/templates/isotests/add.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Arch Linux - Test Result Entry{% endblock %} - -{% block content %} -
    -

    Arch Releng Testbuild Feedback Entry

    - -

    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 deleted file mode 100644 index b3ae025..0000000 --- a/templates/isotests/result_list.html +++ /dev/null @@ -1,41 +0,0 @@ -{% extends "base.html" %} - -{% block content %} -
    -

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

    - -

    Go back to testing results

    - -
    - - - - - - - - - - {% 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/result_section.html b/templates/isotests/result_section.html deleted file mode 100644 index 52f0333..0000000 --- a/templates/isotests/result_section.html +++ /dev/null @@ -1,26 +0,0 @@ -

    {% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}

    - - {{ item.value.name|lower }} - - - {% if item.success %} - - {{ item.success.name }} - - {% else %}Never succeeded{% endif %} - - {% if item.failure %} - - {{ item.failure.name }} - - {% else %}Never failed{% endif %} -
    - {% for option in options %} - {% include "isotests/result_section.html" %} - {% endfor %} -
    -
    -{% endblock %} diff --git a/templates/isotests/thanks.html b/templates/isotests/thanks.html deleted file mode 100644 index b261426..0000000 --- a/templates/isotests/thanks.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Arch Linux - Feedback - Thanks!{% endblock %} - -{% block content %} -
    -

    Thanks!

    -

    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 %} diff --git a/templates/releng/add.html b/templates/releng/add.html new file mode 100644 index 0000000..3678532 --- /dev/null +++ b/templates/releng/add.html @@ -0,0 +1,20 @@ +{% extends "base.html" %} + +{% block title %}Arch Linux - Test Result Entry{% endblock %} + +{% block content %} +
    +

    Arch Releng Testbuild Feedback Entry

    + +

    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/releng/result_list.html b/templates/releng/result_list.html new file mode 100644 index 0000000..b3ae025 --- /dev/null +++ b/templates/releng/result_list.html @@ -0,0 +1,41 @@ +{% extends "base.html" %} + +{% block content %} +
    +

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

    + +

    Go back to testing results

    + + + + + + + + + + + + {% 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/releng/result_section.html b/templates/releng/result_section.html new file mode 100644 index 0000000..52f0333 --- /dev/null +++ b/templates/releng/result_section.html @@ -0,0 +1,26 @@ + +

    {% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}

    + +{% for item in option.values %} + + + + {{ item.value.name|lower }} + + + + {% if item.success %} + + {{ item.success.name }} + + {% else %}Never succeeded{% endif %} + + + {% if item.failure %} + + {{ item.failure.name }} + + {% else %}Never failed{% endif %} + + +{% endfor %} diff --git a/templates/releng/results.html b/templates/releng/results.html new file mode 100644 index 0000000..4aca1f1 --- /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 %} +
    +

    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 }}.

    + + + {% for option in options %} + {% include "releng/result_section.html" %} + {% endfor %} +
    +
    +{% endblock %} diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html new file mode 100644 index 0000000..b261426 --- /dev/null +++ b/templates/releng/thanks.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} + +{% block title %}Arch Linux - Feedback - Thanks!{% endblock %} + +{% block content %} +
    +

    Thanks!

    +

    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-24-g4f1b