From 1c6099f4b27f31c100b8bfa0d18f439075cceff0 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 23 Sep 2010 18:15:00 -0500
Subject: Make general mirror list view public

Hide some columns when not logged in because they aren't relevant for the
general public, but this will work nicely as a base page for all of our
known mirrors.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/devel/mirrorlist.html | 49 ---------------------------------------
 templates/mirrors/mirrors.html  | 51 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 49 deletions(-)
 delete mode 100644 templates/devel/mirrorlist.html
 create mode 100644 templates/mirrors/mirrors.html

(limited to 'templates')

diff --git a/templates/devel/mirrorlist.html b/templates/devel/mirrorlist.html
deleted file mode 100644
index 9ae6563..0000000
--- a/templates/devel/mirrorlist.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Arch Linux - Mirror Overview{% endblock %}
-
-{% block content %}
-<div id="dev-mirrorlist" class="box">
-
-    <h2>Mirror List</h2>
-
-    <table class="results">
-        <thead>
-            <tr>
-                <th>Server</th>
-                <th>Tier</th>
-                <th>Country</th>
-                <th>Admin Email</th>
-                <th>Public</th>
-                <th>Active</th>
-                <th>ISOs</th>
-                <th>Protocols</th>
-                <th>Rsync IPs</th>
-                <th>Notes</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for mirror in mirror_list %}
-                <tr class="{% cycle 'odd' 'even' %}">
-                    <td>{{mirror.name}}</td>
-                    <td>{{mirror.get_tier_display}}</td>
-                    <td>{{mirror.country}}</td>
-                    <td>{{mirror.admin_email}}</td>
-                    <td>{{mirror.public|yesno}}</td>
-                    <td>{{mirror.active|yesno}}</td>
-                    <td>{{mirror.isos|yesno}}</td>
-                    <td class="wrap">{{mirror.supported_protocols}}</td>
-                    <td>{{mirror.rsync_ips.count}}</td>
-                    <td class="wrap">{{mirror.notes}}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [2,0]]});
-});
-</script>
-{% endblock %}
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html
new file mode 100644
index 0000000..253efe5
--- /dev/null
+++ b/templates/mirrors/mirrors.html
@@ -0,0 +1,51 @@
+{% extends "base.html" %}
+{% block title %}Arch Linux - Mirror Overview{% endblock %}
+
+{% block content %}
+<div id="dev-mirrorlist" class="box">
+    <h2>Mirror Overview</h2>
+    <table class="results">
+        <thead>
+            <tr>
+                <th>Server</th>
+                <th>Tier</th>
+                <th>Country</th>
+                <th>ISOs</th>
+                <th>Protocols</th>
+                {% if user.is_authenticated %}
+                <th>Public</th>
+                <th>Active</th>
+                <th>Rsync IPs</th>
+                <th>Admin Email</th>
+                <th>Notes</th>
+                {% endif %}
+            </tr>
+        </thead>
+        <tbody>
+            {% for mirror in mirror_list %}
+            <tr class="{% cycle 'odd' 'even' %}">
+                <td>{{mirror.name}}</td>
+                <td>{{mirror.get_tier_display}}</td>
+                <td>{{mirror.country}}</td>
+                <td>{{mirror.isos|yesno}}</td>
+                <td class="wrap">{{mirror.supported_protocols}}</td>
+                {% if user.is_authenticated %}
+                <td>{{mirror.public|yesno}}</td>
+                <td>{{mirror.active|yesno}}</td>
+                <td class="wrap">{{mirror.rsync_ips.all|join:', '}}</td>
+                <td>{{mirror.admin_email}}</td>
+                <td class="wrap">{{mirror.notes|linebreaks}}</td>
+                {% endif %}
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [2,0]]});
+});
+</script>
+{% endblock %}
-- 
cgit v1.2.3-24-g4f1b