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

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

14 files changed, 147 insertions, 57 deletions

diff --git a/templates/admin/index.html b/templates/admin/index.html
index 6f7f98ee..93cf258d 100644
--- a/templates/admin/index.html
+++ b/templates/admin/index.html
@@ -14,10 +14,18 @@
     <div class="module">
         <table>
             <caption>Custom Admin Pages</caption>
+            {% if perms.auth.add_user %}
             <tr>
                 <th scope="row"><a href="/devel/newuser/">Create New User</a></th>
                 <td></td><td></td>
             </tr>
+            {% endif %}
+            {% if user.is_superuser %}
+            <tr>
+                <th scope="row"><a href="/devel/admin_log/">Admin Actions Log</a></th>
+                <td></td><td></td>
+            </tr>
+            {% endif %}
         </table>
     </div>
 
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 %}
diff --git a/templates/feeds/packages_title.html b/templates/feeds/packages_title.html
index 910c6207..5c54ba65 100644
--- a/templates/feeds/packages_title.html
+++ b/templates/feeds/packages_title.html
@@ -1 +1 @@
-{{ obj.pkgname }} {{ obj.pkgver }}-{{ obj.pkgrel }} {{ obj.arch.name }}
+{{ obj.pkgname }} {{ obj.full_version }} {{ obj.arch.name }}
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 4fae6c68..8cda7ca3 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,14 +1,14 @@
 {% extends "base.html" %}
 {% load cache %}
 
-{% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package Details{% endblock %}
+{% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.full_version }} - Package Details{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% load package_extras %}
 {% block content %}
 <div id="pkgdetails" class="box">
 
-    <h2>Package Details: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
+    <h2>Package Details: {{ pkg.pkgname }} {{ pkg.full_version }}</h2>
 
     <div id="detailslinks" class="listing">
 
@@ -23,7 +23,7 @@
                 {% with pkg.in_testing as tp %}{% if tp %}
                 <li><span class="flagged">Version
                     <a href="{{ tp.get_absolute_url }}"
-                        title="Testing package details for {{ tp.pkgname }}">{{ tp.pkgver }}-{{ tp.pkgrel }}</a>
+                        title="Testing package details for {{ tp.pkgname }}">{{ tp.full_version }}</a>
                     in testing</span></li>
                 {% endif %}{% endwith %}
                 {% if perms.main.change_package %}
@@ -58,7 +58,7 @@
             <ul>
                 {% for o in others %}
                 <li><a href="{{ o.get_absolute_url }}"
-                    title="Package details for {{ o.pkgname }}">{{ o.pkgname }} {{ o.pkgver }}-{{ o.pkgrel }} [{{ o.repo.name|lower }}] ({{ o.arch.name }})</a></li>
+                    title="Package details for {{ o.pkgname }}">{{ o.pkgname }} {{ o.full_version }} [{{ o.repo.name|lower }}] ({{ o.arch.name }})</a></li>
                 {% endfor %}
             </ul>
         </div>
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index ba2d9bf5..69c39756 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -45,12 +45,12 @@
                 {% if diff.pkg_a %}
                 <td><a href="{{ diff.pkg_a.get_absolute_url }}"
                         title="View package details for {{ diff.pkg_a.pkgname }}">
-                        <span{% if diff.pkg_a.flag_date %} class="flagged"{% endif %}>{{ diff.pkg_a.pkgver }}-{{ diff.pkg_a.pkgrel }}</span></a></td>
+                        <span{% if diff.pkg_a.flag_date %} class="flagged"{% endif %}>{{ diff.pkg_a.full_version }}</span></a></td>
                 {% else %}<td>-</td>{% endif %}
                 {% if diff.pkg_b %}
                 <td><a href="{{ diff.pkg_b.get_absolute_url }}"
                         title="View package details for {{ diff.pkg_b.pkgname }}">
-                        <span{% if diff.pkg_b.flag_date %} class="flagged"{% endif %}>{{ diff.pkg_b.pkgver }}-{{ diff.pkg_b.pkgrel }}</span></a></td>
+                        <span{% if diff.pkg_b.flag_date %} class="flagged"{% endif %}>{{ diff.pkg_b.full_version }}</span></a></td>
                 {% else %}<td>-</td>{% endif %}
             </tr>
             {% endfor %}
diff --git a/templates/packages/files.html b/templates/packages/files.html
index cd6b4c46..149154a6 100644
--- a/templates/packages/files.html
+++ b/templates/packages/files.html
@@ -1,11 +1,11 @@
 {% extends "base.html" %}
