diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 00:36:57 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 00:36:57 -0400 |
commit | df7a6aa620af6a165bdacd755757f8cb1179331c (patch) | |
tree | 384b4c62d1f50d8effb733d81d2a810666807624 /templates/mirrors/mirror_details.html | |
parent | 94f972bb892dbf9a86f089f1872ae6d849c0cd0e (diff) | |
parent | a22557811a24b68ef85d4271787c48d8d1e4fc99 (diff) |
Merge branch 'archweb-generic2'
Conflicts:
README.BRANDING
local_settings.py.example
packages/templatetags/package_extras.py
public/views.py
releng/views.py
settings.py
sitestatic/archnavbar/archnavbar.css
sitestatic/silhouette.png
templates/base.html
templates/packages/differences.html
templates/packages/opensearch.xml
templates/packages/search.html
templates/public/donate.html
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
urls.py
Diffstat (limited to 'templates/mirrors/mirror_details.html')
-rw-r--r-- | templates/mirrors/mirror_details.html | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 76ab3d5b..98755ad2 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -1,16 +1,18 @@ {% extends "base.html" %} {% load static from staticfiles %} {% load mirror_status %} +{% load flags %} {% block title %}{{ BRANDING_DISTRONAME }} - {{ mirror.name }} - Mirror Details{% endblock %} +{% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% 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> @@ -20,10 +22,6 @@ <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> </tr> @@ -78,6 +76,8 @@ <thead> <tr> <th>Mirror URL</th> + <th>Protocol</th> + <th>Country</th> <th>IPv4</th> <th>IPv6</th> <th>Last Sync</th> @@ -92,6 +92,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">{% 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> @@ -105,14 +107,31 @@ </tbody> </table> </div> -{% load cdn %}{% jquery %} -<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script> + +<div class="box"> + <h2>Mirror Status Charts</h2> + + <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="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> +<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' } } }); + {widgets: ['zebra'], sortList: [[1,0], [2,0]], + headers: { 8: { sorter: 'mostlydigit' }, 9: { sorter: 'mostlydigit' }, 10: { sorter: 'mostlydigit' } } }); +}); +$(document).ready(function() { + draw_graphs("/mirrors/locations/json/", "./json/", "#charts-container"); }); </script> {% endblock %} |