From a5fafae94f23ca2cf138cf07774e2c2a1a7d993a Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 7 Jun 2012 20:29:07 -0500
Subject: Fix a few minor markup errors

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/result_section.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/releng')

diff --git a/templates/releng/result_section.html b/templates/releng/result_section.html
index 91a75613..ae951ebe 100644
--- a/templates/releng/result_section.html
+++ b/templates/releng/result_section.html
@@ -1,6 +1,6 @@
 {% load url from future %}
 <tr>
-    <th>{% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}</td>
+    <th>{% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}</th>
     <th>Last Success</th>
     <th>Last Failure</th>
 </tr>
-- 
cgit v1.2.3-2-g168b


From 8383a071608329c7683f7a710030ce945bd20b4d Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 8 Jul 2012 23:30:48 -0500
Subject: Add a new jquery_tablesorter CDN template tag

And use it everywhere we were including the file before. This should
make updating the version a heck of a lot easier.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/iso_overview.html | 3 +--
 templates/releng/result_list.html  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'templates/releng')

diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html
index 447ba487..23ef0135 100644
--- a/templates/releng/iso_overview.html
+++ b/templates/releng/iso_overview.html
@@ -37,8 +37,7 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html
index 207a8ba3..be5783b3 100644
--- a/templates/releng/result_list.html
+++ b/templates/releng/result_list.html
@@ -34,8 +34,7 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-- 
cgit v1.2.3-2-g168b


From 1a7e5d22f1c4e948c624d26b4d8c1ed30189acfe Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 19 Jan 2013 12:06:47 -0600
Subject: Add basic release list and details views

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/release_detail.html | 24 ++++++++++++++++++++
 templates/releng/release_list.html   | 44 ++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 templates/releng/release_detail.html
 create mode 100644 templates/releng/release_list.html

(limited to 'templates/releng')

diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
new file mode 100644
index 00000000..fec9ce2b
--- /dev/null
+++ b/templates/releng/release_detail.html
@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+{% block title %}Arch Linux - Release: {{ release.version }}{% endblock %}
+
+{% block content %}
+<div class="release box">
+    <h2>{{ release.version }}</h2>
+
+    <ul>
+        <li><strong>Release Date:</strong> {{ release.release_date|date }}</li>
+        {% if release.kernel_version %}<li><strong>Kernel Version:</strong> {{ release.kernel_version }}</li>{% endif %}
+        <li><strong>Available:</strong> {{ release.available|yesno }}</li>
+        {% if release.available %}<li><a href="https://www.archlinux.org/{{ release.iso_url }}.torrent"
+                title="Download torrent for {{ release.version }}">Torrent</a></li>{% endif %}
+        {% if release.available %}<li><a href="{{ release.magnet_uri }}">Magnet</a></li>{% endif %}
+        <li><strong>Download Size:</strong> {% if release.file_size %}{{ release.file_size|filesizeformat }}{% else %}Unknown{% endif %}</li>
+    </ul>
+
+    {% if release.info %}
+    <h3>Release Notes</h3>
+
+    <div class="article-content">{{ release.info_html }}</div>
+    {% endif %}
+</div>
+{% endblock %}
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
new file mode 100644
index 00000000..1657249f
--- /dev/null
+++ b/templates/releng/release_list.html
@@ -0,0 +1,44 @@
+{% extends "base.html" %}
+{% load url from future %}
+
+{% block title %}Arch Linux - Releases{% endblock %}
+
+{% block head %}
+<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="/feeds/releases/" />
+{% endblock %}
+
+{% block content %}
+<div id="release-list" class="box">
+
+    <h2>Releases</h2>
+
+    <table id="release-table" class="results">
+        <thead>
+            <tr>
+                <th>Release Date</th>
+                <th>Version</th>
+                <th>Kernel Version</th>
+                <th>Available?</th>
+                <th>Torrent</th>
+                <th>Magnet</th>
+                <th>Download Size</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% 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>{{ item.kernel_version|default:"" }}</td>
+                <td>{{ item.available|yesno }}</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>
+                <td>{% if item.file_size %}{{ item.file_size|filesizeformat }}{% endif %}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+</div>
+{% endblock %}
-- 
cgit v1.2.3-2-g168b


From 71c0c7453a5bc28b6e6576fe4f1351139f33ade5 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 19 Jan 2013 13:08:06 -0600
Subject: Implement torrent data parsing and extraction via bencode

This allows uploading of the actual torrent file itself into the webapp
and then pulling the relevant pieces of information out of it.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/release_detail.html | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'templates/releng')

diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
index fec9ce2b..f4de9e52 100644
--- a/templates/releng/release_detail.html
+++ b/templates/releng/release_detail.html
@@ -9,9 +9,10 @@
         <li><strong>Release Date:</strong> {{ release.release_date|date }}</li>
         {% if release.kernel_version %}<li><strong>Kernel Version:</strong> {{ release.kernel_version }}</li>{% endif %}
         <li><strong>Available:</strong> {{ release.available|yesno }}</li>
-        {% if release.available %}<li><a href="https://www.archlinux.org/{{ release.iso_url }}.torrent"
-                title="Download torrent for {{ release.version }}">Torrent</a></li>{% endif %}
-        {% if release.available %}<li><a href="{{ release.magnet_uri }}">Magnet</a></li>{% endif %}
+        {% if release.available %}<li><strong>Download:</strong> <a href="https://www.archlinux.org/{{ release.iso_url }}.torrent"
+                title="Download torrent for {{ release.version }}">Torrent</a>,
+            <a href="{{ release.magnet_uri }}">Magnet</a></li>{% endif %}
+        {% if release.torrent_infohash %}<li><strong>Torrent Info Hash:</strong> {{ release.torrent_infohash }}</li>{% endif %}
         <li><strong>Download Size:</strong> {% if release.file_size %}{{ release.file_size|filesizeformat }}{% else %}Unknown{% endif %}</li>
     </ul>
 
@@ -20,5 +21,22 @@
 
     <div class="article-content">{{ release.info_html }}</div>
     {% endif %}
+
+    {% if release.torrent_data %}{% with release.torrent as torrent %}
+    <h3>Torrent Information</h3>
+
+    <ul>
+        <li><strong>Comment:</strong> {{ torrent.comment }}</li>
+        <li><strong>Creation Date:</strong> {{ torrent.creation_date|date:"DATETIME_FORMAT" }} UTC</li>
+        <li><strong>Created By:</strong> {{ torrent.created_by }}</li>
+        <li><strong>Announce URL:</strong> {{ torrent.announce }}</li>
+        <li><strong>File Name:</strong> {{ torrent.file_name }}</li>
+        <li><strong>File Length:</strong> {{ torrent.file_length|filesizeformat }}</li>
+        <li><strong>Piece Count:</strong> {{ torrent.piece_count }} pieces</li>
+        <li><strong>Piece Length:</strong> {{ torrent.piece_length|filesizeformat }}</li>
+        <li><strong>Computed Info Hash:</strong> {{ torrent.info_hash }}</li>
+        <li><strong>URL List Length:</strong> {{ torrent.url_list|length }} URLs</li>
+    </ul>
+    {% endwith %}{% endif %}
 </div>
 {% endblock %}
-- 
cgit v1.2.3-2-g168b


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>
---
 templates/releng/release_list.html | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'templates/releng')

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 @@
             {% 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 @@
             {% 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-2-g168b


From 7d4a8b9adf353d7adce4c3c22101e774092eb4de Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 28 Jan 2013 14:06:41 -0700
Subject: Add MD5 and SHA1 fields for releases

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

(limited to 'templates/releng')

diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
index f4de9e52..ea54be66 100644
--- a/templates/releng/release_detail.html
+++ b/templates/releng/release_detail.html
@@ -13,6 +13,8 @@
                 title="Download torrent for {{ release.version }}">Torrent</a>,
             <a href="{{ release.magnet_uri }}">Magnet</a></li>{% endif %}
         {% if release.torrent_infohash %}<li><strong>Torrent Info Hash:</strong> {{ release.torrent_infohash }}</li>{% endif %}
+        {% if release.md5_sum %}<li><strong>MD5:</strong> {{ release.md5_sum }}</li>{% endif %}
+        {% if release.sha1_sum %}<li><strong>SHA1:</strong> {{ release.sha1_sum }}</li>{% endif %}
         <li><strong>Download Size:</strong> {% if release.file_size %}{{ release.file_size|filesizeformat }}{% else %}Unknown{% endif %}</li>
     </ul>
 
-- 
cgit v1.2.3-2-g168b


From a471316a58a9c62b869696fe36d72abcbf9f2ab1 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 28 Jan 2013 14:27:44 -0700
Subject: Use torrent view and checksums where appropriate

We no longer need to link externally to these items since we have all
the data available in the web application now.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/release_detail.html | 5 ++++-
 templates/releng/release_list.html   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'templates/releng')

diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
index ea54be66..01c0319e 100644
--- a/templates/releng/release_detail.html
+++ b/templates/releng/release_detail.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% load url from future %}
+
 {% block title %}Arch Linux - Release: {{ release.version }}{% endblock %}
 
 {% block content %}
@@ -9,7 +11,8 @@
         <li><strong>Release Date:</strong> {{ release.release_date|date }}</li>
         {% if release.kernel_version %}<li><strong>Kernel Version:</strong> {{ release.kernel_version }}</li>{% endif %}
         <li><strong>Available:</strong> {{ release.available|yesno }}</li>
