diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
| commit | 03fa7e4f27bdb39a8f8f5ed91a87d18bf8357b47 (patch) | |
| tree | c67eafcbda55706f18400b3115a2b8a5be318394 /templates/mirrors/mirrors.html | |
| parent | 91c451821ce7000cbc268cec8427d208a6cedd7e (diff) | |
| parent | b8ee7b1ee281b45b245fb454228b8ad847c56200 (diff) | |
Merge branch 'archweb' into archweb-generic2
Conflicts:
devel/views.py
feeds.py
public/views.py
settings.py
sitestatic/archweb.js
templates/base.html
templates/devel/profile.html
templates/mirrors/status.html
templates/news/view.html
templates/packages/flaghelp.html
templates/packages/opensearch.xml
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
templates/registration/login.html
templates/releng/results.html
templates/todolists/public_list.html
Diffstat (limited to 'templates/mirrors/mirrors.html')
| -rw-r--r-- | templates/mirrors/mirrors.html | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html index aea458d8..16c6fb3b 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -10,7 +10,6 @@ <tr> <th>Server</th> <th>Tier</th> - <th>Country</th> <th>ISOs</th> <th>Protocols</th> {% if user.is_authenticated %} @@ -27,9 +26,8 @@ <td><a href="{{ mirror.get_absolute_url }}" title="Mirror details for {{ mirror.name }}">{{ mirror.name }}</a></td> <td>{{ mirror.get_tier_display }}</td> - <td>{% if mirror.country %}<img src="{{ mirror.country.flag }}" alt=""/> {% endif %}{{ mirror.country.name }}</td> <td>{{ mirror.isos|yesno|capfirst }}</td> - <td class="wrap">{{ mirror.supported_protocols|join:", " }}</td> + <td class="wrap">{{ mirror.protocols|join:", " }}</td> {% if user.is_authenticated %} <td>{{ mirror.public|yesno|capfirst }}</td> <td>{{ mirror.active|yesno|capfirst }}</td> @@ -41,12 +39,11 @@ </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() { - $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [2,0]]}); + $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]}); }); </script> {% endblock %} |