From 640e0f58645a7fd07f3c6185d9583b4d218e2468 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 25 Apr 2012 01:32:57 -0500
Subject: 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>
---
 templates/mirrors/status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/mirrors/status.html')

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>
-- 
cgit v1.2.3-2-g168b


From 2cfd0be715b93632a85608092726c5df926ed9ae Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 25 Apr 2012 01:52:19 -0500
Subject: Mirror status page cleanup

Remove the 'last sync' column; it is not totally useless but mostly
covered by the average delay column, and we are running out of usable
real estate here. Also tweak a few columns so wrapping is permissible.
Thank you to "Macedonia, The Former Yugoslav Republic of" for this.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/mirrors/status.html | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'templates/mirrors/status.html')

diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 8f814448..c04aa204 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]]});
 });
-- 
cgit v1.2.3-2-g168b


From 9616aec563baff19898c5a3185bc2011734544cb Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 26 Apr 2012 12:05:57 -0500
Subject: Add empty 'alt' attribute for all country flag images

These are all used purely for decoration, and the country name itself is
right next to the flag image, so we can safely mark these as "invisible"
to screen readers, text browsers, etc.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/mirrors/status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/mirrors/status.html')

diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index c04aa204..8ee1d46e 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -88,7 +88,7 @@
             {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
                 <td>{{ log.url__url }}</td>
                 <td>{{ log.url__protocol__protocol }}</td>
-                <td class="country">{% if log.country %}<img src="{{ log.country.flag }}"/> {% endif %}{{ log.country.name }}</td>
+                <td class="country">{% if log.country %}<img src="{{ log.country.flag }}" alt=""/> {% 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>
-- 
cgit v1.2.3-2-g168b