diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-14 00:36:47 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-14 00:36:47 -0300 |
commit | 60a1fc6cc4cef0b9eed58ea4f0ca003b76ec382a (patch) | |
tree | 032ae62668538be964f57a12018d1ab9f696be5f /templates/releng | |
parent | fbd23db51b7160a308cd88e407e676994eb08b10 (diff) | |
parent | 617550628b39f94e6cb11ec032eb18e6195bf64a (diff) |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
local_settings.py.example
media/archweb.css
packages/templatetags/package_extras.py
public/views.py
templates/packages/details.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/packages_list.html
templates/packages/search.html
templates/packages/signoffs.html
templates/public/about.html
templates/public/download.html
templates/public/index.html
templates/public/svn.html
templates/releng/results.html
templates/todolists/view.html
Diffstat (limited to 'templates/releng')
-rw-r--r-- | templates/releng/iso_overview.html | 40 | ||||
-rw-r--r-- | templates/releng/result_list.html | 8 | ||||
-rw-r--r-- | templates/releng/thanks.html | 4 |
3 files changed, 48 insertions, 4 deletions
diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html new file mode 100644 index 00000000..8280f100 --- /dev/null +++ b/templates/releng/iso_overview.html @@ -0,0 +1,40 @@ +{% extends "base.html" %} + +{% block content %} +<div class="box"> + <h2>Failures and Successes for Testing ISOs</h2> + + <p><a href="{% url releng-test-overview %}">Go back to testing results</a></p> + + <table id="releng-result" class="results"> + <thead> + <tr> + <th>ISO</th> + <th>Currently Available</th> + <th># Successes</th> + <th># Failures</th> + </tr> + </thead> + <tbody> + {% for iso in isos %} + <tr> + <td> + <a href="{{ iso.get_absolute_url }}">{{ iso.name }}</a> + </td> + <td>{{ iso.active|yesno|capfirst }}</td> + <td>{{ iso.successes }}</td> + <td>{{ iso.failures }}</td> + </tr> + {% endfor %} + </tbody> + </table> +</div> +{% load cdn %}{% jquery %} +<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> +<script type="text/javascript" src="/media/archweb.js"></script> +<script type="text/javascript"> +$(document).ready(function() { + $(".results:not(:has(tbody tr.empty))").tablesorter({widgets: ['zebra']}); +}); +</script> +{% endblock %} diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index b3ae025b..845d330d 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -3,7 +3,7 @@ {% block content %} <div class="box"> <h2>Results for: - {% if option %}{{ option|title }}: {{ value }}{% endif %} + {% if option %}{{ option.verbose_name|title }}: {{ value }}{% endif %} {{ iso_name|default:"" }} </h2> @@ -12,9 +12,10 @@ <table id="releng-result" class="results"> <thead> <tr> - <th>Iso</th> + <th>ISO</th> <th>Submitted By</th> <th>Date Submitted</th> + <th>Architecture</th> <th>Success</th> </tr> </thead> @@ -24,7 +25,8 @@ <td>{{ test.iso.name }}</td> <td>{{ test.user_name }}</td> <td>{{ test.created|date }}</td> - <td>{{ test.success|yesno }}</td> + <td>{{ test.architecture }}</td> + <td><span class="success-{{ test.success|yesno }}">{{ test.success|yesno|capfirst }}</span></td> </tr> {% endfor %} </tbody> diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html index 984a056d..fdfc4c4a 100644 --- a/templates/releng/thanks.html +++ b/templates/releng/thanks.html @@ -8,6 +8,8 @@ <p>Thank you for taking the time to give us this information! Your results have been succesfully added to our database.</p> <p>You can now <a href="{% url releng-test-overview %}">go back to the results</a>, - or <a href="{% url releng-test-submit %}">give more feedback</a>.</p> + <a href="{% url releng-test-submit %}">give more feedback</a>, or + have a look at the <a href="{% url releng-iso-overview %}">look at + the ISO test overview</a>.</p> </div> {% endblock %} |