From 8383a071608329c7683f7a710030ce945bd20b4d Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 8 Jul 2012 23:30:48 -0500
Subject: Add a new jquery_tablesorter CDN template tag

And use it everywhere we were including the file before. This should
make updating the version a heck of a lot easier.

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

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

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index edeab5dc..18175845 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -105,8 +105,7 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-- 
cgit v1.2.3-2-g168b


From 07d2fc5d358992a52908cccbbca4a11d01e98da3 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 10 Nov 2012 15:41:09 -0600
Subject: Add initial version of mirror status chart

Still have some hardcoded stuff to rip out and replace to make this a
bit more dynamic on things like sizing, but for now, this is a great
start.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/mirrors/mirror_details.html | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 18175845..32ef8a7a 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -104,14 +104,21 @@
             {% endfor %}
         </tbody>
     </table>
+
+    <h3>Mirror Status Chart</h3>
+
+    <div id="visualize-mirror" class="visualize-chart"></div>
 </div>
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
+<script type="text/javascript" src="{% static "d3.v2.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
+<script type="text/javascript" src="{% static "mirror_status.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $("#available_urls:has(tbody tr)").tablesorter(
         {widgets: ['zebra'], sortList: [[0,0]],
         headers: { 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } } });
+    mirror_status("#visualize-mirror", "./json/");
 });
 </script>
 {% endblock %}
-- 
cgit v1.2.3-2-g168b


From 59f5b6ed5524300cc0373ad934b251e220c66da9 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 13 Nov 2012 09:51:11 -0600
Subject: Mirror details style and JS cleanup

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/mirrors/mirror_details.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 32ef8a7a..884187b9 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -5,12 +5,11 @@
 {% block title %}Arch Linux - {{ mirror.name }} - Mirror Details{% endblock %}
 
 {% block content %}
-<!-- TODO: ids and classes -->
-<div id="pkgdetails" class="box">
+<div class="box">
 
     <h2>Mirror Details: {{ mirror.name }}</h2>
 
-    <table id="pkginfo">
+    <table class="compact">
         <tr>
             <th>Name:</th>
             <td>{{ mirror.name }}</td>
@@ -118,6 +117,8 @@ $(document).ready(function() {
     $("#available_urls:has(tbody tr)").tablesorter(
         {widgets: ['zebra'], sortList: [[0,0]],
         headers: { 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } } });
+});
+$(document).ready(function() {
     mirror_status("#visualize-mirror", "./json/");
 });
 </script>
-- 
cgit v1.2.3-2-g168b


From 2b9519996a47fd1d978ccac36246f0245ad668fb Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 27 Dec 2012 16:43:01 -0600
Subject: Update D3 to 3.0.0

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

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

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 884187b9..132557cd 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -109,7 +109,7 @@
     <div id="visualize-mirror" class="visualize-chart"></div>
 </div>
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
-<script type="text/javascript" src="{% static "d3.v2.min.js" %}"></script>
+<script type="text/javascript" src="{% static "d3-3.0.0.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript" src="{% static "mirror_status.js" %}"></script>
 <script type="text/javascript">
-- 
cgit v1.2.3-2-g168b


From 6f0ae6746baea657ee6d7c21ac0813a04f825443 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
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 <dan@archlinux.org>
---
 templates/mirrors/mirror_details.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

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 @@
             <th>Tier:</th>
             <td>{{ mirror.get_tier_display }}</td>
         </tr>
-        <tr>
-            <th>Country:</th>
-            <td>{% if mirror.country %}<img src="{{ mirror.country.flag }}" alt=""/> {% endif %}{{ mirror.country.name|default:'Worldwide' }}</td>
-        </tr>
         <tr>
             <th>Has ISOs:</th>
             <td>{{ mirror.isos|yesno|capfirst }}</td>
@@ -77,6 +73,8 @@
         <thead>
             <tr>
                 <th>Mirror URL</th>
+                <th>Protocol</th>
+                <th>Country</th>
                 <th>IPv4</th>
                 <th>IPv6</th>
                 <th>Last Sync</th>
@@ -91,6 +89,8 @@
             {% for m_url in urls %}
             <tr class="{% cycle 'odd' 'even' %}">
                 <td>{% if m_url.protocol.is_download %}<a href="{{ m_url.url }}">{{ m_url.url }}</a>{% else %}{{ m_url.url }}{% endif %}</td>
+                <td>{{ m_url.protocol }}</td>
+                <td class="country">{% if m_url.country %}<img src="{{ m_url.country.flag }}" alt=""/> {% endif %}{{ m_url.country.name }}</td>
                 <td>{{ m_url.has_ipv4|yesno|capfirst }}</td>
                 <td>{{ m_url.has_ipv6|yesno|capfirst }}</td>
                 <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td>
