From 945337177d35a5c038e29b6594e1251f26d42156 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 29 Mar 2014 11:56:29 -0500
Subject: Add last_modified column to mirrors

This will make it easier in the future to clear out inactive mirrors
that haven't been touched in a while.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/mirrors/mirror_details.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'templates')

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 8a652563..7e1ab9f8 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -45,6 +45,10 @@ <h2>Mirror Details: {{ mirror.name }}</h2>
             <th>Created:</th>
             <td>{{ mirror.created }}</td>
         </tr>
+        <tr>
+            <th>Last Modified:</th>
+            <td>{{ mirror.last_modified }}</td>
+        </tr>
         <tr>
             <th>Rsync IPs:</th>
             <td class="wrap">{{mirror.rsync_ips.all|join:', '}}</td>
-- 
cgit v1.2.3-54-g00ecf


From 35fc1b458ce4b549607f1ab0c846ba5998da0183 Mon Sep 17 00:00:00 2001
From: Jakub Klinkovský <j.l.k@gmx.com>
Date: Tue, 1 Jul 2014 13:03:06 +0200
Subject: update URLs to Arch wiki
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Klinkovský <j.l.k@gmx.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/public/download.html |  2 +-
 templates/public/index.html    | 10 +++++-----
 urls.py                        |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'templates')

diff --git a/templates/public/download.html b/templates/public/download.html
index 00db9bed..967d8a6e 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -28,7 +28,7 @@ <h3>Release Info</h3>
         {% if release.version %}<li><strong>Current Release:</strong> {{ release.version }}</li>{% endif %}
         {% if release.kernel_version %}<li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>{% endif %}
         {% if release.torrent_data %}<li><strong>ISO Size:</strong> {{ release.torrent.file_length|filesizeformat }}</li>{% endif %}
-        <li><a href="https://wiki.archlinux.org/index.php/Installation_Guide">Installation Guide</a></li>
+        <li><a href="https://wiki.archlinux.org/index.php/Installation_guide">Installation Guide</a></li>
         <li><strong>Resources:</strong>
             <ul>
                 <li><a href="https://bugs.archlinux.org/index.php?project=6"
diff --git a/templates/public/index.html b/templates/public/index.html
index ab836569..89486be8 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -112,9 +112,9 @@ <h4>Documentation</h4>
     <ul>
         <li><a href="https://wiki.archlinux.org/"
             title="Community documentation">Wiki</a></li>
-        <li><a href="https://wiki.archlinux.org/index.php/Installation_Guide"
+        <li><a href="https://wiki.archlinux.org/index.php/Installation_guide"
             title="Installation guide">Installation Guide</a></li>
-        <li><a href="https://wiki.archlinux.org/index.php/Beginners'_Guide"
+        <li><a href="https://wiki.archlinux.org/index.php/Beginners'_guide"
             title="A good place to start for beginners">Beginners' Guide</a></li>
     </ul>
 
@@ -123,11 +123,11 @@ <h4>Community</h4>
     <ul>
         <li><a href="https://mailman.archlinux.org/mailman/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
-        <li><a href="https://wiki.archlinux.org/index.php/IRC_Channels"
+        <li><a href="https://wiki.archlinux.org/index.php/IRC_channels"
             title="Official and regional IRC communities">IRC Channels</a></li>
         <li><a href="https://planet.archlinux.org/"
             title="Arch in the blogosphere">Planet Arch</a></li>
-        <li><a href="https://wiki.archlinux.org/index.php/International_Communities"
+        <li><a href="https://wiki.archlinux.org/index.php/International_communities"
             title="Arch communities in your native language">International Communities</a></li>
     </ul>
 
@@ -180,7 +180,7 @@ <h4>More Resources</h4>
     <ul>
         <li><a href="{% url 'page-keys' %}"
             title="Package/Database signing master keys">Signing Master Keys</a></li>
-        <li><a href="https://wiki.archlinux.org/index.php/Arch_Linux_Press_Review"
+        <li><a href="https://wiki.archlinux.org/index.php/Arch_Linux_press_coverage"
             title="Arch Linux in the media">Press Coverage</a></li>
         <li><a href="{% url 'page-art' %}" title="Arch logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
         <li><a href="{% url 'news-list' %}" title="News Archives">News Archives</a></li>
