summaryrefslogtreecommitdiff
path: root/templates
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
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')
-rw-r--r--templates/devel/index.html30
-rw-r--r--templates/devel/packages.html6
-rw-r--r--templates/mirrors/url_details.html10
-rw-r--r--templates/packages/flag.html2
-rw-r--r--templates/packages/flaghelp.html2
-rw-r--r--templates/packages/signoffs.html1
-rw-r--r--templates/packages/stale_relations.html2
-rw-r--r--templates/public/download.html2
-rw-r--r--templates/public/index.html13
-rw-r--r--templates/releng/release_detail.html6
-rw-r--r--templates/releng/release_list.html2
-rw-r--r--templates/todolists/view.html6
12 files changed, 45 insertions, 37 deletions
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 02940ab1..8ed9f9ac 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -149,31 +149,11 @@
<h3>Developer Reports</h3>
<ul>
- <li><a href="reports/old/">Old</a>:
- Packages last built more than one year ago
- (<a href="reports/old/{{ user.username }}/">yours only</a>)</li>
- <li><a href="reports/long-out-of-date/">Long Out-of-date</a>:
- Packages marked out-of-date more than 90 days ago
- (<a href="reports/long-out-of-date/{{ user.username }}/">yours only</a>)</li>
- <li><a href="reports/uncompressed-man/">Uncompressed Manpages</a>:
- Self-explanatory
- (<a href="reports/uncompressed-man/{{ user.username }}/">yours only</a>)</li>
- <li><a href="reports/uncompressed-info/">Uncompressed Info Pages</a>:
- Self-explanatory
- (<a href="reports/uncompressed-info/{{ user.username }}/">yours only</a>)</li>
- <li><a href="reports/mismatched-signature/">Mismatched Signatures</a>:
- Packages where 1) signing key is unknown, 2) signer != packager,
- or 3) signature timestamp more than 24 hours after build timestamp
- (<a href="reports/mismatched-signature/{{ user.username }}/">yours only</a>)</li>
- <li><a href="reports/big/">Big</a>:
- All packages with compressed size &gt; 50 MiB
- (<a href="reports/big/{{ user.username }}/">yours only</a>)</li>
- <li><a href="reports/badcompression/">Bad Compression</a>:
- Packages with a compression ratio of less than 10%
- (<a href="reports/badcompression/{{ user.username }}/">yours only</a>)</li>
- <li><a href="reports/unneeded-orphans/">Unneeded Orphans</a>:
- Packages that have no maintainer and are not required by any other
- package in any repository</li>
+ {% for report in reports %}
+ <li><a href="reports/{{ report.slug }}/">{{ report.name }}</a>:
+ {{ report.description }}
+ {% if report.personal %}(<a href="reports/{{ report.slug }}/{{ user.username }}/">yours only</a>){% endif %}</li>
+ {% endfor %}
</ul>
</div>{# #dev-dashboard #}
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
index a67553bb..63dd91aa 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -84,10 +84,14 @@ $(document).ready(function() {
$(".results").tablesorter({widgets: ['zebra']});
});
$(document).ready(function() {
- var filter_func = function() { filter_pkgs_list('#report_filter', '#dev-report-results tbody'); };
+ var filter_func = function() {
+ filter_pkgs_list('#report_filter', '#dev-report-results tbody');
+ filter_report_save('{{ report.slug }}');
+ };
$('#report_filter input').change(filter_func);
$('#criteria_reset').click(function() { filter_pkgs_reset(filter_func); });
// run on page load to ensure current form selections take effect
+ filter_report_load('{{ report.slug }}');
filter_func();
});
</script>
diff --git a/templates/mirrors/url_details.html b/templates/mirrors/url_details.html
index 0b9d2916..54960a0d 100644
--- a/templates/mirrors/url_details.html
+++ b/templates/mirrors/url_details.html
@@ -15,7 +15,7 @@
<table class="compact">
<tr>
<th>URL:</th>
- <td>{{ url.url }}</td>
+ <td>{% if url.protocol.is_download %}<a href="{{ url.url }}">{{ url.url }}</a>{% else %}{{ url.url }}{% endif %}</td>
</tr>
<tr>
<th>Protocol:</th>
@@ -42,6 +42,14 @@
<th>Created:</th>
<td>{{ url.created }}</td>
</tr>
+ <tr>
+ <th>First Check:</th>
+ <td>{{ url.logs.earliest.check_time }}</td>
+ </tr>
+ <tr>
+ <th>Last Check:</th>
+ <td>{{ url.logs.latest.check_time }}</td>
+ </tr>
{% endif %}
</table>
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 063e1d1e..e66d3472 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -20,7 +20,7 @@
{% endfor %}
</ul>
- <p>The message box portion of the flag utility is optional, and meant
+ <p>The message box portion is meant
for short messages only. If you need more than 200 characters for your
message, then file a bug report, email the maintainer directly, or send
an email to the <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-general"
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index 51ace2fd..5f013cd7 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -21,7 +21,7 @@
package so they can update it. If the package is unmaintained, the
notification will be sent to a developer mailing list.</p>
- <p>The message box portion of the flag utility is optional, and meant
+ <p>The message box portion of the flag utility is meant
for short messages only. If you need more than 200 characters for your
message, then file a bug report, email the maintainer directly, or send
an email to the <a target="_blank" href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-general"
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 48202c60..06766935 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -93,6 +93,7 @@ $(document).ready(function() {
$('#signoffs_filter input').change(filter_signoffs);
$('#criteria_reset').click(filter_signoffs_reset);
// fire function on page load to ensure the current form selections take effect
+ filter_signoffs_load();
filter_signoffs();
});
$(document).ready(function() {
diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index cd447a2e..91ea033e 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -52,6 +52,7 @@
<th>User</th>
<th>Type</th>
<th>Created</th>
+ <th>Latest Update</th>
</tr>
</thead>
<tbody>
@@ -62,6 +63,7 @@
<td>{{ relation.user.get_full_name }}</td>
<td>{{ relation.get_type_display }}</td>
<td>{{ relation.created }}</td>
+ <td>{{ relation.last_update.created }}</td>
</tr>
{% empty %}
<tr class="empty"><td colspan="4"><em>No non-existent pkgbase relations.</em></td></tr>
diff --git a/templates/public/download.html b/templates/public/download.html
index 274d6cfd..9f67733e 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -28,7 +28,7 @@
<ul>
{% if release.version %}<li><strong>Current Release:</strong> {{ release.version }}</li>{% endif %}
{% if release.kernel_version %}<li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>{% endif %}
- {% if release.file_size %}<li><strong>ISO Size:</strong> {{ release.file_size|filesizeformat }}</li>{% endif %}
+ {% if release.torrent_data %}<li><strong>ISO Size:</strong> {{ release.torrent.file_length|filesizeformat }}</li>{% endif %}
<li><a href="{% wiki_url 'Installation_Guide' %}">Installation Guide</a></li>
<li><strong>Resources:</strong>
<ul>
diff --git a/templates/public/index.html b/templates/public/index.html
index bc0fae0c..d3cf797a 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -226,8 +226,19 @@ function setupTypeahead() {
matcher: function(item) { return true; },
sorter: function(items) { return items; },
menu: '<ul class="pkgsearch-typeahead"></ul>',
- items: 10
+ items: 10,
+ updater: function(item) {
+ $('#pkgsearch-field').val(item);
+ $('#pkgsearch-form').submit();
+ return item;
+ }
}).attr('autocomplete', 'off');
+ $('#pkgsearch-field').keyup(function(e) {
+ if (e.keyCode === 13 &&
+ $('ul.pkgsearch-typeahead li.active').size() === 0) {
+ $('#pkgsearch-form').submit();
+ }
+ });
}
function setupKonami() {
var konami = new Konami(function() {
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>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 5cc2be41..c3ee57f8 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -118,10 +118,14 @@ $(document).ready(function() {
});
$(document).ready(function() {
$('a.status-link').click(todolist_flag);
- var filter_func = function() { filter_pkgs_list('#todolist_filter', '#dev-todo-pkglist tbody'); };
+ var filter_func = function() {
+ filter_pkgs_list('#todolist_filter', '#dev-todo-pkglist tbody');
+ filter_todolist_save({{ list.id }});
+ };
$('#todolist_filter input').change(filter_func);
$('#criteria_reset').click(function() { filter_pkgs_reset(filter_func); });
// fire function on page load to ensure the current form selections take effect
+ filter_todolist_load({{ list.id }});
filter_func();
});
</script>