@@ -115,8 +115,8 @@
 <script type="text/javascript">
 $(document).ready(function() {
     $("#available_urls:has(tbody tr)").tablesorter(
-        {widgets: ['zebra'], sortList: [[0,0]],
-        headers: { 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } } });
+        {widgets: ['zebra'], sortList: [[1,0], [2,0]],
+        headers: { 8: { sorter: 'mostlydigit' }, 9: { sorter: 'mostlydigit' }, 10: { sorter: 'mostlydigit' } } });
 });
 $(document).ready(function() {
     mirror_status("#visualize-mirror", "./json/");
-- 
cgit v1.2.3-2-g168b


From 0b930fd92140858f4ad21e593feb057996af9b95 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 16 Jan 2013 00:36:17 -0600
Subject: Convert all usages of flag icons to new sprite

This uses a new template tag to avoid repeating construction of the
necessary HTML element all over the place. The site should look exactly
as it did before, except now you don't have to download 20+ images to
see some pages.

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

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

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index a56123ff..8ea6bbec 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -1,9 +1,12 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
 {% load mirror_status %}
+{% load flags %}
 
 {% block title %}Arch Linux - {{ mirror.name }} - Mirror Details{% endblock %}
 
+{% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %}
+
 {% block content %}
 <div class="box">
 
@@ -90,7 +93,7 @@
             <tr class="{% cycle 'odd' 'even' %}">
                 <td>{% if m_url.protocol.is_download %}<a href="{{ m_url.url }}">{{ m_url.url }}</a>{% else %}{{ m_url.url }}{% endif %}</td>
                 <td>{{ m_url.protocol }}</td>
-                <td class="country">{% if m_url.country %}<img src="{{ m_url.country.flag }}" alt=""/> {% endif %}{{ m_url.country.name }}</td>
+                <td class="country">{% country_flag m_url.country %}{{ m_url.country.name }}</td>
                 <td>{{ m_url.has_ipv4|yesno|capfirst }}</td>
                 <td>{{ m_url.has_ipv6|yesno|capfirst }}</td>
                 <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td>
-- 
cgit v1.2.3-2-g168b


From 82947873d65d06d4d938402b57e9244629f97228 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 8 Feb 2013 21:19:17 -0600
Subject: Upgrade D3 to 3.0.6

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

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

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 8ea6bbec..02d68a3a 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -112,7 +112,7 @@
     <div id="visualize-mirror" class="visualize-chart"></div>
 </div>
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
-<script type="text/javascript" src="{% static "d3-3.0.0.min.js" %}"></script>
+<script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript" src="{% static "mirror_status.js" %}"></script>
 <script type="text/javascript">
-- 
cgit v1.2.3-2-g168b


From e4e88638b68ca34cc15ea5551f0e8a1a4c2e03d5 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 14 Apr 2013 14:01:52 -0500
Subject: Turn visualize-mirror into a CSS class

---
 templates/mirrors/mirror_details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 02d68a3a..ee60157b 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -109,7 +109,7 @@
 
     <h3>Mirror Status Chart</h3>
 
-    <div id="visualize-mirror" class="visualize-chart"></div>
+    <div id="visualize-mirror" class="visualize-mirror visualize-chart"></div>
 </div>
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script>
-- 
cgit v1.2.3-2-g168b


From 9b07cb1ebdc8c5cc5dff66a7edb02e0ddc9f4733 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 14 Apr 2013 15:08:25 -0500
Subject: Draw one mirror status graph per check location

Rather than lump it all together and have odd spikes depending on which
side of the Atlantic checked a mirror in a given timeslot, draw a chart
per check location.

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

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

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index ee60157b..1c9a970e 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -106,10 +106,16 @@
             {% endfor %}
         </tbody>
     </table>
+</div>
+
+<div class="box">
+    <h2>Mirror Status Charts</h2>
 
-    <h3>Mirror Status Chart</h3>
+    <p>Periodic checks of the mirrors are done from various geographic
+    locations, IP addresses, and using IPv4 or IPv6. These results are
+    summarized in graphical form below.</p>
 
-    <div id="visualize-mirror" class="visualize-mirror visualize-chart"></div>
+    <div id="charts-container"></div>
 </div>
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script>
@@ -122,7 +128,7 @@ $(document).ready(function() {
         headers: { 8: { sorter: 'mostlydigit' }, 9: { sorter: 'mostlydigit' }, 10: { sorter: 'mostlydigit' } } });
 });
 $(document).ready(function() {
-    mirror_status("#visualize-mirror", "./json/");
+    draw_graphs("/mirrors/locations/json/", "./json/", "#charts-container");
 });
 </script>
 {% endblock %}
-- 
cgit v1.2.3-2-g168b


From 3e085183bf39c59fdcd0b9e67b5a02653a51d30e Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 20 Apr 2013 11:28:12 -0500
Subject: Move all script blocks into {% script_block %} section

I added this a while back, but didn't roll it out to all templates.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/mirrors/mirror_details.html | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 1c9a970e..d3e85b00 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -117,6 +117,9 @@
 
     <div id="charts-container"></div>
 </div>
+{% endblock %}
+
+{% block script_block %}
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
-- 
cgit v1.2.3-2-g168b