-{% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package File List{% endblock %}
+{% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.full_version }} - Package File List{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
 <div id="pkgdetails" class="box">
 
-    <h2>Package File List: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
+    <h2>Package File List: {{ pkg.pkgname }} {{ pkg.full_version }}</h2>
     <div id="metadata">
         <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p>
         {% include "packages/files-list.html" %}
diff --git a/templates/packages/group_details.html b/templates/packages/group_details.html
index ee4f61d3..2a5a6149 100644
--- a/templates/packages/group_details.html
+++ b/templates/packages/group_details.html
@@ -24,9 +24,9 @@
                 <td><a href="{{ pkg.get_absolute_url }}"
                         title="Package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
                 {% if pkg.flag_date %}
-                <td><span class="flagged">{{ pkg.pkgver }}-{{ pkg.pkgrel }}</span></td>
+                <td><span class="flagged">{{ pkg.full_version }}</span></td>
                 {% else %}
-                <td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
+                <td>{{ pkg.full_version }}</td>
                 {% endif %}
                 <td class="wrap">{{ pkg.pkgdesc }}</td>
                 <td>{{ pkg.last_update|date }}</td>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index ead009d0..ae9e55f2 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -14,28 +14,36 @@
 
     <h3>Package Search</h3>
 
-	<form id="pkg-search" method="get" action="/packages/">
-		<p><input type="hidden" name="sort" value='{{sort}}' /></p>
-		<fieldset>
-			<legend>Enter search criteria</legend>
-			<div><label for="id_arch" title="Limit results a specific CPU architecture">
-					Arch</label>{{ search_form.arch }}</div>
-			<div><label for="id_repo" title="Limit results to a specific respository">
-					Repository</label>{{ search_form.repo }}</div>
-			<div><label for="id_q" title="Enter keywords as desired">
-					Keywords</label>{{ search_form.q }}</div>
-			<div><label for="id_maintainer" title="Limit results to a specific maintainer">
-					Maintainer</label>{{ search_form.maintainer}}</div>
-			<div><label for="id_last_update" title="Limit results to a date after the date entered">
-					Last Updated After</label>{{ search_form.last_update }}</div>
-			<div><label for="id_flagged" title="Limit results based on out-of-date status">
-					Flagged</label>{{ search_form.flagged }}</div>
-			<div><label for="id_limit" title="Select the number of results to display per page">
-					Per Page</label>{{ search_form.limit }}</div>
-			<div ><label>&nbsp;</label><input title="Search for packages using this criteria"
-				type="submit" value="Search" /></div>
-		</fieldset>
-	</form>
+    <form id="pkg-search" method="get" action="/packages/">
+        <p><input type="hidden" name="sort" value='{{sort}}' /></p>
+        {{ search_form.non_field_errors }}
+        <fieldset>
+            <legend>Enter search criteria</legend>
+            <div>{{ search_form.arch.errors }}
+                <label for="id_arch" title="Limit results a specific CPU architecture">
+                    Arch</label>{{ search_form.arch }}</div>
+            <div>{{ search_form.repo.errors }}
+                <label for="id_repo" title="Limit results to a specific respository">
+                    Repository</label>{{ search_form.repo }}</div>
+            <div>{{ search_form.q.errors }}
+                <label for="id_q" title="Enter keywords as desired">
+                    Keywords</label>{{ search_form.q }}</div>
+            <div>{{ search_form.maintainer.errors }}
+                <label for="id_maintainer" title="Limit results to a specific maintainer">
+                    Maintainer</label>{{ search_form.maintainer}}</div>
+            <div>{{ search_form.last_update.errors }}
+                <label for="id_last_update" title="Limit results to a date after the date entered">
+                    Last Updated After</label>{{ search_form.last_update }}</div>
+            <div>{{ search_form.flagged.errors }}
+                <label for="id_flagged" title="Limit results based on out-of-date status">
+                    Flagged</label>{{ search_form.flagged }}</div>
+            <div>{{ search_form.limit.errors }}
+                <label for="id_limit" title="Select the number of results to display per page">
+                    Per Page</label>{{ search_form.limit }}</div>
+            <div ><label>&nbsp;</label><input title="Search for packages using this criteria"
+                type="submit" value="Search" /></div>
+        </fieldset>
+    </form>
 
 </div><!-- #pkglist-search -->
 
@@ -50,13 +58,13 @@
 
         <p class="pkglist-nav">
             {% if page_obj.has_previous %}
-            <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+            <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
                 title="Go to previous page">&lt; Prev</a>
             {% else %}
             <span class="prev">&lt; Prev</span>
             {% endif %}
             {% if page_obj.has_next %}
-            <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+            <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
                 title="Go to next page">Next &gt;</a>
             {% else %}
             <span class="next">Next &gt;</span>
@@ -74,17 +82,17 @@
                     {% if perms.main.change_package %}
                     <th>&nbsp;</th>
                     {% endif %}
-                    <th><a href="/packages/{% buildsortqs "arch" %}"
+                    <th><a href="/packages/?{% buildsortqs "arch" %}"
                             title="Sort packages by architecture">Arch</a></th>
-                    <th><a href="/packages/{% buildsortqs "repo" %}"
+                    <th><a href="/packages/?{% buildsortqs "repo" %}"
                             title="Sort packages by repository">Repo</a></th>
-                    <th><a href="/packages/{% buildsortqs "pkgname" %}"
+                    <th><a href="/packages/?{% buildsortqs "pkgname" %}"
                             title="Sort packages by package name">Name</a></th>
                     <th>Version</th>
                     <th>Description</th>
-                    <th><a href="/packages/{% buildsortqs "-last_update" %}"
+                    <th><a href="/packages/?{% buildsortqs "-last_update" %}"
                             title="Sort packages by last update">Last Updated</a></th>
-                    <th><a href="/packages/{% buildsortqs "-flag_date" %}"
+                    <th><a href="/packages/?{% buildsortqs "-flag_date" %}"
                             title="Sort packages by when marked-out of-date">Flag Date</a></th>
                 </tr>
             </thead>
@@ -99,9 +107,9 @@
                     <td><a href="{{ pkg.get_absolute_url }}"
                             title="Package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
                     {% if pkg.flag_date %}
-                    <td><span class="flagged">{{ pkg.pkgver }}-{{ pkg.pkgrel }}</span></td>
+                    <td><span class="flagged">{{ pkg.full_version }}</span></td>
                     {% else %}
-                    <td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
+                    <td>{{ pkg.full_version }}</td>
                     {% endif %}
                     <td class="wrap">{{ pkg.pkgdesc }}</td>
                     <td>{{ pkg.last_update|date }}</td>
@@ -118,13 +126,13 @@
 
                 <p class="pkglist-nav">
                     {% if page_obj.has_previous %}
-                    <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+                    <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
                         title="Go to previous page">&lt; Prev</a>
                     {% else %}
                     <span class="prev">&lt; Prev</span>
                     {% endif %}
                     {% if page_obj.has_next %}
-                    <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+                    <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
                         title="Go to next page">Next &gt;</a>
                     {% else %}
                     <span class="next">Next &gt;</span>
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index a9cce4a8..157843ac 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -26,7 +26,7 @@
                 <td>{{ pkg.arch.name }}</td>
                 <td><a href="{{ pkg.get_absolute_url }}"
                         title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
-                <td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
+                <td>{{ pkg.full_version }}</td>
                 <td>{{ pkg.last_update }}</td>
                 <td>{{ target }}</td>
                 <td class="signoff-{{pkg.approved_for_signoff|yesno}}">
diff --git a/templates/public/index.html b/templates/public/index.html
index ff11994f..3432ccad 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -75,7 +75,7 @@
         {% for update in pkg_updates %}
         {% with update|first as fpkg %}
         <tr>
-            <td class="pkg-name"><span class="{{ fpkg.repo|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td>
+            <td class="pkg-name"><span class="{{ fpkg.repo|lower }}">{{ fpkg.pkgname }} {{ fpkg.full_version }}</span></td>
             <td class="pkg-arch">
                 {% for pkg in update %}<a href="{{ pkg.get_absolute_url }}"
                     title="Details for {{ pkg.pkgname }} [{{ pkg.repo|lower }}]">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index a58fedc8..38d491d9 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -30,9 +30,9 @@
             <tr class="{% cycle 'odd' 'even' %}">
                 <td><a href="{{ list.get_absolute_url }}"
                         title="View todo list: {{ list.name }}">{{ list.name }}</a></td>
-                <td>{{ list.date_added }}</td>
+                <td>{{ list.date_added|date }}</td>
                 <td>{{ list.creator.get_full_name }}</td>
-                <td class="wrap">{{ list.description|safe }}</td>
+                <td class="wrap">{{ list.description|urlize }}</td>
                 <td>{{ list.pkg_count }}</td>
                 <td>{{ list.incomplete_count }}</td>
                 <td>{% ifequal list.incomplete_count 0 %}<span class="complete">Complete</span>
diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html
index 5b957692..ceb001de 100644
--- a/templates/todolists/public_list.html
+++ b/templates/todolists/public_list.html
@@ -22,13 +22,14 @@
     </div>
 </div>
 {% if todo_lists %}
-<div id="public_todo_lists">
+<div id="public-todo-lists">
     {% for list in todo_lists %}
     <div class="box">
-        <a name="{{ list.id }}"></a>
-        <h4>{{ list.name }}</h4>
-        <div class="todo_list">
-            <div>{{ list.description|safe|linebreaks }}</div>
+        <div class="todo-list">
+            <a name="{{ list.id }}"></a>
+            <h4>{{ list.name }}</h4>
+            <p class="todo-info">{{ list.date_added|date }} - {{ list.creator.get_full_name }}</p>
+            <div>{{ list.description|urlize|linebreaks }}</div>
             <table id="todo-pkglist-{{ list.id }}" class="results todo-table">
                 <thead>
                     <tr>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 477e0180..d4f5a08d 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -17,7 +17,9 @@
         {% endif %}
     </ul>
 
-    <p>{{list.description|safe|linebreaks}}</p>
+    <p class="todo-info">{{ list.date_added|date }} - {{ list.creator.get_full_name }}</p>
+
+    <div>{{list.description|urlize|linebreaks}}</div>
 
     <table id="dev-todo-pkglist" class="results todo-table">
         <thead>