Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	templates/packages/details.html
	templates/packages/files.html

1 files changed, 12 insertions, 3 deletions

diff --git a/templates/devel/index.html b/templates/devel/index.html
index b681a96e..260e0cb9 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -27,8 +27,8 @@
                     <td>{{ pkg.repo.name }}</td>
                     <td>{{ pkg.pkgver }}</td>
                     <td>{{ pkg.arch.name }}</td>
-                    <td>{{ pkg.flag_date }}</td>
-                    <td>{{ pkg.last_update }}</td>
+                    <td>{{ pkg.flag_date|date }}</td>
+                    <td>{{ pkg.last_update|date }}</td>
                 </tr>
             {% empty %}
                 <tr class="empty"><td colspan="4"><em>No flagged packages to display</em></td></tr>
@@ -80,7 +80,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 }}</td>
+                    <td>{{ todo.date_added|date }}</td>
                     <td class="wrap">{{ todo.description|safe }}</td>
                 </tr>
             {% empty %}
@@ -166,6 +166,15 @@
                 <th># Packages</th>
                 <th># Flagged</th>
             </tr>
+            <tr class="even">
+                <td><em>Orphan</em></td>
+                <td><a href="/packages/?maintainer=orphan"
+                        title="View all orphan packages">
+                        <strong>{{ orphan.package_count }}</strong> packages</a></td>
+                <td><a href="/packages/?maintainer=orphan&amp;flagged=Flagged"
+                        title="View all flagged orphan packages">
+                        <strong>{{ orphan.flagged_count }}</strong> packages</a></td>
+            </tr>
         </thead>
         <tbody>
             {% for maint in maintainers %}