Merge branch 'archweb-generic'

1 files changed, 7 insertions, 1 deletions

diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html
index 13701e5a..3450d439 100644
--- a/templates/mirrors/mirrors.html
+++ b/templates/mirrors/mirrors.html
@@ -1,8 +1,12 @@
 {% extends "base.html" %}
 {% load cycle from future %}
 {% load static from staticfiles %}
+{% load flags %}
+
 {% block title %}{{ BRANDING_DISTRONAME }} - Mirror Overview{% endblock %}
 
+{% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %}
+
 {% block content %}
 <div id="dev-mirrorlist" class="box">
     <h2>Mirror Overview</h2>
@@ -10,6 +14,7 @@
         <thead>
             <tr>
                 <th>Server</th>
+                <th>Country</th>
                 <th>Tier</th>
                 <th>ISOs</th>
                 <th>Protocols</th>
@@ -26,6 +31,7 @@
             <tr class="{% cycle 'odd' 'even' %}">
                 <td><a href="{{ mirror.get_absolute_url }}"
                         title="Mirror details for {{ mirror.name }}">{{ mirror.name }}</a></td>
+                <td class="country">{% if mirror.country %}{% country_flag mirror.country %}{{ mirror.country.name }}{% else %}Various{% endif %}</td>
                 <td>{{ mirror.get_tier_display }}</td>
                 <td>{{ mirror.isos|yesno|capfirst }}</td>
                 <td class="wrap">{{ mirror.protocols|join:", " }}</td>
@@ -44,7 +50,7 @@
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
+    $(".results").tablesorter({widgets: ['zebra'], sortList: [[2,0], [0,0]]});
 });
 </script>
 {% endblock %}