diff options
Diffstat (limited to 'templates/mirrors')
| -rw-r--r-- | templates/mirrors/mirror_details.html | 2 | ||||
| -rw-r--r-- | templates/mirrors/mirrorlist.txt | 2 | ||||
| -rw-r--r-- | templates/mirrors/mirrorlist_status.txt | 3 | ||||
| -rw-r--r-- | templates/mirrors/mirrors.html | 16 | ||||
| -rw-r--r-- | templates/mirrors/status.html | 2 | ||||
| -rw-r--r-- | templates/mirrors/status_table.html | 2 |
6 files changed, 14 insertions, 13 deletions
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index bb3b417..6fe68f3 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -21,7 +21,7 @@ </tr> <tr> <th>Country:</th> - <td>{{ mirror.country_old }}</td> + <td>{{ mirror.country.name|default:'Worldwide' }}</td> </tr> <tr> <th>Has ISOs:</th> diff --git a/templates/mirrors/mirrorlist.txt b/templates/mirrors/mirrorlist.txt index 24b52fa..d3dd6e4 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 }}{% endifchanged %} +## {{ mirror_url.real_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 e350439..523794b 100644 --- a/templates/mirrors/mirrorlist_status.txt +++ b/templates/mirrors/mirrorlist_status.txt @@ -7,7 +7,8 @@ content right, and then go back later to fix it all up. ## Arch Linux repository mirrorlist ## Sorted by mirror score from mirror status page ## Generated on {% now "Y-m-d" %} +## {% for mirror_url in mirror_urls %} -## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.real_country }} +## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.real_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 4b59058..19c6ea2 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -26,15 +26,15 @@ <tr class="{% cycle 'odd' 'even' %}"> <td><a href="{{ mirror.get_absolute_url }}" title="Mirror details for {{ mirror.name }}">{{ mirror.name }}</a></td> - <td>{{mirror.get_tier_display}}</td> - <td>{{mirror.country_old}}</td> - <td>{{mirror.isos|yesno|capfirst}}</td> - <td class="wrap">{{mirror.supported_protocols|join:", "}}</td> + <td>{{ mirror.get_tier_display }}</td> + <td>{% if mirror.country %}<img src="{{ mirror.country.flag }}"/> {% endif %}{{ mirror.country.name }}</td> + <td>{{ mirror.isos|yesno|capfirst }}</td> + <td class="wrap">{{ mirror.supported_protocols|join:", " }}</td> {% if user.is_authenticated %} - <td>{{mirror.public|yesno|capfirst}}</td> - <td>{{mirror.active|yesno|capfirst}}</td> - <td>{{mirror.admin_email}}</td> - <td class="wrap">{{mirror.notes|linebreaks}}</td> + <td>{{ mirror.public|yesno|capfirst }}</td> + <td>{{ mirror.active|yesno|capfirst }}</td> + <td>{{ mirror.admin_email }}</td> + <td class="wrap">{{ mirror.notes|linebreaks }}</td> {% endif %} </tr> {% endfor %} diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index 225572e..8f81444 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -92,7 +92,7 @@ {% spaceless %}<tr class="{% cycle 'odd' 'even' %}"> <td>{{ log.url__url }}</td> <td>{{ log.url__protocol__protocol }}</td> - <td>{{ log.country }}</td> + <td>{% if log.country %}<img src="{{ log.country.flag }}"/> {% endif %}{{ log.country.name }}</td> <td>{{ log.error }}</td> <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td> <td>{{ log.error_count }}</td> diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index bd70115..3a20c06 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -18,7 +18,7 @@ {% spaceless %}<tr class="{% cycle 'odd' 'even' %}"> <td>{{ m_url.url }}</td> <td>{{ m_url.protocol }}</td> - <td>{{ m_url.real_country }}</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>{{ m_url.completion_pct|percentage:1 }}</td> <td>{{ m_url.delay|duration|default:'unknown' }}</td> |