From 6f0ae6746baea657ee6d7c21ac0813a04f825443 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 14 Jan 2013 01:00:11 -0600 Subject: Drop country column from mirror table We now always look for this information at the URL level, not the mirror level. This simplifies quite a bit of code in and around the mirror views. Signed-off-by: Dan McGee --- templates/mirrors/mirror_details.html | 12 ++++++------ templates/mirrors/mirrorlist.txt | 2 +- templates/mirrors/mirrorlist_status.txt | 2 +- templates/mirrors/mirrors.html | 4 +--- templates/mirrors/status_table.html | 2 +- templates/public/download.html | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) (limited to 'templates') 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 @@ -18,10 +18,6 @@

Mirror Details: {{ mirror.name }}

Tier: {{ mirror.get_tier_display }} - - Country: - {% if mirror.country %} {% endif %}{{ mirror.country.name|default:'Worldwide' }} - Has ISOs: {{ mirror.isos|yesno|capfirst }} @@ -77,6 +73,8 @@

Available URLs

Mirror URL + Protocol + Country IPv4 IPv6 Last Sync @@ -91,6 +89,8 @@

Available URLs

{% for m_url in urls %} {% if m_url.protocol.is_download %}{{ m_url.url }}{% else %}{{ m_url.url }}{% endif %} + {{ m_url.protocol }} + {% if m_url.country %} {% endif %}{{ m_url.country.name }} {{ m_url.has_ipv4|yesno|capfirst }} {{ m_url.has_ipv6|yesno|capfirst }} {{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }} @@ -115,8 +115,8 @@

Mirror Status Chart

{% 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 %} {{ m_url.url }} {{ m_url.protocol }} - {% if m_url.real_country %} {% endif %}{{ m_url.real_country.name }} + {% if m_url.country %} {% endif %}{{ m_url.country.name }} {{ m_url.completion_pct|percentage:1 }} {{ m_url.delay|duration|default:'unknown' }} {{ m_url.duration_avg|floatformat:2 }} 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 @@

Checksums

{% cache 600 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 %}
{{ country.grouper.name }}
{% else %}
Worldwide
{% endif %} -- cgit v1.2.3-54-g00ecf