summaryrefslogtreecommitdiff
path: root/templates/releng
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-05-25 19:34:21 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-05-25 19:34:21 -0400
commit1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (patch)
treef608874663d24f19ecf175ec556f2a330d47a726 /templates/releng
parent747a562ddca10e29dd003e8b3c59f8f384d1bc8d (diff)
parentcd7222047b41ac3efa389a22fdd22148d03c1d61 (diff)
Merge tag 'release_2014-03-22' into archweb-generic
Fix long filenames; local storage for filter prefs Conflicts: templates/public/download.html
Diffstat (limited to 'templates/releng')
-rw-r--r--templates/releng/release_detail.html6
-rw-r--r--templates/releng/release_list.html2
2 files changed, 3 insertions, 5 deletions
diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
index 547f82b8..d04533b9 100644
--- a/templates/releng/release_detail.html
+++ b/templates/releng/release_detail.html
@@ -10,14 +10,12 @@
<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
+ {% if release.torrent_data %}<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 %}
{% 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>
{% if release.info %}
@@ -38,7 +36,7 @@
<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>Info Hash:</strong> {{ torrent.info_hash }}</li>
<li><strong>URL List Length:</strong> {{ torrent.url_list|length }} URLs</li>
</ul>
{% endwith %}{% endif %}
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index 79615640..af8b8a61 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -34,7 +34,7 @@
<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>
+ <td>{% if item.torrent_data %}{{ item.torrent.file_length|filesizeformat }}{% endif %}</td>
</tr>
{% endfor %}
</tbody>