Merge branch 'archweb' into archweb-generic2

3 files changed, 19 insertions, 11 deletions

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 18f72125..98755ad2 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -106,11 +106,20 @@
             {% 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-chart"></div>
+    <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>
@@ -122,7 +131,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 %}
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 9050414d..de2c3d5c 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -87,20 +87,21 @@
             </tr>
         </thead>
         <tbody>
-            {% for log in error_logs %}
-            {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
+            {% for log in error_logs %}<tr class="{% cycle 'odd' 'even' %}">
                 <td>{{ log.url__url }}</td>
                 <td>{{ log.url__protocol__protocol }}</td>
                 <td class="country">{% country_flag log.country %}{{ log.country.name }}</td>
                 <td class="wrap">{{ log.error|linebreaksbr }}</td>
                 <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td>
                 <td>{{ log.error_count }}</td>
-            </tr>
-            {% endspaceless %}{% endfor %}
+            </tr>{% endfor %}
         </tbody>
     </table>
 
 </div>
+{% endblock %}
+
+{% block script_block %}
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index 2dd7ef49..e848a9c9 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -14,8 +14,7 @@
         </tr>
     </thead>
     <tbody>
-        {% for m_url in urls %}
-        {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
+        {% for m_url in urls %}<tr class="{% cycle 'odd' 'even' %}">
             <td>{{ m_url.url }}</td>
             <td>{{ m_url.protocol }}</td>
             <td class="country">{% country_flag m_url.country %}{{ m_url.country.name }}</td>
@@ -24,7 +23,6 @@
             <td>{{ m_url.duration_avg|floatformat:2 }}</td>
             <td>{{ m_url.duration_stddev|floatformat:2 }}</td>
             <td>{{ m_url.score|floatformat:1|default:'∞' }}</td>
-        </tr>
-        {% endspaceless %}{% endfor %}
+        </tr>{% endfor %}
     </tbody>
 </table>