diff --git a/urls.py b/urls.py
index 79838ce3..46c8ace6 100644
--- a/urls.py
+++ b/urls.py
@@ -111,7 +111,7 @@
     ('^todolists/$',   '/todo/'),
 
     ('^docs/en/guide/install/arch-install-guide.html',
-        'https://wiki.archlinux.org/index.php/Installation_Guide'),
+        'https://wiki.archlinux.org/index.php/Installation_guide'),
     ('^docs/en/',
         'https://wiki.archlinux.org/'),
     ('^docs/',
-- 
cgit v1.2.3-54-g00ecf


From 9335d3330b2cee8065cbd46eb71a7ebc50b4b037 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 1 Sep 2014 15:53:23 -0500
Subject: Save some space, (secs) -> (s)

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/mirrors/mirror_details.html | 4 ++--
 templates/mirrors/status_table.html   | 4 ++--
 templates/mirrors/url_details.html    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 7e1ab9f8..2ff41828 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -105,8 +105,8 @@ <h3>Available URLs</h3>
                 <th>Last Sync</th>
                 <th>Completion %</th>
                 <th>μ Delay (hh:mm)</th>
-                <th>μ Duration (secs)</th>
-                <th>σ Duration (secs)</th>
+                <th>μ Duration (s)</th>
+                <th>σ Duration (s)</th>
                 <th>Score</th>
                 <th>Details</th>
             </tr>
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index 00b9c1df..278256ae 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -8,8 +8,8 @@
             <th>Country</th>
             <th>Completion %</th>
             <th>μ Delay (hh:mm)</th>
-            <th>μ Duration (secs)</th>
-            <th>σ Duration (secs)</th>
+            <th>μ Duration (s)</th>
+            <th>σ Duration (s)</th>
             <th>Mirror Score</th>
         </tr>
     </thead>
diff --git a/templates/mirrors/url_details.html b/templates/mirrors/url_details.html
index 54960a0d..201e1895 100644
--- a/templates/mirrors/url_details.html
+++ b/templates/mirrors/url_details.html
@@ -63,7 +63,7 @@ <h3>Check Logs</h3>
                 <th>Check IP</th>
                 <th>Last Sync</th>
                 <th>Delay (hh:mm)</th>
-                <th>Duration (secs)</th>
+                <th>Duration (s)</th>
                 <th>Success?</th>
                 <th>Error Message</th>
             </tr>
-- 
cgit v1.2.3-54-g00ecf


From a8ceba34299cca271ddf433bf7618aa98e56cc36 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 1 Sep 2014 16:16:44 -0500
Subject: Add details link to mirror status page

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 mirrors/models.py                   | 13 ++++++++-----
 templates/mirrors/status.html       |  4 +++-
 templates/mirrors/status_table.html |  2 ++
 templates/mirrors/url_details.html  |  4 ++++
 4 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/mirrors/models.py b/mirrors/models.py
index 41132229..e360801b 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 @@ def clean(self):
             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 e97ad4ba..24408be7 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -80,7 +80,9 @@ <h3>Mirror Syncing Error Log</h3>
 <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 278256ae..83538303 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 201e1895..557a1b79 100644
--- a/templates/mirrors/url_details.html
+++ b/templates/mirrors/url_details.html
@@ -17,6 +17,10 @@ <h2>URL Details: {{ url.url }}</h2>
             <th>URL:</th>
             <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>
-- 
cgit v1.2.3-54-g00ecf


From df672693d9530acadcac0cbc75553749fb58f9cd Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 28 Jun 2014 12:41:18 -0500
Subject: Update for admin changes for Django 1.7

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 devel/views.py             | 2 ++
 templates/admin/index.html | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'templates')

diff --git a/devel/views.py b/devel/views.py
index 972d0abb..92cb098e 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -5,6 +5,7 @@
 from django.http import HttpResponseRedirect
 from django.contrib.auth.decorators import \
         login_required, permission_required, user_passes_test
+from django.contrib import admin
 from django.contrib.admin.models import LogEntry, ADDITION
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
@@ -259,6 +260,7 @@ def admin_log(request, username=None):
         'title': "Admin Action Log",
         'log_user':  user,
     }
+    context.update(admin.site.each_context())
     return render(request, 'devel/admin_log.html', context)
 
 # vim: set ts=4 sw=4 et:
diff --git a/templates/admin/index.html b/templates/admin/index.html
index fddd55e5..89ee1df1 100644
--- a/templates/admin/index.html
+++ b/templates/admin/index.html
@@ -5,7 +5,7 @@
 
 {% block coltype %}colMS{% endblock %}
 
-{% block bodyclass %}dashboard{% endblock %}
+{% block bodyclass %}{{ block.super }} dashboard{% endblock %}
 
 {% block breadcrumbs %}{% endblock %}
 
@@ -34,9 +34,7 @@
         <div class="app-{{ app.app_label }} module">
         <table>
         <caption>
-            <a href="{{ app.app_url }}" class="section" title="{% blocktrans with name=app.name %}Models in the {{ name }} application{% endblocktrans %}">
-                {% blocktrans with name=app.name %}{{ name }}{% endblocktrans %}
-            </a>
+            <a href="{{ app.app_url }}" class="section" title="{% blocktrans with name=app.name %}Models in the {{ name }} application{% endblocktrans %}">{{ app.name }}</a>
         </caption>
         {% for model in app.models %}
             <tr class="model-{{ model.object_name|lower }}">
-- 
cgit v1.2.3-54-g00ecf


From 0f0ce18109f8104d7b2abe9024ef26fa07ff0292 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 30 Sep 2014 09:32:08 -0500
Subject: Update AUR feed URL

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/public/feeds.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index f354fa47..5e6fd7c5 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -62,7 +62,7 @@ <h3>Package Feeds</h3>
         </tbody>
     </table>
 
-    <p>A <a href="https://aur.archlinux.org/rss.php" class="rss" title="AUR newest packages feed">newest packages feed</a>
+    <p>A <a href="https://aur.archlinux.org/rss/" class="rss" title="AUR newest packages feed">newest packages feed</a>
     is also available from the <a href="https://aur.archlinux.org/" title="AUR Homepage">Arch User Repository (AUR)</a>.</p>
 
     <h3>Release Feed</h3>
-- 
cgit v1.2.3-54-g00ecf