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

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

2 files changed, 74 insertions, 3 deletions

diff --git a/templates/devel/admin_log.html b/templates/devel/admin_log.html
new file mode 100644
index 00000000..0f22ba2b
--- /dev/null
+++ b/templates/devel/admin_log.html
@@ -0,0 +1,62 @@
+{% extends "admin/base_site.html" %}
+{% load i18n %}
+
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css" />{% endblock %}
+
+{% block breadcrumbs %}<div class="breadcrumbs"><a href="/admin/">{% trans 'Home' %}</a>{% if title %} &rsaquo; {{ title }}{% endif %}</div>{% endblock %}
+
+{% block content %}
+<div id="content-main">
+    <div class="module">
+{% load log %}
+{% if log_user %}
+{% get_admin_log 100 as admin_log for_user log_user %}
+{% else %}
+{% get_admin_log 100 as admin_log %}
+{% endif %}
+{% if not admin_log %}
+<p>{% trans 'None available' %}</p>
+{% else %}
+<table id="change-history">
+    <thead>
+        <tr>
+            <th scope="col">{% trans 'Date/time' %}</th>
+            <th scope="col">{% trans 'User' %}</th>
+            <th>Type</th>
+            <th>Object</th>
+            <th scope="col">{% trans 'Action' %}</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for entry in admin_log %}
+        <tr>
+            <th scope="row">{{ entry.action_time|date:"DATETIME_FORMAT" }}</th>
+            {% if log_user %}
+            <td>{{ entry.user.username }}{% if entry.user.get_full_name %} ({{ entry.user.get_full_name }}){% endif %}</td>
+            {% else %}
+            <td><a href="{{ entry.user.username }}/">{{ entry.user.username }}</a>{% if entry.user.get_full_name %} ({{ entry.user.get_full_name }}){% endif %}</td>
+            {% endif %}
+            <td>
+                {% if entry.content_type %}
+                <span>{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span>
+                {% else %}
+                <span>{% trans 'Unknown content' %}</span>
+                {% endif %}
+            </td>
+            <td>
+                <span class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}"></span>
+                {% if entry.is_deletion %}
+                {{ entry.object_repr }}
+                {% else %}
+                <a href="/admin/{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
+                {% endif %}
+            </td>
+            <td>{{ entry.change_message }}</td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
+{% endif %}
+    </div>
+</div>
+{% endblock %}
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 %}