diff options
| -rw-r--r-- | sitestatic/archweb.css | 5 | ||||
| -rw-r--r-- | templates/mirrors/status.html | 14 | ||||
| -rw-r--r-- | templates/mirrors/status_table.html | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css index 1df0507..fdc356f 100644 --- a/sitestatic/archweb.css +++ b/sitestatic/archweb.css @@ -797,6 +797,11 @@ form#flag-pkg-form input[type=text] { padding-top: 1em; } +/* mirror stuff */ +table td.country { + white-space: normal; +} + /* dev/TU biographies */ div#arch-bio-toc { width: 75%; diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index 8f81444..c04aa20 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -18,10 +18,6 @@ <ul> <li><em>Mirror URL:</em> Mirrors are checked on a per-URL basis. If both FTP and HTTP access are provided, both will be listed here.</li> - <li><em>Last Sync:</em> The timestamp retrieved from the - <tt>lastsync</tt> file on the mirror. If this file could not be - retrieved or contained data we didn't recognize, this column will show - 'unknown'.</li> <li><em>Completion %:</em> The number of mirror checks that have successfully connected and disconnected from the given URL. If this is below 100%, the mirror may be unreliable.</li> @@ -92,8 +88,8 @@ {% spaceless %}<tr class="{% cycle 'odd' 'even' %}"> <td>{{ log.url__url }}</td> <td>{{ log.url__protocol__protocol }}</td> - <td>{% if log.country %}<img src="{{ log.country.flag }}"/> {% endif %}{{ log.country.name }}</td> - <td>{{ log.error }}</td> + <td class="country">{% if log.country %}<img src="{{ log.country.flag }}"/> {% endif %}{{ log.country.name }}</td> + <td class="wrap">{{ log.error }}</td> <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td> <td>{{ log.error_count }}</td> </tr> @@ -107,11 +103,11 @@ <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> $(document).ready(function() { - var headers = { 5: { sorter: 'duration' }, 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } }; + var headers = { 4: { sorter: 'duration' }, 5: { sorter: 'mostlydigit' }, 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' } }; $("#outofsync_mirrors:has(tbody tr)").tablesorter( - {widgets: ['zebra'], sortList: [[3,1]], headers: headers }); + {widgets: ['zebra'], sortList: [[4,0]], headers: headers }); $("#successful_mirrors:has(tbody tr)").tablesorter( - {widgets: ['zebra'], sortList: [[8,0]], headers: headers }); + {widgets: ['zebra'], sortList: [[7,0]], headers: headers }); $("#errorlog_mirrors:has(tbody tr)").tablesorter( {widgets: ['zebra'], sortList: [[4,1], [5,1]]}); }); diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index 3a20c06..71a21fe 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -5,7 +5,6 @@ <th>Mirror URL</th> <th>Protocol</th> <th>Country</th> - <th>Last Sync</th> <th>Completion %</th> <th>μ Delay (hh:mm)</th> <th>μ Duration (secs)</th> @@ -18,8 +17,7 @@ {% spaceless %}<tr class="{% cycle 'odd' 'even' %}"> <td>{{ m_url.url }}</td> <td>{{ m_url.protocol }}</td> - <td>{% if m_url.real_country %}<img src="{{ m_url.real_country.flag }}"/> {% endif %}{{ m_url.real_country.name }}</td> - <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td> + <td class="country">{% if m_url.real_country %}<img src="{{ m_url.real_country.flag }}"/> {% endif %}{{ m_url.real_country.name }}</td> <td>{{ m_url.completion_pct|percentage:1 }}</td> <td>{{ m_url.delay|duration|default:'unknown' }}</td> <td>{{ m_url.duration_avg|floatformat:2 }}</td> |