diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/mirrors/mirror_details.html | 12 | ||||
| -rw-r--r-- | templates/mirrors/mirrorlist.txt | 2 | ||||
| -rw-r--r-- | templates/mirrors/mirrorlist_status.txt | 2 | ||||
| -rw-r--r-- | templates/mirrors/mirrors.html | 4 | ||||
| -rw-r--r-- | templates/mirrors/status_table.html | 2 | ||||
| -rw-r--r-- | templates/public/download.html | 2 |
6 files changed, 11 insertions, 13 deletions
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 132557cd..a56123ff 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -19,10 +19,6 @@ <td>{{ mirror.get_tier_display }}</td> </tr> <tr> - <th>Country:</th> - <td>{% if mirror.country %}<img src="{{ mirror.country.flag }}" alt=""/> {% endif %}{{ mirror.country.name|default:'Worldwide' }}</td> - </tr> - <tr> <th>Has ISOs:</th> <td>{{ mirror.isos|yesno|capfirst }}</td> </tr> @@ -77,6 +73,8 @@ <thead> <tr> <th>Mirror URL</th> + <th>Protocol</th> + <th>Country</th> <th>IPv4</th> <th>IPv6</th> <th>Last Sync</th> @@ -91,6 +89,8 @@ {% for m_url in urls %} <tr class="{% cycle 'odd' 'even' %}"> <td>{% if m_url.protocol.is_download %}<a href="{{ m_url.url }}">{{ m_url.url }}</a>{% else %}{{ m_url.url }}{% endif %}</td> + <td>{{ m_url.protocol }}</td> + <td class="country">{% if m_url.country %}<img src="{{ m_url.country.flag }}" alt=""/> {% endif %}{{ m_url.country.name }}</td> <td>{{ m_url.has_ipv4|yesno|capfirst }}</td> <td>{{ m_url.has_ipv6|yesno|capfirst }}</td> <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td> @@ -115,8 +115,8 @@ <script type="text/javascript"> $(document).ready(function() { $("#available_urls:has(tbody tr)").tablesorter( - {widgets: ['zebra'], sortList: [[0,0]], - headers: { 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } } }); + {widgets: ['zebra'], sortList: [[1,0], [2,0]], + headers: { 8: { sorter: 'mostlydigit' }, 9: { sorter: 'mostlydigit' }, 10: { sorter: 'mostlydigit' } } }); }); $(document).ready(function() { mirror_status("#visualize-mirror", "./json/"); diff --git a/templates/mirrors/mirrorlist.txt b/templates/mirrors/mirrorlist.txt index d3dd6e4e..a7f8e2af 100644 --- a/templates/mirrors/mirrorlist.txt +++ b/templates/mirrors/mirrorlist.txt @@ -8,6 +8,6 @@ content right, and then go back later to fix it all up. ## Generated on {% now "Y-m-d" %} ##{% for mirror_url in mirror_urls %}{% ifchanged %} -## {{ mirror_url.real_country.name|default:'Worldwide' }}{% endifchanged %} +## {{ mirror_url.country.name|default:'Worldwide' }}{% endifchanged %} #Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %} {% endautoescape %} diff --git a/templates/mirrors/mirrorlist_status.txt b/templates/mirrors/mirrorlist_status.txt index 523794b2..575d19f7 100644 --- a/templates/mirrors/mirrorlist_status.txt +++ b/templates/mirrors/mirrorlist_status.txt @@ -9,6 +9,6 @@ content right, and then go back later to fix it all up. ## Generated on {% now "Y-m-d" %} ## {% for mirror_url in mirror_urls %} -## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.real_country.name|default:'Worldwide' }} +## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.country.name|default:'Worldwide' }} #Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %} {% endautoescape %} diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html index c83d0d43..458b693f 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -10,7 +10,6 @@ <tr> <th>Server</th> <th>Tier</th> - <th>Country</th> <th>ISOs</th> <th>Protocols</th> {% if user.is_authenticated %} @@ -27,7 +26,6 @@ <td><a href="{{ mirror.get_absolute_url }}" title="Mirror details for {{ mirror.name }}">{{ mirror.name }}</a></td> <td>{{ mirror.get_tier_display }}</td> - <td>{% if mirror.country %}<img src="{{ mirror.country.flag }}" alt=""/> {% endif %}{{ mirror.country.name }}</td> <td>{{ mirror.isos|yesno|capfirst }}</td> <td class="wrap">{{ mirror.protocols|join:", " }}</td> {% if user.is_authenticated %} @@ -45,7 +43,7 @@ <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> $(document).ready(function() { - $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [2,0]]}); + $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]}); }); </script> {% endblock %} diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index 1961d222..c7394de6 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -17,7 +17,7 @@ {% spaceless %}<tr class="{% cycle 'odd' 'even' %}"> <td>{{ m_url.url }}</td> <td>{{ m_url.protocol }}</td> - <td class="country">{% if m_url.real_country %}<img src="{{ m_url.real_country.flag }}" alt=""/> {% endif %}{{ m_url.real_country.name }}</td> + <td class="country">{% if m_url.country %}<img src="{{ m_url.country.flag }}" alt=""/> {% endif %}{{ m_url.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> diff --git a/templates/public/download.html b/templates/public/download.html index 3005ffb3..0c96fcef 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -81,7 +81,7 @@ {% cache 600 download-mirrors %} <div id="download-mirrors"> - {% regroup mirror_urls by real_country as grouped_urls %} + {% regroup mirror_urls by country as grouped_urls %} {% for country in grouped_urls %} {% if country.grouper %}<h5><img src="{{ country.grouper.flag }}" alt=""/> {{ country.grouper.name }}</h5> {% else %}<h5>Worldwide</h5>{% endif %} |