summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-04-25 01:32:57 -0500
committerDan McGee <dan@archlinux.org>2012-04-25 01:51:58 -0500
commit640e0f58645a7fd07f3c6185d9583b4d218e2468 (patch)
tree46323cbe3549b7d60a7b88eacb702522982b2a27 /templates
parent20675141c340ea3d2d6d8305f8ba0950d3bf974c (diff)
Finish django countries implementation
* Add a migration to drop the old countries field. * Update all templates/views/utility methods to point at the new country field and dereference it as necessary. * Add the flags images to a few views where it makes sense. * Cleanup the download page layout quite a bit. * Bump the mirror status JSON version to 3; add country_code attribute. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'templates')
-rw-r--r--templates/mirrors/mirror_details.html2
-rw-r--r--templates/mirrors/mirrorlist.txt2
-rw-r--r--templates/mirrors/mirrorlist_status.txt3
-rw-r--r--templates/mirrors/mirrors.html16
-rw-r--r--templates/mirrors/status.html2
-rw-r--r--templates/mirrors/status_table.html2
-rw-r--r--templates/public/download.html43
7 files changed, 30 insertions, 40 deletions
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index bb3b417c..6fe68f36 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 24b52fa1..d3dd6e4e 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 e3504395..523794b2 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 4b59058a..19c6ea27 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 225572ee..8f814448 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 bd70115c..3a20c068 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>
diff --git a/templates/public/download.html b/templates/public/download.html
index fbadb7c0..4d75268a 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -77,7 +77,7 @@
<a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-dual.iso.torrent"
title="Download for both architectures">Download</a>
</td><td class="wrap">
- Downloads and installs packages versions via FTP for absolute freshness.
+ Downloads and installs packages versions via mirrors for absolute freshness.
</td>
</tr><tr>
<td>
@@ -131,10 +131,10 @@
title="Release Engineering ISO feedback">Feedback</a></li>
</ul>
- <h3>HTTP/FTP Direct Downloads</h3>
+ <h3>HTTP Direct Downloads</h3>
<p>In addition to the BitTorrent links above, install images can also be
- downloaded via HTTP or FTP from the mirror sites listed below. Please
+ downloaded via HTTP from the mirror sites listed below. Please
ensure the download image matches the checksum from the md5sums.txt or
sha1sums.txt file in the same directory as the image.</p>
@@ -150,30 +150,19 @@
</ul>
{% cache 600 download-mirrors %}
- <table id="download-mirrors">
- <thead>
- <tr>
- <th><h4>Server Location</h4></th>
- <th><h4>Download</h4></th>
- </tr>
- </thead>
- <tbody>
- <tr><td colspan="2">
- {% for mirror_url in mirror_url_list %}
- {% ifchanged mirror_url.mirror.country_old %}
- </td></tr>
- <tr><td class="mirror-country" colspan="2"><strong>{{mirror_url.mirror.country_old}}</strong>
- {% endifchanged %}
- {% ifchanged mirror_url.mirror.name %}
- </td></tr>
- <tr><td class="mirror-server">{{mirror_url.mirror.name}}</td><td>
- {% endifchanged %}
- <a href="{{mirror_url.url}}iso/{{ version }}/"
- title="Download from {{mirror_url.url}}">{{mirror_url.protocol.protocol|upper}}</a>
- {% endfor %}
- </td></tr>
- </tbody>
- </table>
+ <div id="download-mirrors">
+ {% regroup mirror_urls by real_country as grouped_urls %}
+ {% for country in grouped_urls %}
+ {% if country.grouper %}<h5><img src="{{ country.grouper.flag }}"/> {{ country.grouper.name }}</h5>
+ {% else %}<h5>Worldwide</h5>{% endif %}
+ <ul>
+ {% for mirror_url in country.list %}
+ <li><a href="{{ mirror_url.url }}iso/{{ version }}/"
+ title="Download from {{ mirror_url.url }}iso/{{ version }}/">{{ mirror_url.mirror.name }}</a></li>
+ {% endfor %}
+ </ul>
+ {% endfor %}
+ </div>
{% endcache %}
{% endwith %}