summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-04-28 17:44:43 -0500
committerDan McGee <dan@archlinux.org>2011-04-28 17:53:22 -0500
commit1ff9c0fc5db1aab393eed5751e94ed8ac127c0c2 (patch)
tree97ae7328cb2b47593f3cc872ac9aa945e9aa1528 /templates
parent684fb5353d0e61075c7a24f703b680d58e8dcf00 (diff)
downloadarchweb-1ff9c0fc5db1aab393eed5751e94ed8ac127c0c2.tar.gz
archweb-1ff9c0fc5db1aab393eed5751e94ed8ac127c0c2.zip
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 <dan@archlinux.org>
Diffstat (limited to 'templates')
-rw-r--r--templates/isotests/result_list.html4
-rw-r--r--templates/isotests/result_section.html26
-rw-r--r--templates/isotests/results.html411
3 files changed, 30 insertions, 411 deletions
diff --git a/templates/isotests/result_list.html b/templates/isotests/result_list.html
index ac0475b6..29ad19ec 100644
--- a/templates/isotests/result_list.html
+++ b/templates/isotests/result_list.html
@@ -3,9 +3,7 @@
{% block content %}
<div class="box">
<h2>Results for:
- {% if option %}
- {{ option }}: {{ value }}
- {% endif %}
+ {% if option %}{{ option|title }}: {{ value }}{% endif %}
{{ iso_name|default:"" }}
</h2>
diff --git a/templates/isotests/result_section.html b/templates/isotests/result_section.html
new file mode 100644
index 00000000..52f03339
--- /dev/null
+++ b/templates/isotests/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/isotests/results.html b/templates/isotests/results.html
index d8835121..033fdbfe 100644
--- a/templates/isotests/results.html
+++ b/templates/isotests/results.html
@@ -9,7 +9,7 @@
<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>
+ 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>
@@ -17,414 +17,9 @@
<a href="{{ iso_url }}">{{ iso_url }}</a>.</p>
<table>
- <tr>
- <td>
- <h3>Architecture</h3>
- </td>
- </tr>
- {% if architecture_list %}
- {% for architecture in architecture_list %}
- <tr>
- <td>
- <a href="/isotests/results/architecture/{{ architecture.pk }}/">
- {{ architecture.name }}
- </a>
- </td>
- <td>
- {% if architecture.get_success_test %}
- <a href="/isotests/results/{{ architecture.get_success_test.pk }}/">
- {{ architecture.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if architecture.get_failed_test %}
- <a href="/isotests/results/{{ architecture.get_failed_test.pk }}/">
- {{ architecture.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
+ {% for option in options %}
+ {% include "isotests/result_section.html" %}
{% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Image Type</h3>
- </td>
- </tr>
- {% if iso_type_list %}
- {% for iso_type in iso_type_list %}
- <tr>
- <td>
- <a href="/isotests/results/iso_type/{{ iso_type.pk }}/">
- {{ iso_type.name }}
- </a>
- </td>
- <td>
- {% if iso_type.get_success_test %}
- <a href="/isotests/results/{{ iso_type.get_success_test.pk }}/">
- {{ iso_type.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if iso_type.get_failed_test %}
- <a href="/isotests/results/{{ iso_type.get_failed_test.pk }}/">
- {{ iso_type.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Boot Type</h3>
- </td>
- </tr>
- {% if boot_type_list %}
- {% for boot_type in boot_type_list %}
- <tr>
- <td>
- <a href="/isotests/results/boot_type/{{ boot_type.pk }}/">
- {{ boot_type.name }}
- </a>
- </td>
- <td>
- {% if boot_type.get_success_test %}
- <a href="/isotests/results/{{ boot_type.get_success_test.pk }}/">
- {{ boot_type.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if boot_type.get_failed_test %}
- <a href="/isotests/results/{{ boot_type.get_failed_test.pk }}/">
- {{ boot_type.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Hardware Type</h3>
- </td>
- </tr>
- {% if hardware_type_list %}
- {% for hardware_type in hardware_type_list %}
- <tr>
- <td>
- <a href="/isotests/results/hardware_type/{{ hardware_type.pk }}/">
- {{ hardware_type.name }}
- </a>
- </td>
- <td>
- {% if hardware_type.get_success_test %}
- <a href="/isotests/results/{{ hardware_type.get_success_test.pk }}/">
- {{ hardware_type.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if hardware_type.get_failed_test %}
- <a href="/isotests/results/{{ hardware_type.get_failed_test.pk }}/">
- {{ hardware_type.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Install Type</h3>
- </td>
- </tr>
- {% if install_type_list %}
- {% for install_type in install_type_list %}
- <tr>
- <td>
- <a href="/isotests/results/install_type/{{ install_type.pk }}/">
- {{ install_type.name }}
- </a>
- </td>
- <td>
- {% if install_type.get_success_test %}
- <a href="/isotests/results/{{ install_type.get_success_test.pk }}/">
- {{ install_type.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if install_type.get_failed_test %}
- <a href="/isotests/results/{{ install_type.get_failed_test.pk }}/">
- {{ install_type.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Source Selection</h3>
- </td>
- </tr>
- {% if source_list %}
- {% for source in source_list %}
- <tr>
- <td>
- <a href="/isotests/results/source/{{ source.pk }}/">
- {{ source.name }}
- </a>
- </td>
- <td>
- {% if source.get_success_test %}
- <a href="/isotests/results/{{ source.get_success_test.pk }}/">
- {{ source.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if source.get_failed_test %}
- <a href="/isotests/results/{{ source.get_failed_test.pk }}/">
- {{ source.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Clock Choice</h3>
- </td>
- </tr>
- {% if clock_choices_list %}
- {% for clock_choice in clock_choices_list %}
- <tr>
- <td>
- <a href="/isotests/results/clock_choice/{{ clock_choice.pk }}/">
- {{ clock_choice.name }}
- </a>
- </td>
- <td>
- {% if clock_choice.get_success_test %}
- <a href="/isotests/results/{{ clock_choice.get_success_test.pk }}/">
- {{ clock_choice.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if clock_choice.get_failed_test %}
- <a href="/isotests/results/{{ clock_choice.get_failed_test.pk }}/">
- {{ clock_choice.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Partitioning &amp; Filesystems</h3>
- </td>
- </tr>
- {% if filesystem_list %}
- {% for filesystem in filesystem_list %}
- <tr>
- <td>
- <a href="/isotests/results/filesystem/{{ filesystem.pk }}/">
- {{ filesystem.name }}
- </a>
- </td>
- <td>
- {% if filesystem.get_success_test %}
- <a href="/isotests/results/{{ filesystem.get_success_test.pk }}/">
- {{ filesystem.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if filesystem.get_failed_test %}
- <a href="/isotests/results/{{ filesystem.get_failed_test.pk }}/">
- {{ filesystem.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Fancy Stuff</h3>
- </td>
- </tr>
- {% if module_list %}
- {% for module in module_list %}
- <tr>
- <td>
- <a href="/isotests/results/modules/{{ module.pk }}/">
- {{ module.name }}
- </a>
- </td>
- <td>
- {% if module.get_success_test %}
- <a href="/isotests/results/{{ module.get_success_test.pk }}/">
- {{ module.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if module.get_failed_test %}
- <a href="/isotests/results/{{ module.get_failed_test.pk }}/">
- {{ module.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Rollback: Partitioning &amp; Filesystems</h3>
- </td>
- </tr>
- {% if filesystem_list %}
- {% for filesystem in filesystem_list %}
- <tr>
- <td>
- <a href="/isotests/results/rollback_filesystem/{{ filesystem.pk }}/">
- {{ filesystem.name }}
- </a>
- </td>
- <td>
- {% if filesystem.get_rollback_success_test %}
- <a href="/isotests/results/{{ filesystem.get_rollback_success_test.pk }}/">
- {{ filesystem.get_rollback_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if filesystem.get_rollback_failed_test %}
- <a href="/isotests/results/{{ filesystem.get_rollback_failed_test.pk }}/">
- {{ filesystem.get_rollback_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Rollback: Fancy Stuff</h4>
- </td>
- </tr>
- {% if module_list %}
- {% for module in module_list %}
- <tr>
- <td>
- <a href="/isotests/results/rollback_modules/{{ module.pk }}/">
- {{ module.name }}
- </a>
- </td>
- <td>
- {% if module.get_rollback_success_test %}
- <a href="/isotests/results/{{ module.get_rollback_success_test.pk }}/">
- {{ module.get_rollback_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if module.get_rollback_failed_test %}
- <a href="/isotests/results/{{ module.get_rollback_failed_test.pk }}/">
- {{ module.get_rollback_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>Bootloader</h3>
- </td>
- </tr>
- {% if bootloader_list %}
- {% for bootloader in bootloader_list %}
- <tr>
- <td>
- <a href="/isotests/results/bootloader/{{ bootloader.pk }}/">
- {{ bootloader.name }}
- </a>
- </td>
- <td>
- {% if bootloader.get_success_test %}
- <a href="/isotests/results/{{ bootloader.get_success_test.pk }}/">
- {{ bootloader.get_success_test.name }}
- </a>
- {% else %}
- Never succeeded
- {% endif %}
- </td>
- <td>
- {% if bootloader.get_failed_test %}
- <a href="/isotests/results/{{ bootloader.get_failed_test.pk }}/">
- {{ bootloader.get_failed_test.name }}
- </a>
- {% else %}
- Never failed
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
</table>
</div>
{% endblock %}