summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/news/paginator.html10
-rw-r--r--templates/packages/search.html3
-rw-r--r--templates/packages/search_paginator.html8
-rw-r--r--templates/public/index.html19
-rw-r--r--templates/releng/result_list.html2
5 files changed, 19 insertions, 23 deletions
diff --git a/templates/news/paginator.html b/templates/news/paginator.html
index fbd0546b..57fbeb15 100644
--- a/templates/news/paginator.html
+++ b/templates/news/paginator.html
@@ -1,20 +1,20 @@
{% if is_paginated %}
<div class="pagination">
- <p>{{paginator.count}} news items, viewing page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+ <p>{{ paginator.count }} news items, viewing page {{ page_obj.number }} of {{ paginator.num_pages }}.</p>
<p class="news-nav">
{% if page_obj.has_previous %}
- <a class="prev" href="?page={{page_obj.previous_page_number}}"
+ <a class="prev" href="?page={{ page_obj.previous_page_number }}"
title="Go to previous page">&lt; Prev</a>
{% endif %}
{% for num in paginator.page_range %}
{% ifequal num page_obj.number %}
- <span>{{num}}</span>
+ <span>{{ num }}</span>
{% else %}
- <a href="?page={{num}}" title="Go to page {{num}}">{{num}}</a>
+ <a href="?page={{ num }}" title="Go to page {{ num }}">{{ num }}</a>
{% endifequal %}
{% endfor %}
{% if page_obj.has_next %}
- <a class="next" href="?page={{page_obj.next_page_number}}"
+ <a class="next" href="?page={{ page_obj.next_page_number }}"
title="Go to next page">Next &gt;</a>
{% endif %}
</p>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index a5d52d6c..bf1eecd9 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -36,9 +36,6 @@
<div>{{ search_form.flagged.errors }}
<label for="id_flagged" title="Limit results based on out-of-date status">
Flagged</label>{{ search_form.flagged }}</div>
- <div>{{ search_form.limit.errors }}
- <label for="id_limit" title="Select the number of results to display per page">
- Per Page</label>{{ search_form.limit }}</div>
<div ><label>&nbsp;</label><input title="Search for packages using this criteria"
type="submit" value="Search" /></div>
</fieldset>
diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html
index 362b7cb3..3c368b82 100644
--- a/templates/packages/search_paginator.html
+++ b/templates/packages/search_paginator.html
@@ -1,12 +1,12 @@
<div class="pkglist-stats">
{% if is_paginated %}
- <p>{{paginator.count}} packages found.
- Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+ <p>{{ paginator.count }} packages found.
+ Page {{ page_obj.number }} of {{ paginator.num_pages }}.</p>
<div class="pkglist-nav">
<span class="prev">
{% if page_obj.has_previous %}
- <a href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
+ <a href="?page={{ page_obj.previous_page_number }}&amp;{{ current_query }}"
title="Go to previous page">&lt; Prev</a>
{% else %}
&lt; Prev
@@ -14,7 +14,7 @@
</span>
<span class="next">
{% if page_obj.has_next %}
- <a href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
+ <a href="?page={{ page_obj.next_page_number }}&amp;{{ current_query }}"
title="Go to next page">Next &gt;</a>
{% else %}
Next &gt;
diff --git a/templates/public/index.html b/templates/public/index.html
index 3f88c183..abdb0277 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -211,10 +211,8 @@
<div id="konami" style="display:none;"></div>
{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "bootstrap-typeahead.min.js" %}"></script>
-<script type="text/javascript" src="{% static "konami.pack.js" %}"></script>
<script type="text/javascript">
-$(document).ready(function() {
+function setupTypeahead() {
$('#pkgsearch-field').typeahead({
source: function(query, callback) {
$.getJSON('/opensearch/packages/suggest', {q: query}, function(data) {
@@ -226,10 +224,9 @@ $(document).ready(function() {
menu: '<ul class="pkgsearch-typeahead"></ul>',
items: 10
}).attr('autocomplete', 'off');
-});
-$(document).ready(function() {
- var konami = new Konami();
- konami.code = function() {
+}
+function setupKonami() {
+ var konami = new Konami(function() {
$('#konami').html('<img src="{% static "vector_tux.png" %}" alt=""/>');
setTimeout(function() {
$('#konami').fadeIn(500);
@@ -237,9 +234,11 @@ $(document).ready(function() {
$('#konami').click(function() {
$('#konami').fadeOut(500);
});
- };
- konami.iphone.code = konami.code;
- konami.load();
+ });
+}
+$(document).ready(function() {
+ $.ajax({ url: "{% static "bootstrap-typeahead.min.js" %}", cache: true, dataType: "script", success: setupTypeahead });
+ $.ajax({ url: "{% static "konami.min.js" %}", cache: true, dataType: "script", success: setupKonami });
});
</script>
{% endblock %}
diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html
index 12bf39db..67e5934d 100644
--- a/templates/releng/result_list.html
+++ b/templates/releng/result_list.html
@@ -5,7 +5,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>