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

Conflicts:
	templates/packages/packages_list.html
	templates/public/index.html

1 files changed, 47 insertions, 0 deletions

diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html
new file mode 100644
index 00000000..2508d8fd
--- /dev/null
+++ b/templates/packages/packages_list.html
@@ -0,0 +1,47 @@
+{% extends "base.html" %}
+{% block title %}Parabola - {{ name }} ({{ arch.name }}) - {{ list_title }}{% endblock %}
+{% block navbarclass %}anb-packages{% endblock %}
+
+{% block content %}
+<div class="box">
+    <h2>{{ list_title }} - {{ name }} ({{ arch.name }})</h2>
+    <table class="results">
+        <thead>
+            <tr>
+                <th>Arch</th>
+                <th>Repo</th>
+                <th>Name</th>
+                <th>Version</th>
+                <th>Description</th>
+                <th>Last Updated</th>
+                <th>Flag Date</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for pkg in packages %}
+            <tr class="{% cycle 'odd' 'even' %}">
+                <td>{{ pkg.arch.name }}</td>
+                <td>{{ pkg.repo.name|capfirst }}</td>
+                <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.full_version }}</span></td>
+                {% else %}
+                <td>{{ pkg.full_version }}</td>
+                {% endif %}
+                <td class="wrap">{{ pkg.pkgdesc }}</td>
+                <td>{{ pkg.last_update|date }}</td>
+                <td>{{ pkg.flag_date|date }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $(".results").tablesorter({widgets: ['zebra'], sortList: [[2,0]]});
+});
+</script>
+{% endblock %}