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

4 files changed, 92 insertions, 26 deletions

diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index 409ba24c..a7bc7315 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 }} - Developer 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>Developer World Clocks</h2>
@@ -11,8 +14,19 @@
     <p>This page helps prevent you from waking a sleeping developer. It also
     depends on developers 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>Developer</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,25 @@
                 <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>
+{% 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 %}
diff --git a/templates/devel/index.html b/templates/devel/index.html
index a7ffe0e2..b2dfe077 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -2,6 +2,7 @@
 {% load static from staticfiles %}
 {% load cache %}
 {% load package_extras %}
+{% load todolists %}
 
 {% block title %}{{ BRANDING_DISTRONAME }} - Developer Dashboard{% endblock %}
 
@@ -39,7 +40,7 @@
                     <td>{{ pkg.last_update|date }}</td>
                 </tr>
             {% empty %}
-                <tr class="empty"><td colspan="6"><em>No flagged packages to display</em></td></tr>
+                <tr class="empty"><td colspan="7"><em>No flagged packages to display</em></td></tr>
             {% endfor %}
         </tbody>
     </table>
@@ -59,11 +60,11 @@
         <tbody>
             {% for todopkg in todopkgs %}
                 <tr class="{% cycle 'odd' 'even' %}">
-                    <td><a href="{{ todopkg.list.get_absolute_url }}"
-                            title="View todo list: {{ todopkg.list.name }}">{{ todopkg.list.name }}</a></td>
-                    <td>{% pkg_details_link todopkg.pkg %}</td>
-                    <td>{{ todopkg.pkg.repo.name }}</td>
-                    <td>{{ todopkg.pkg.arch.name }}</td>
+                    <td><a href="{{ todopkg.todolist.get_absolute_url }}"
+                            title="View todo list: {{ todopkg.todolist.name }}">{{ todopkg.todolist.name }}</a></td>
+                    <td>{% todopkg_details_link todopkg %}</td>
+                    <td>{{ todopkg.repo.name }}</td>
+                    <td>{{ todopkg.arch.name }}</td>
                     <td>{{ todopkg.pkg.maintainers|join:', ' }}</td>
                 </tr>
             {% empty %}
@@ -90,7 +91,7 @@
             <tr class="{% cycle 'odd' 'even' %}">
                 <td><a href="{{ todo.get_absolute_url }}"
                         title="View todo list: {{ todo.name }}">{{ todo.name }}</a></td>
-                <td>{{ todo.date_added|date }}</td>
+                <td>{{ todo.created|date }}</td>
                 <td>{{ todo.creator.get_full_name }}</td>
                 <td class="wrap">{{ todo.description|urlize }}</td>
                 <td>{{ todo.pkg_count }}</td>
@@ -194,10 +195,10 @@
                     <td>{{ arch.name }}</td>
                     <td><a href="/packages/?arch={{ arch.name }}"
                             title="View all packages for the {{ arch.name }} architecture">
-                            <strong>{{ arch.packages.count }}</strong> packages</a></td>
+                            <strong>{{ arch.total_ct }}</strong> packages</a></td>
                     <td><a href="/packages/?arch={{ arch.name }}&amp;flagged=Flagged"
                             title="View all flagged packages for the {{ arch.name }} architecture">
-                            <strong>{{ arch.packages.flagged.count }}</strong> packages</a></td>
+                            <strong>{{ arch.flagged_ct }}</strong> packages</a></td>
                 </tr>
             {% endfor %}
         </tbody>
@@ -216,6 +217,7 @@
                 <th class="key">Repository</th>
                 <th># Packages</th>
                 <th># Flagged</th>
+                <th># Maintainers</th>
             </tr>
         </thead>
         <tbody>
@@ -224,10 +226,12 @@
                     <td>{{ repo.name }}</td>
                     <td><a href="/packages/?repo={{ repo.name }}"
                             title="View all packages in the {{ repo.name }} repository">
-                            <strong>{{ repo.packages.count }}</strong> packages</a></td>
+                            <strong>{{ repo.total_ct }}</strong> packages</a></td>
                     <td><a href="/packages/?repo={{ repo.name }}&amp;flagged=Flagged"
                             title="View all flagged packages in the {{ repo.name }} repository">
