From 935d801615dd320693d4c85359aab9f12bd91b14 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 5 Nov 2014 23:02:24 -0600 Subject: Add icons, more detail to releases pages Signed-off-by: Dan McGee --- sitestatic/download.png | Bin 0 -> 1155 bytes sitestatic/magnet.png | Bin 0 -> 2382 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 sitestatic/download.png create mode 100644 sitestatic/magnet.png (limited to 'sitestatic') diff --git a/sitestatic/download.png b/sitestatic/download.png new file mode 100644 index 00000000..9ab858c2 Binary files /dev/null and b/sitestatic/download.png differ diff --git a/sitestatic/magnet.png b/sitestatic/magnet.png new file mode 100644 index 00000000..f67e69b9 Binary files /dev/null and b/sitestatic/magnet.png differ -- cgit v1.2.3-54-g00ecf From 327bd4cfc599dbeddd501afd5221a1d2ff7eee08 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 8 Nov 2014 19:15:35 -0600 Subject: Paginate the todolist listing page Signed-off-by: Dan McGee --- sitestatic/archweb.css | 11 +++++++++++ templates/todolists/list.html | 7 ++++++- todolists/urls.py | 6 +++--- todolists/views.py | 13 ++++++++----- 4 files changed, 28 insertions(+), 9 deletions(-) (limited to 'sitestatic') diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css index edabcfb7..cd46e4c0 100644 --- a/sitestatic/archweb.css +++ b/sitestatic/archweb.css @@ -655,6 +655,17 @@ div.news-article .article-info { width: 75%; } +/* todolists: list */ +.todolist-nav { + float: right; + margin-top: -2.2em; +} + + .todolist-nav .prev, + .todolist-nav .next { + margin: 0 1em; + } + /* donate: donor list */ #donor-list ul { width: 100%; diff --git a/templates/todolists/list.html b/templates/todolists/list.html index 7f0368de..983a49f0 100644 --- a/templates/todolists/list.html +++ b/templates/todolists/list.html @@ -16,7 +16,10 @@

Package Todo Lists

Todo lists are used by the developers when a rebuild of a set of packages is needed. This is common when a library has a version bump, during a toolchain rebuild, or a general cleanup of packages in the - repositories. The progress can be tracked here.

+ repositories. The progress can be tracked here, and completed todo lists + can be browsed as well.

+ + {% include "todolists/paginator.html" %} @@ -46,6 +49,8 @@

Package Todo Lists

{% endfor %}
+ + {% include "todolists/paginator.html" %} {% endblock %} diff --git a/todolists/urls.py b/todolists/urls.py index 6617d7dd..ed065f50 100644 --- a/todolists/urls.py +++ b/todolists/urls.py @@ -1,11 +1,11 @@ from django.conf.urls import patterns from django.contrib.auth.decorators import permission_required -from .views import (view_redirect, view, todolist_list, add, edit, flag, - list_pkgbases, DeleteTodolist) +from .views import (view_redirect, view, add, edit, flag, + list_pkgbases, DeleteTodolist, TodolistListView) urlpatterns = patterns('', - (r'^$', todolist_list), + (r'^$', TodolistListView.as_view(), {}, 'todolist-list'), # old todolists URLs, permanent redirect view so we don't break all links (r'^(?P\d+)/$', view_redirect), diff --git a/todolists/views.py b/todolists/views.py index c37c13f5..c781a562 100644 --- a/todolists/views.py +++ b/todolists/views.py @@ -7,7 +7,7 @@ redirect, render) from django.db import transaction from django.views.decorators.cache import never_cache -from django.views.generic import DeleteView +from django.views.generic import DeleteView, ListView from django.template import Context, loader from django.utils.timezone import now @@ -91,10 +91,13 @@ def list_pkgbases(request, slug, svn_root): return HttpResponse('\n'.join(pkgbases), content_type='text/plain') -def todolist_list(request): - incomplete_only = request.user.is_anonymous() - lists = get_annotated_todolists(incomplete_only) - return render(request, 'todolists/list.html', {'lists': lists}) +class TodolistListView(ListView): + context_object_name = "lists" + template_name = "todolists/list.html" + paginate_by = 50 + + def get_queryset(self): + return get_annotated_todolists() @never_cache -- cgit v1.2.3-54-g00ecf From e12f88f1d6ab15dd4fbd828f4c2689657bcfa5a2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 2 Dec 2014 14:48:16 -0600 Subject: Fix filtering of minor versions on differences page This has been broken for a long time; looks like it happened when we switched over to using our standard details tag and no longer emit a element unconditionally. Signed-off-by: Dan McGee --- sitestatic/archweb.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sitestatic') diff --git a/sitestatic/archweb.js b/sitestatic/archweb.js index 0c4059a9..5f6e5e97 100644 --- a/sitestatic/archweb.js +++ b/sitestatic/archweb.js @@ -283,12 +283,12 @@ function filter_packages() { var cells = $(this).children('td'); /* all this just to get the split version out of the table cell */ - var ver_a = cells.eq(2).find('span').text().match(pat); + var ver_a = cells.eq(2).text().match(pat); if (!ver_a) { return true; } - var ver_b = cells.eq(3).find('span').text().match(pat); + var ver_b = cells.eq(3).text().match(pat); if (!ver_b) { return true; } -- cgit v1.2.3-54-g00ecf