-        {% if release.available %}<li><strong>Download:</strong> <a href="https://www.archlinux.org/{{ release.iso_url }}.torrent"
+        {% if release.available %}<li><strong>Download:</strong> <a
+                href="{% url 'releng-release-torrent' release.version %}"
                 title="Download torrent for {{ release.version }}">Torrent</a>,
             <a href="{{ release.magnet_uri }}">Magnet</a></li>{% endif %}
         {% if release.torrent_infohash %}<li><strong>Torrent Info Hash:</strong> {{ release.torrent_infohash }}</li>{% endif %}
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index 84008541..ef53a93d 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -31,7 +31,7 @@
                 <td><a href="{{ item.get_absolute_url }}" title="Release details for {{ item.version }}">{{ item.version }}</a></td>
                 <td>{{ item.kernel_version|default:"" }}</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"
+                <td>{% if item.available %}<a href="{% url 'releng-release-torrent' item.version %}"
                         title="Download torrent for {{ item.version }}">Torrent</a>{% endif %}</td>
                 <td>{% if item.available %}<a href="{{ item.magnet_uri }}">Magnet</a>{% endif %}</td>
                 <td>{% if item.file_size %}{{ item.file_size|filesizeformat }}{% endif %}</td>
-- 
cgit v1.2.3-2-g168b


From 10462425f989dc74653179f0845978a6b5e30045 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 16 Jan 2013 16:10:24 -0600
Subject: Remove {% load url from future %} from templates

This is now the default in Django 1.5.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/add.html            | 1 -
 templates/releng/iso_overview.html   | 1 -
 templates/releng/release_detail.html | 1 -
 templates/releng/release_list.html   | 1 -
 templates/releng/result_list.html    | 1 -
 templates/releng/result_section.html | 1 -
 templates/releng/results.html        | 1 -
 templates/releng/thanks.html         | 1 -
 8 files changed, 8 deletions(-)

(limited to 'templates/releng')

diff --git a/templates/releng/add.html b/templates/releng/add.html
index ed02984e..d060395d 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 
 {% block title %}Arch Linux - Test Result Entry{% endblock %}
 
diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html
index 23ef0135..196f0c0a 100644
--- a/templates/releng/iso_overview.html
+++ b/templates/releng/iso_overview.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
-{% load url from future %}
 
 {% block content %}
 <div class="box">
diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
index 01c0319e..09507536 100644
--- a/templates/releng/release_detail.html
+++ b/templates/releng/release_detail.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 
 {% block title %}Arch Linux - Release: {{ release.version }}{% endblock %}
 
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index ef53a93d..5f248264 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 {% load static from staticfiles %}
 
 {% block title %}Arch Linux - Releases{% endblock %}
diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html
index be5783b3..12bf39db 100644
--- a/templates/releng/result_list.html
+++ b/templates/releng/result_list.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
-{% load url from future %}
 
 {% block content %}
 <div class="box">
diff --git a/templates/releng/result_section.html b/templates/releng/result_section.html
index ae951ebe..5e0b6f62 100644
--- a/templates/releng/result_section.html
+++ b/templates/releng/result_section.html
@@ -1,4 +1,3 @@
-{% load url from future %}
 <tr>
     <th>{% if option.is_rollback %}Rollback: {% endif %}{{ option.name|title }}</th>
     <th>Last Success</th>
diff --git a/templates/releng/results.html b/templates/releng/results.html
index c19b42a6..59d8351d 100644
--- a/templates/releng/results.html
+++ b/templates/releng/results.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 
 {% block title %}Arch Linux - Release Engineering Testbuild Results{% endblock %}
 
diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html
index 66d65a5c..2462dafd 100644
--- a/templates/releng/thanks.html
+++ b/templates/releng/thanks.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 
 {% block title %}Arch Linux - Feedback - Thanks!{% endblock %}
 
-- 
cgit v1.2.3-2-g168b


From 1b323ed9b2ac170cea4207ae75fd2849be8ff646 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 16 Feb 2013 14:08:49 -0600
Subject: Fix missing template variable

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/result_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/releng')

diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html
index be5783b3..f6a825dc 100644
--- a/templates/releng/result_list.html
+++ b/templates/releng/result_list.html
@@ -6,7 +6,7 @@
 <div class="box">
     <h2>Results for:
         {% if option %}{{ option.verbose_name|title }}: {{ value }}{% endif %}
-        {{ iso_name|default:"" }}
+        {% if iso_name %}{{ iso_name|default:"" }}{% endif %}
     </h2>
 
     <p><a href="{% url 'releng-test-overview' %}">Go back to testing results</a></p>
-- 
cgit v1.2.3-2-g168b