-                            <strong>{{ repo.packages.flagged.count }}</strong> packages</a></td>
+                            <strong>{{ repo.flagged_ct }}</strong> packages</a></td>
+                    <td><strong>{{ repo.maintainer_ct }}</strong> maintainers</td>
+                </tr>
                 </tr>
             {% endfor %}
         </tbody>
@@ -291,8 +295,7 @@
 </div>{# #dash-by-developer #}
 {% endcache %}
 
-{% 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() {
@@ -307,11 +310,14 @@ $(document).ready(function() {
             sortList: [[0,0]],
             headers: { 6: {sorter: false } }
     });
-    $(".dash-stats").tablesorter({
+    var settings = {
         widgets: ['zebra'],
         sortList: [[0,0]],
         headers: { 1: { sorter: 'pkgcount' }, 2: { sorter: 'pkgcount' }, 3: { sorter: 'pkgcount' } }
-    });
+    };
+    $(".dash-stats").not($("#stats-by-maintainer")).tablesorter(settings);
+    settings['sortLocaleCompare'] = true;
+    $("#stats-by-maintainer").tablesorter(settings);
 });
 </script>
 {% endblock %}
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
index 77146891..0aed22f4 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -13,7 +13,28 @@
     {% if maintainer %}This report only includes packages maintained by
     {{ maintainer.get_full_name }} ({{ maintainer.username }}).{% endif %}
     </p>
-    <table class="results">
+
+    <div class="box filter-criteria">
+        <h3>Filter Packages</h3>
+        <form id="report_filter" method="post" action=".">
+        <fieldset>
+            <legend>Select filter criteria</legend>
+            {% for arch in arches %}
+            <div><label for="id_arch_{{ arch.name }}" title="Architecture {{ arch.name }}">Arch {{ arch.name }}</label>
+                <input type="checkbox" name="arch_{{ arch.name }}" id="id_arch_{{ arch.name }}" class="arch_filter" value="{{ arch.name }}" checked="checked"/></div>
+            {% endfor %}
+            {% for repo in repos %}
+            <div><label for="id_repo_{{ repo.name|lower }}" title="Target Repository {{ repo.name }}">[{{ repo.name|lower }}]</label>
+                <input type="checkbox" name="repo_{{ repo.name|lower }}" id="id_repo_{{ repo.name|lower }}" class="repo_filter" value="{{ repo.name|lower }}" checked="checked"/></div>
+            {% endfor %}
+            <div ><label>&nbsp;</label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div>
+            <div class="clear"></div>
+            <div id="filter-info"><span id="filter-count">{{ packages|length }}</span> packages displayed.</div>
+        </fieldset>
+        </form>
+    </div>
+
+    <table id="dev-report-results" class="results">
         <thead>
             <tr>
                 <th>Arch</th>
@@ -31,7 +52,7 @@
         </thead>
         <tbody>
             {% for pkg in packages %}
-            <tr class="{% cycle pkgr2,pkgr1 %}">
+            <tr class="{% cycle pkgr2,pkgr1 %} {{ pkg.arch.name }} {{ pkg.repo.name|lower }}">
                 <td>{{ pkg.arch.name }}</td>
                 <td>{{ pkg.repo.name|capfirst }}</td>
                 <td>{% pkg_details_link pkg %}</td>
@@ -52,12 +73,18 @@
         </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']});
 });
+$(document).ready(function() {
+    var filter_func = function() { filter_pkgs_list('#report_filter', '#dev-report-results tbody'); };
+    $('#report_filter input').change(filter_func);
+    $('#criteria_reset').click(function() { filter_pkgs_reset(filter_func); });
+    // fire function on page load to ensure the current form selections take effect
+    filter_func();
+});
 </script>
 {% endblock %}
diff --git a/templates/devel/profile.html b/templates/devel/profile.html
index 54a3771c..16057275 100644
--- a/templates/devel/profile.html
+++ b/templates/devel/profile.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
+
 {% block title %}{{ BRANDING_DISTRONAME }} - Edit Profile{% endblock %}
 
 {% block content %}
@@ -22,4 +24,16 @@
     </form>
 
 </div>
+
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
+<script type="text/javascript">
+    modify_attributes({
+        '#id_email': {type: 'email'},
+        '#id_alias': {autocorrect: 'off', autocapitalize: 'off'},
+        '#id_public_email': {autocorrect: 'off', autocapitalize: 'off'},
+        '#id_website': {type: 'url'},
+        '#id_yob': {pattern: '[0-9]*'}
+    });
+</script>
 {% endblock %}