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

1 files changed, 29 insertions, 7 deletions

diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index 9ee5494a..5b2e358b 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -1,9 +1,12 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
+{% load flags %}
 {% load tz %}
 
 {% block title %}{{ BRANDING_DISTRONAME }} - Hacker World Clocks{% endblock %}
 
+{% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %}
+
 {% block content %}
 <div id="dev-clocks-box" class="box">
     <h2>Hacker World Clocks</h2>
@@ -11,8 +14,19 @@
     <p>This page helps prevent you from waking a sleeping hacker. It also
     depends on hackers keeping the time zone information up to date, so if
     you see 'UTC' listed, pester them to update their settings.</p>
+    <p>The "Last Action" column shows the last time this developer has done
+    something we know about. Considered dates for each developer include:</p>
+    <ul>
+        <li>Build date of a package in the repositories</li>
+        <li>Last login to the developer side of this site</li>
+        <li>Admin log entry on this site (e.g., adding a donor, modifying a
+        mirror)</li>
+        <li>Post date of a news item</li>
+        <li>Signing off on a package</li>
+        <li>Flagging a package out-of-date</li>
+    </ul>
     <p>
-    UTC Time: {{ utc_now|date:"Y-m-d H:i T" }}
+    Current UTC Time: {{ utc_now|date:"Y-m-d H:i T" }}
     </p>
 
     <table id="clocks-table" class="results">
@@ -21,6 +35,7 @@
                 <th>Hacker</th>
                 <th>Username</th>
                 <th>Alias</th>
+                <th>Last Action</th>
                 <th>Location</th>
                 <th>Time Zone</th>
                 <th>Current Time</th>
@@ -32,21 +47,28 @@
                 <td><a href="mailto:{{ dev.email }}">{{ dev.get_full_name }}</a></td>
                 <td>{{ dev.username }}</td>
                 <td>{{ dev.userprofile.alias }}</td>
-                <td>{% if dev.userprofile.country %}<img src="{{ dev.userprofile.country.flag }}" alt="{{ dev.userprofile.country.name }}"/> {% endif %}{{ dev.userprofile.location }}</td>
+                <td>{{ dev.last_action }}</td>
+                <td>{% country_flag dev.userprofile.country %}{{ dev.userprofile.location }}</td>
                 <td>{{ dev.userprofile.time_zone }}</td>
-                <td>{{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }}</td>
+                <td>{{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }}<span class="hide"> {{ dev.userprofile.time_zone }}</span></td>
             </tr>
             {% endfor %}
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% endblock %}
+
+{% block script_block %}
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-    $("#clocks-table:has(tbody tr)").tablesorter(
-        {widgets: ['zebra'], sortList: [[0,0]]});
+    $("#clocks-table:has(tbody tr)").tablesorter({
+        widgets: ['zebra'],
+        sortLocaleCompare: true,
+        sortList: [[0,0]],
+        headers: { 4: { sorter: false } }
+    });
 });
 </script>
 {% endblock %}