From e9e1c071654edd7b95e20c8105abbc23f426cecc Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 22 Jan 2013 16:47:43 -0600
Subject: Show staging version on todolist view page

If one exists, it is easy enough to show it here so in-progress
todolists can easily be cross-checked with the current state of the
repository.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'templates')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 86221127..e544fa12 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
+{% load package_extras %}
 {% load todolists %}
 
 {% block title %}Arch Linux - Todo: {{ list.name }}{% endblock %}
@@ -62,6 +63,7 @@ <h3>Filter Todo List Packages</h3>
                 <th>Repository</th>
                 <th>Name</th>
                 <th>Current Version</th>
+                <th>Staging Version</th>
                 <th>Maintainers</th>
                 <th>Status</th>
             </tr>
@@ -77,6 +79,9 @@ <h3>Filter Todo List Packages</h3>
                 {% else %}
                 <td>{{ pkg.pkg.full_version }}</td>
                 {% endif %}
+                {% with staging=pkg.staging %}
+                <td>{% pkg_details_link staging staging.full_version %}</td>
+                {% endwith %}
                 <td>{{ pkg.maintainers|join:', ' }}</td>
                 <td>
                     {% if perms.todolists.change_todolistpackage %}
-- 
cgit v1.2.3-54-g00ecf


From 69fd83df03806585c3b7d6b115af916a73f4ae41 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 22 Jan 2013 20:21:40 -0700
Subject: Spice up the release listing page a bit

Add JS tablesorter code and add some style to the yesno column.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.css             |  8 ++++++++
 templates/releng/release_list.html | 19 +++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'templates')

diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index f43bba1f..dcc964ee 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -1079,6 +1079,14 @@ ul.signoff-list {
     color: red;
 }
 
+#release-list .available-yes {
+    color: green;
+}
+
+#release-list .available-no {
+    color: red;
+}
+
 #key-status .signed-yes {
     color: green;
 }
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index 1657249f..84008541 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load url from future %}
+{% load static from staticfiles %}
 
 {% block title %}Arch Linux - Releases{% endblock %}
 
@@ -9,7 +10,6 @@
 
 {% block content %}
 <div id="release-list" class="box">
-
     <h2>Releases</h2>
 
     <table id="release-table" class="results">
@@ -28,9 +28,9 @@ <h2>Releases</h2>
             {% for item in release_list %}
             <tr class="{% cycle 'odd' 'even' %}">
                 <td>{{ item.release_date|date }}</td>
-				<td><a href="{{ item.get_absolute_url }}" title="Release details for {{ item.version }}">{{ item.version }}</a></td>
+                <td><a href="{{ item.get_absolute_url }}" title="Release details for {{ item.version }}">{{ item.version }}</a></td>
                 <td>{{ item.kernel_version|default:"" }}</td>
-                <td>{{ item.available|yesno }}</td>
+                <td class="available-{{ item.available|yesno }}">{{ item.available|yesno|capfirst }}</td>
                 <td>{% if item.available %}<a href="https://www.archlinux.org/{{ item.iso_url }}.torrent"
                         title="Download torrent for {{ item.version }}">Torrent</a>{% endif %}</td>
                 <td>{% if item.available %}<a href="{{ item.magnet_uri }}">Magnet</a>{% endif %}</td>
@@ -39,6 +39,17 @@ <h2>Releases</h2>
             {% endfor %}
         </tbody>
     </table>
-
 </div>
+
+{% 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'],
+        sortList: [[0,1], [1,1]],
+        headers: { 4: { sorter: false }, 5: { sorter: false } }
+    });
+});
+</script>
 {% endblock %}
-- 
cgit v1.2.3-54-g00ecf