diff options
| author | Dan McGee <dan@archlinux.org> | 2013-05-11 01:46:55 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2013-05-11 01:46:55 +0200 |
| commit | c4d894c85b738df53e8e06e65be48e34572b2f5f (patch) | |
| tree | 3805f17e16b6f49fcbe318eb60ac03f0bbec7d84 /templates/mirrors | |
| parent | dad70d0d7c70e7973cd9e3960b24e7f9ef883c61 (diff) | |
| parent | 8097a1fdeff36fb3db521a3b354ea8bf576869cc (diff) | |
| download | archweb-c4d894c85b738df53e8e06e65be48e34572b2f5f.tar.gz archweb-c4d894c85b738df53e8e06e65be48e34572b2f5f.tar.xz | |
Merge branch 'mirror-errors'
Diffstat (limited to 'templates/mirrors')
| -rw-r--r-- | templates/mirrors/error_table.html | 23 | ||||
| -rw-r--r-- | templates/mirrors/mirror_details.html | 3 | ||||
| -rw-r--r-- | templates/mirrors/status.html | 32 | ||||
| -rw-r--r-- | templates/mirrors/status_table.html | 3 |
4 files changed, 30 insertions, 31 deletions
diff --git a/templates/mirrors/error_table.html b/templates/mirrors/error_table.html new file mode 100644 index 0000000..6054814 --- /dev/null +++ b/templates/mirrors/error_table.html @@ -0,0 +1,23 @@ +{% load flags mirror_status %} +<table id="errorlog_mirrors" class="results"> + <thead> + <tr> + <th>Mirror URL</th> + <th>Protocol</th> + <th>Country</th> + <th>Error Message</th> + <th>Last Occurred</th> + <th>Occurrences (last {{ cutoff|hours }})</th> + </tr> + </thead> + <tbody> + {% for log in error_logs %}<tr class="{% cycle 'odd' 'even' %}"> + <td>{{ log.url__url }}</td> + <td>{{ log.url__protocol__protocol }}</td> + <td class="country">{% country_flag log.country %}{{ log.country.name }}</td> + <td class="wrap">{{ log.error|linebreaksbr }}</td> + <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td> + <td>{{ log.error_count }}</td> + </tr>{% endfor %} + </tbody> +</table> diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index d3e85b0..6f0ac6c 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -106,6 +106,9 @@ {% endfor %} </tbody> </table> + + <h3>Error Log</h3> + {% include "mirrors/error_table.html" %} </div> <div class="box"> diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index 283ff68..331c18e 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -59,45 +59,19 @@ <a name="outofsync" id="outofsync"></a> <h3>Out of Sync Mirrors</h3> - {% with bad_urls as urls %} - {% with 'outofsync_mirrors' as table_id %} + {% with urls=bad_urls table_id='outofsync_mirrors' %} {% include "mirrors/status_table.html" %} {% endwith %} - {% endwith %} <a name="successful" id="successful"></a> <h3>Successfully Syncing Mirrors</h3> - {% with good_urls as urls %} - {% with 'successful_mirrors' as table_id %} + {% with urls=good_urls table_id='successful_mirrors' %} {% include "mirrors/status_table.html" %} {% endwith %} - {% endwith %} <a name="errorlog" id="errorlog"></a> <h3>Mirror Syncing Error Log</h3> - <table id="errorlog_mirrors" class="results"> - <thead> - <tr> - <th>Mirror URL</th> - <th>Protocol</th> - <th>Country</th> - <th>Error Message</th> - <th>Last Occurred</th> - <th>Occurrences (last {{ cutoff|hours }})</th> - </tr> - </thead> - <tbody> - {% for log in error_logs %}<tr class="{% cycle 'odd' 'even' %}"> - <td>{{ log.url__url }}</td> - <td>{{ log.url__protocol__protocol }}</td> - <td class="country">{% country_flag log.country %}{{ log.country.name }}</td> - <td class="wrap">{{ log.error|linebreaksbr }}</td> - <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td> - <td>{{ log.error_count }}</td> - </tr>{% endfor %} - </tbody> - </table> - + {% include "mirrors/error_table.html" %} </div> {% endblock %} diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index e848a9c..2817542 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -1,5 +1,4 @@ -{% load mirror_status %} -{% load flags %} +{% load flags mirror_status %} <table id="{{ table_id }}" class="results"> <thead> <tr> |