summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorTom Willemsen <tom.willemsen@archlinux.us>2011-04-28 13:00:27 -0500
committerDan McGee <dan@archlinux.org>2011-04-28 13:18:29 -0500
commit00e096ddf0654d32e67ac8bc47f3de01ed7e740b (patch)
tree70885935cb7e3e90af07f42708a9d04d818d8e4e /templates
parentf4229daac60fa90cbf8d77bfdffd88a467869b3c (diff)
downloadarchweb-00e096ddf0654d32e67ac8bc47f3de01ed7e740b.tar.gz
archweb-00e096ddf0654d32e67ac8bc47f3de01ed7e740b.zip
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 <dan@archlinux.org>
Diffstat (limited to 'templates')
-rw-r--r--templates/isotests/iso_list.html18
-rw-r--r--templates/isotests/results.html364
-rw-r--r--templates/isotests/test_list.html18
3 files changed, 182 insertions, 218 deletions
diff --git a/templates/isotests/iso_list.html b/templates/isotests/iso_list.html
deleted file mode 100644
index f94bbe1a..00000000
--- 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 %}
-<div class="box">
- <h2>Arch releng iso buid test results</h2>
- <ul>
- {% for iso in object_list %}
- <li><a href="/tests/{{ iso.id }}/">{{ iso }}</a></li>
- {% endfor %}
- </ul>
- {% else %}
- <p>No tests are available.</p>
- {% endif %}
-</div>
-{% endblock %}
diff --git a/templates/isotests/results.html b/templates/isotests/results.html
index 3e43ae47..b773056a 100644
--- a/templates/isotests/results.html
+++ b/templates/isotests/results.html
@@ -4,187 +4,187 @@
{% block content %}
<div class="box">
- <h2>Arch releng iso build test results</h2>
- <table>
- <tr>
- <td>
- <h3>image arch</h3>
- </td>
- </tr>
- {% if arch_choices %}
- {% for arch in arch_choices %}
- <tr>
- <td>{{ arch.name }}</td>
- <td>{{ arch.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ arch.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>image type</h3>
- </td>
- </tr>
- {% if isotype_choices %}
- {% for isotype in isotype_choices %}
- <tr>
- <td>{{ isotype.name }}</td>
- <td>{{ isotype.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ isotype.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>image boot</h3>
- </td>
- </tr>
- {% if boottype_choices %}
- {% for boottype in boottype_choices %}
- <tr>
- <td>{{ boottype.name }}</td>
- <td>{{ boottype.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ boottype.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>hardware type</h3>
- </td>
- </tr>
- {% if hardware_list %}
- {% for hardware in hardware_list %}
- <tr>
- <td>{{ hardware.name }}</td>
- <td>{{ hardware.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ hardware.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>install type</h3>
- </td>
- </tr>
- {% if installtype_list %}
- {% for installtype in installtype_list %}
- <tr>
- <td>{{ installtype.name }}</td>
- <td>{{ installtype.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ installtype.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>source selection</h3>
- </td>
- </tr>
- {% if source_list %}
- {% for source in source_list %}
- <tr>
- <td>{{ source.name }}</td>
- <td>{{ source.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ source.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>clock</h3>
- </td>
- </tr>
- {% if clock_choices %}
- {% for clock in clock_choices %}
- <tr>
- <td>{{ clock.name }}</td>
- <td>{{ clock.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ clock.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>partitioning/filesystems</h3>
- </td>
- </tr>
- {% if filesystem_list %}
- {% for filesystem in filesystem_list %}
- <tr>
- <td>{{ filesystem.name }}</td>
- <td>{{ filesystem.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ filesystem.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>fancy stuff</h3>
- </td>
- </tr>
- {% if module_list %}
- {% for module in module_list %}
- <tr>
- <td>{{ module.name }}</td>
- <td>{{ module.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ module.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>rollback</h3>
- </td>
- </tr>
- <tr>
- <td>yes</td>
- </tr>
- <tr>
- <td>no</td>
- </tr>
- <tr>
- <td>
- <h4>rollback: partitioning/filesystems</h4>
- </td>
- </tr>
- {% if filesystem_list %}
- {% for filesystem in filesystem_list %}
- <tr>
- <td>{{ filesystem.name }}</td>
- <td>{{ filesystem.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ filesystem.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h4>rollback: fancy stuff</h4>
- </td>
- </tr>
- {% if module_list %}
- {% for module in module_list %}
- <tr>
- <td>{{ module.name }}</td>
- <td>{{ module.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ module.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- <tr>
- <td>
- <h3>bootloader</h3>
- </td>
- </tr>
- {% if bootloader_list %}
- {% for bootloader in bootloader_list %}
- <tr>
- <td>{{ bootloader.name }}</td>
- <td>{{ bootloader.get_success_test|default_if_none:"Never succeeded" }}</td>
- <td>{{ bootloader.get_failed_test|default_if_none:"Never failed" }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- </table>
+ <h2>Arch releng iso build test results</h2>
+ <table>
+ <tr>
+ <td>
+ <h3>image arch</h3>
+ </td>
+ </tr>
+ {% if architecture_list %}
+ {% for architecture in architecture_list %}
+ <tr>
+ <td>{{ architecture.name }}</td>
+ <td>{{ architecture.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ architecture.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ <tr>
+ <td>
+ <h3>image type</h3>
+ </td>
+ </tr>
+ {% if iso_type_list %}
+ {% for iso_type in iso_type_list %}
+ <tr>
+ <td>{{ iso_type.name }}</td>
+ <td>{{ iso_type.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ iso_type.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ <tr>
+ <td>
+ <h3>image boot</h3>
+ </td>
+ </tr>
+ {% if boot_type_list %}
+ {% for boot_type in boot_type_list %}
+ <tr>
+ <td>{{ boot_type.name }}</td>
+ <td>{{ boot_type.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ boot_type.get_failed_test|default_if_none:"Never failed" }}</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>{{ hardware_type.name }}</td>
+ <td>{{ hardware_type.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ hardware_type.get_failed_test|default_if_none:"Never failed" }}</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>{{ install_type.name }}</td>
+ <td>{{ install_type.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ install_type.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ <tr>
+ <td>
+ <h3>source selection</h3>
+ </td>
+ </tr>
+ {% if source_list %}
+ {% for source in source_list %}
+ <tr>
+ <td>{{ source.name }}</td>
+ <td>{{ source.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ source.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ <tr>
+ <td>
+ <h3>clock</h3>
+ </td>
+ </tr>
+ {% if clock_choices_list %}
+ {% for clock_choice in clock_choices_list %}
+ <tr>
+ <td>{{ clock_choice.name }}</td>
+ <td>{{ clock_choice.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ clock_choice.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ <tr>
+ <td>
+ <h3>partitioning/filesystems</h3>
+ </td>
+ </tr>
+ {% if filesystem_list %}
+ {% for filesystem in filesystem_list %}
+ <tr>
+ <td>{{ filesystem.name }}</td>
+ <td>{{ filesystem.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ filesystem.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ <tr>
+ <td>
+ <h3>fancy stuff</h3>
+ </td>
+ </tr>
+ {% if module_list %}
+ {% for module in module_list %}
+ <tr>
+ <td>{{ module.name }}</td>
+ <td>{{ module.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ module.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ <tr>
+ <td>
+ <h3>rollback</h3>
+ </td>
+ </tr>
+ <tr>
+ <td>yes</td>
+ </tr>
+ <tr>
+ <td>no</td>
+ </tr>
+ <tr>
+ <td>
+ <h4>rollback: partitioning/filesystems</h4>
+ </td>
+ </tr>
+ {% if filesystem_list %}
+ {% for filesystem in filesystem_list %}
+ <tr>
+ <td>{{ filesystem.name }}</td>
+ <td>{{ filesystem.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ filesystem.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ <tr>
+ <td>
+ <h4>rollback: fancy stuff</h4>
+ </td>
+ </tr>
+ {% if module_list %}
+ {% for module in module_list %}
+ <tr>
+ <td>{{ module.name }}</td>
+ <td>{{ module.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ module.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ <tr>
+ <td>
+ <h3>bootloader</h3>
+ </td>
+ </tr>
+ {% if bootloader_list %}
+ {% for bootloader in bootloader_list %}
+ <tr>
+ <td>{{ bootloader.name }}</td>
+ <td>{{ bootloader.get_success_test|default_if_none:"Never succeeded" }}</td>
+ <td>{{ bootloader.get_failed_test|default_if_none:"Never failed" }}</td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ </table>
</div>
{% endblock %}
diff --git a/templates/isotests/test_list.html b/templates/isotests/test_list.html
deleted file mode 100644
index 1ef39a4c..00000000
--- a/templates/isotests/test_list.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Arch Linux - Testresults{% endblock %}
-
-{% block content %}
-<div class="box">
- <h2>Arch releng iso build test results</h2>
- {% if object_list %}
- <ul>
- {% for test in object_list %}
- <li><a href="/tests/{{ test.id }}/">{{ test.iso }}</a></li>
- {% endfor %}
- </ul>
- {% else %}
- <p>No test results are available.</p>
- {% endif %}
-</div>
-{% endblock %}