diff options
| author | Dan McGee <dan@archlinux.org> | 2014-09-01 23:16:44 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2014-09-01 23:16:44 +0200 |
| commit | a8ceba34299cca271ddf433bf7618aa98e56cc36 (patch) | |
| tree | 18b60a477ad4d6126823902ce132d86e2954bd32 | |
| parent | 9335d3330b2cee8065cbd46eb71a7ebc50b4b037 (diff) | |
| download | archweb-a8ceba34299cca271ddf433bf7618aa98e56cc36.tar.gz archweb-a8ceba34299cca271ddf433bf7618aa98e56cc36.tar.xz | |
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | mirrors/models.py | 13 | ||||
| -rw-r--r-- | templates/mirrors/status.html | 4 | ||||
| -rw-r--r-- | templates/mirrors/status_table.html | 2 | ||||
| -rw-r--r-- | templates/mirrors/url_details.html | 4 |
4 files changed, 17 insertions, 6 deletions
diff --git a/mirrors/models.py b/mirrors/models.py index 4113222..e360801 100644 --- a/mirrors/models.py +++ b/mirrors/models.py @@ -75,6 +75,12 @@ class MirrorUrl(models.Model): created = models.DateTimeField(editable=False) active = models.BooleanField(default=True) + class Meta: + verbose_name = 'mirror URL' + + def __unicode__(self): + return self.url + def address_families(self): hostname = urlparse(self.url).hostname info = socket.getaddrinfo(hostname, None, 0, socket.SOCK_STREAM) @@ -101,11 +107,8 @@ class MirrorUrl(models.Model): self.has_ipv4 = False self.has_ipv6 = False - def __unicode__(self): - return self.url - - class Meta: - verbose_name = 'mirror URL' + def get_absolute_url(self): + return '/mirrors/%s/%d/' % (self.mirror.name, self.pk) class MirrorRsync(models.Model): diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index e97ad4b..24408be 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -80,7 +80,9 @@ <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> $(document).ready(function() { - var headers = { 4: { sorter: 'duration' }, 5: { sorter: 'mostlydigit' }, 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' } }; + var headers = { 4: { sorter: 'duration' }, 5: { sorter: 'mostlydigit' }, + 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, + 8: { sorter: false } }; $("#outofsync_mirrors:has(tbody tr)").tablesorter( {widgets: ['zebra'], sortList: [[4,0]], headers: headers }); $("#successful_mirrors:has(tbody tr)").tablesorter( diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index 278256a..8353830 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -11,6 +11,7 @@ <th>μ Duration (s)</th> <th>σ Duration (s)</th> <th>Mirror Score</th> + <th></th> </tr> </thead> <tbody> @@ -23,6 +24,7 @@ <td>{{ m_url.duration_avg|floatvalue:2 }}</td> <td>{{ m_url.duration_stddev|floatvalue:2 }}</td> <td>{{ m_url.score|floatvalue:1|default:'∞' }}</td> + <td><a href="{{ m_url.get_absolute_url }}">details</a></td> </tr>{% endfor %} </tbody> </table> diff --git a/templates/mirrors/url_details.html b/templates/mirrors/url_details.html index 201e189..557a1b7 100644 --- a/templates/mirrors/url_details.html +++ b/templates/mirrors/url_details.html @@ -18,6 +18,10 @@ <td>{% if url.protocol.is_download %}<a href="{{ url.url }}">{{ url.url }}</a>{% else %}{{ url.url }}{% endif %}</td> </tr> <tr> + <th>Mirror:</th> + <td><a href="../">{{ url.mirror.name }}</a></td> + </tr> + <tr> <th>Protocol:</th> <td>{{ url.protocol }}</td> </tr> |