diff --git a/www/conservancy/apps/news/views.py b/www/conservancy/apps/news/views.py index fdef8175d4e3ba3de0dec217923725fe3d5b03b8..dec05a1d0cbbd16f779dba94eca176ab2bcc25a3 100644 --- a/www/conservancy/apps/news/views.py +++ b/www/conservancy/apps/news/views.py @@ -1,6 +1,7 @@ # from django.views.generic.list_detail import object_list from django.views.generic import ListView from django.views.generic.dates import YearArchiveView, MonthArchiveView, DayArchiveView, DateDetailView +from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from conservancy.apps.news.models import ExternalArticle from conservancy.apps.events.models import Event from datetime import datetime @@ -41,18 +42,35 @@ def custom_index(request, queryset, *args, **kwargs): date_list = queryset.dates(kwargs['date_field'], 'year') + paginate_by = kwargs.get('paginate_by', 6) + paginator = Paginator(queryset, paginate_by) + page = request.GET.get('page') + try: + p = paginator.page(page) + except PageNotAnInteger: + # If page is not an integer, deliver first page. + p = paginator.page(1) + page = 1 + except EmptyPage: + # If page is out of range (e.g. 9999), deliver last page of results. + p = paginator.page(paginator.num_pages) + page = paginator.num_pages kwargs = dict(kwargs, extra_context={'articles': articles, 'date_list': date_list, 'future_events': future_events, 'past_events': past_events, - 'page': 1}) + # 'paginator': paginator, + 'page': page, + # 'is_paginated': True, + # 'num_pages': paginator.num_pages + }) del kwargs['date_field'] - + kwargs['queryset'] = queryset + # return object_list(request, queryset, *args, **kwargs) # callable = NewsListView.as_view(queryset=queryset, # extra_context=kwargs, # paginate_by=kwargs['paginate_by']) - kwargs['queryset'] = queryset callable = NewsListView.as_view(**kwargs) return callable(request) diff --git a/www/conservancy/static/admin-media/css/base.css b/www/conservancy/static/admin/css/base.css similarity index 100% rename from www/conservancy/static/admin-media/css/base.css rename to www/conservancy/static/admin/css/base.css diff --git a/www/conservancy/static/admin-media/css/changelists.css b/www/conservancy/static/admin/css/changelists.css similarity index 100% rename from www/conservancy/static/admin-media/css/changelists.css rename to www/conservancy/static/admin/css/changelists.css diff --git a/www/conservancy/static/admin-media/css/dashboard.css b/www/conservancy/static/admin/css/dashboard.css similarity index 100% rename from www/conservancy/static/admin-media/css/dashboard.css rename to www/conservancy/static/admin/css/dashboard.css diff --git a/www/conservancy/static/admin-media/css/forms.css b/www/conservancy/static/admin/css/forms.css similarity index 100% rename from www/conservancy/static/admin-media/css/forms.css rename to www/conservancy/static/admin/css/forms.css diff --git a/www/conservancy/static/admin-media/css/global.css b/www/conservancy/static/admin/css/global.css similarity index 100% rename from www/conservancy/static/admin-media/css/global.css rename to www/conservancy/static/admin/css/global.css diff --git a/www/conservancy/static/admin-media/css/layout.css b/www/conservancy/static/admin/css/layout.css similarity index 100% rename from www/conservancy/static/admin-media/css/layout.css rename to www/conservancy/static/admin/css/layout.css diff --git a/www/conservancy/static/admin-media/css/login.css b/www/conservancy/static/admin/css/login.css similarity index 100% rename from www/conservancy/static/admin-media/css/login.css rename to www/conservancy/static/admin/css/login.css diff --git a/www/conservancy/static/admin-media/css/patch-iewin.css b/www/conservancy/static/admin/css/patch-iewin.css similarity index 100% rename from www/conservancy/static/admin-media/css/patch-iewin.css rename to www/conservancy/static/admin/css/patch-iewin.css diff --git a/www/conservancy/static/admin-media/css/rtl.css b/www/conservancy/static/admin/css/rtl.css similarity index 100% rename from www/conservancy/static/admin-media/css/rtl.css rename to www/conservancy/static/admin/css/rtl.css diff --git a/www/conservancy/static/admin-media/css/widgets.css b/www/conservancy/static/admin/css/widgets.css similarity index 100% rename from www/conservancy/static/admin-media/css/widgets.css rename to www/conservancy/static/admin/css/widgets.css diff --git a/www/conservancy/static/admin-media/img/admin/arrow-down.gif b/www/conservancy/static/admin/img/admin/arrow-down.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/arrow-down.gif rename to www/conservancy/static/admin/img/admin/arrow-down.gif diff --git a/www/conservancy/static/admin-media/img/admin/arrow-up.gif b/www/conservancy/static/admin/img/admin/arrow-up.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/arrow-up.gif rename to www/conservancy/static/admin/img/admin/arrow-up.gif diff --git a/www/conservancy/static/admin-media/img/admin/changelist-bg.gif b/www/conservancy/static/admin/img/admin/changelist-bg.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/changelist-bg.gif rename to www/conservancy/static/admin/img/admin/changelist-bg.gif diff --git a/www/conservancy/static/admin-media/img/admin/chooser-bg.gif b/www/conservancy/static/admin/img/admin/chooser-bg.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/chooser-bg.gif rename to www/conservancy/static/admin/img/admin/chooser-bg.gif diff --git a/www/conservancy/static/admin-media/img/admin/chooser_stacked-bg.gif b/www/conservancy/static/admin/img/admin/chooser_stacked-bg.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/chooser_stacked-bg.gif rename to www/conservancy/static/admin/img/admin/chooser_stacked-bg.gif diff --git a/www/conservancy/static/admin-media/img/admin/default-bg-reverse.gif b/www/conservancy/static/admin/img/admin/default-bg-reverse.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/default-bg-reverse.gif rename to www/conservancy/static/admin/img/admin/default-bg-reverse.gif diff --git a/www/conservancy/static/admin-media/img/admin/default-bg.gif b/www/conservancy/static/admin/img/admin/default-bg.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/default-bg.gif rename to www/conservancy/static/admin/img/admin/default-bg.gif diff --git a/www/conservancy/static/admin-media/img/admin/deleted-overlay.gif b/www/conservancy/static/admin/img/admin/deleted-overlay.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/deleted-overlay.gif rename to www/conservancy/static/admin/img/admin/deleted-overlay.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon-no.gif b/www/conservancy/static/admin/img/admin/icon-no.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon-no.gif rename to www/conservancy/static/admin/img/admin/icon-no.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon-unknown.gif b/www/conservancy/static/admin/img/admin/icon-unknown.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon-unknown.gif rename to www/conservancy/static/admin/img/admin/icon-unknown.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon-yes.gif b/www/conservancy/static/admin/img/admin/icon-yes.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon-yes.gif rename to www/conservancy/static/admin/img/admin/icon-yes.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon_addlink.gif b/www/conservancy/static/admin/img/admin/icon_addlink.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon_addlink.gif rename to www/conservancy/static/admin/img/admin/icon_addlink.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon_alert.gif b/www/conservancy/static/admin/img/admin/icon_alert.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon_alert.gif rename to www/conservancy/static/admin/img/admin/icon_alert.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon_calendar.gif b/www/conservancy/static/admin/img/admin/icon_calendar.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon_calendar.gif rename to www/conservancy/static/admin/img/admin/icon_calendar.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon_changelink.gif b/www/conservancy/static/admin/img/admin/icon_changelink.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon_changelink.gif rename to www/conservancy/static/admin/img/admin/icon_changelink.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon_clock.gif b/www/conservancy/static/admin/img/admin/icon_clock.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon_clock.gif rename to www/conservancy/static/admin/img/admin/icon_clock.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon_deletelink.gif b/www/conservancy/static/admin/img/admin/icon_deletelink.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon_deletelink.gif rename to www/conservancy/static/admin/img/admin/icon_deletelink.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon_error.gif b/www/conservancy/static/admin/img/admin/icon_error.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon_error.gif rename to www/conservancy/static/admin/img/admin/icon_error.gif diff --git a/www/conservancy/static/admin-media/img/admin/icon_searchbox.png b/www/conservancy/static/admin/img/admin/icon_searchbox.png similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon_searchbox.png rename to www/conservancy/static/admin/img/admin/icon_searchbox.png diff --git a/www/conservancy/static/admin-media/img/admin/icon_success.gif b/www/conservancy/static/admin/img/admin/icon_success.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/icon_success.gif rename to www/conservancy/static/admin/img/admin/icon_success.gif diff --git a/www/conservancy/static/admin-media/img/admin/inline-delete-8bit.png b/www/conservancy/static/admin/img/admin/inline-delete-8bit.png similarity index 100% rename from www/conservancy/static/admin-media/img/admin/inline-delete-8bit.png rename to www/conservancy/static/admin/img/admin/inline-delete-8bit.png diff --git a/www/conservancy/static/admin-media/img/admin/inline-delete.png b/www/conservancy/static/admin/img/admin/inline-delete.png similarity index 100% rename from www/conservancy/static/admin-media/img/admin/inline-delete.png rename to www/conservancy/static/admin/img/admin/inline-delete.png diff --git a/www/conservancy/static/admin-media/img/admin/inline-restore-8bit.png b/www/conservancy/static/admin/img/admin/inline-restore-8bit.png similarity index 100% rename from www/conservancy/static/admin-media/img/admin/inline-restore-8bit.png rename to www/conservancy/static/admin/img/admin/inline-restore-8bit.png diff --git a/www/conservancy/static/admin-media/img/admin/inline-restore.png b/www/conservancy/static/admin/img/admin/inline-restore.png similarity index 100% rename from www/conservancy/static/admin-media/img/admin/inline-restore.png rename to www/conservancy/static/admin/img/admin/inline-restore.png diff --git a/www/conservancy/static/admin-media/img/admin/inline-splitter-bg.gif b/www/conservancy/static/admin/img/admin/inline-splitter-bg.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/inline-splitter-bg.gif rename to www/conservancy/static/admin/img/admin/inline-splitter-bg.gif diff --git a/www/conservancy/static/admin-media/img/admin/nav-bg-grabber.gif b/www/conservancy/static/admin/img/admin/nav-bg-grabber.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/nav-bg-grabber.gif rename to www/conservancy/static/admin/img/admin/nav-bg-grabber.gif diff --git a/www/conservancy/static/admin-media/img/admin/nav-bg-reverse.gif b/www/conservancy/static/admin/img/admin/nav-bg-reverse.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/nav-bg-reverse.gif rename to www/conservancy/static/admin/img/admin/nav-bg-reverse.gif diff --git a/www/conservancy/static/admin-media/img/admin/nav-bg.gif b/www/conservancy/static/admin/img/admin/nav-bg.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/nav-bg.gif rename to www/conservancy/static/admin/img/admin/nav-bg.gif diff --git a/www/conservancy/static/admin-media/img/admin/selector-add.gif b/www/conservancy/static/admin/img/admin/selector-add.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/selector-add.gif rename to www/conservancy/static/admin/img/admin/selector-add.gif diff --git a/www/conservancy/static/admin-media/img/admin/selector-addall.gif b/www/conservancy/static/admin/img/admin/selector-addall.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/selector-addall.gif rename to www/conservancy/static/admin/img/admin/selector-addall.gif diff --git a/www/conservancy/static/admin-media/img/admin/selector-remove.gif b/www/conservancy/static/admin/img/admin/selector-remove.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/selector-remove.gif rename to www/conservancy/static/admin/img/admin/selector-remove.gif diff --git a/www/conservancy/static/admin-media/img/admin/selector-removeall.gif b/www/conservancy/static/admin/img/admin/selector-removeall.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/selector-removeall.gif rename to www/conservancy/static/admin/img/admin/selector-removeall.gif diff --git a/www/conservancy/static/admin-media/img/admin/selector-search.gif b/www/conservancy/static/admin/img/admin/selector-search.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/selector-search.gif rename to www/conservancy/static/admin/img/admin/selector-search.gif diff --git a/www/conservancy/static/admin-media/img/admin/selector_stacked-add.gif b/www/conservancy/static/admin/img/admin/selector_stacked-add.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/selector_stacked-add.gif rename to www/conservancy/static/admin/img/admin/selector_stacked-add.gif diff --git a/www/conservancy/static/admin-media/img/admin/selector_stacked-remove.gif b/www/conservancy/static/admin/img/admin/selector_stacked-remove.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/selector_stacked-remove.gif rename to www/conservancy/static/admin/img/admin/selector_stacked-remove.gif diff --git a/www/conservancy/static/admin-media/img/admin/tool-left.gif b/www/conservancy/static/admin/img/admin/tool-left.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/tool-left.gif rename to www/conservancy/static/admin/img/admin/tool-left.gif diff --git a/www/conservancy/static/admin-media/img/admin/tool-left_over.gif b/www/conservancy/static/admin/img/admin/tool-left_over.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/tool-left_over.gif rename to www/conservancy/static/admin/img/admin/tool-left_over.gif diff --git a/www/conservancy/static/admin-media/img/admin/tool-right.gif b/www/conservancy/static/admin/img/admin/tool-right.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/tool-right.gif rename to www/conservancy/static/admin/img/admin/tool-right.gif diff --git a/www/conservancy/static/admin-media/img/admin/tool-right_over.gif b/www/conservancy/static/admin/img/admin/tool-right_over.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/tool-right_over.gif rename to www/conservancy/static/admin/img/admin/tool-right_over.gif diff --git a/www/conservancy/static/admin-media/img/admin/tooltag-add.gif b/www/conservancy/static/admin/img/admin/tooltag-add.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/tooltag-add.gif rename to www/conservancy/static/admin/img/admin/tooltag-add.gif diff --git a/www/conservancy/static/admin-media/img/admin/tooltag-add_over.gif b/www/conservancy/static/admin/img/admin/tooltag-add_over.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/tooltag-add_over.gif rename to www/conservancy/static/admin/img/admin/tooltag-add_over.gif diff --git a/www/conservancy/static/admin-media/img/admin/tooltag-arrowright.gif b/www/conservancy/static/admin/img/admin/tooltag-arrowright.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/tooltag-arrowright.gif rename to www/conservancy/static/admin/img/admin/tooltag-arrowright.gif diff --git a/www/conservancy/static/admin-media/img/admin/tooltag-arrowright_over.gif b/www/conservancy/static/admin/img/admin/tooltag-arrowright_over.gif similarity index 100% rename from www/conservancy/static/admin-media/img/admin/tooltag-arrowright_over.gif rename to www/conservancy/static/admin/img/admin/tooltag-arrowright_over.gif diff --git a/www/conservancy/static/admin-media/js/SelectBox.js b/www/conservancy/static/admin/js/SelectBox.js similarity index 100% rename from www/conservancy/static/admin-media/js/SelectBox.js rename to www/conservancy/static/admin/js/SelectBox.js diff --git a/www/conservancy/static/admin-media/js/SelectFilter.js b/www/conservancy/static/admin/js/SelectFilter.js similarity index 100% rename from www/conservancy/static/admin-media/js/SelectFilter.js rename to www/conservancy/static/admin/js/SelectFilter.js diff --git a/www/conservancy/static/admin-media/js/SelectFilter2.js b/www/conservancy/static/admin/js/SelectFilter2.js similarity index 100% rename from www/conservancy/static/admin-media/js/SelectFilter2.js rename to www/conservancy/static/admin/js/SelectFilter2.js diff --git a/www/conservancy/static/admin-media/js/admin/CollapsedFieldsets.js b/www/conservancy/static/admin/js/admin/CollapsedFieldsets.js similarity index 100% rename from www/conservancy/static/admin-media/js/admin/CollapsedFieldsets.js rename to www/conservancy/static/admin/js/admin/CollapsedFieldsets.js diff --git a/www/conservancy/static/admin-media/js/admin/DateTimeShortcuts.js b/www/conservancy/static/admin/js/admin/DateTimeShortcuts.js similarity index 100% rename from www/conservancy/static/admin-media/js/admin/DateTimeShortcuts.js rename to www/conservancy/static/admin/js/admin/DateTimeShortcuts.js diff --git a/www/conservancy/static/admin-media/js/admin/RelatedObjectLookups.js b/www/conservancy/static/admin/js/admin/RelatedObjectLookups.js similarity index 100% rename from www/conservancy/static/admin-media/js/admin/RelatedObjectLookups.js rename to www/conservancy/static/admin/js/admin/RelatedObjectLookups.js diff --git a/www/conservancy/static/admin-media/js/admin/ordering.js b/www/conservancy/static/admin/js/admin/ordering.js similarity index 100% rename from www/conservancy/static/admin-media/js/admin/ordering.js rename to www/conservancy/static/admin/js/admin/ordering.js diff --git a/www/conservancy/static/admin-media/js/calendar.js b/www/conservancy/static/admin/js/calendar.js similarity index 100% rename from www/conservancy/static/admin-media/js/calendar.js rename to www/conservancy/static/admin/js/calendar.js diff --git a/www/conservancy/static/admin-media/js/core.js b/www/conservancy/static/admin/js/core.js similarity index 100% rename from www/conservancy/static/admin-media/js/core.js rename to www/conservancy/static/admin/js/core.js diff --git a/www/conservancy/static/admin-media/js/dateparse.js b/www/conservancy/static/admin/js/dateparse.js similarity index 100% rename from www/conservancy/static/admin-media/js/dateparse.js rename to www/conservancy/static/admin/js/dateparse.js diff --git a/www/conservancy/static/admin-media/js/getElementsBySelector.js b/www/conservancy/static/admin/js/getElementsBySelector.js similarity index 100% rename from www/conservancy/static/admin-media/js/getElementsBySelector.js rename to www/conservancy/static/admin/js/getElementsBySelector.js diff --git a/www/conservancy/static/admin-media/js/timeparse.js b/www/conservancy/static/admin/js/timeparse.js similarity index 100% rename from www/conservancy/static/admin-media/js/timeparse.js rename to www/conservancy/static/admin/js/timeparse.js diff --git a/www/conservancy/static/admin-media/js/urlify.js b/www/conservancy/static/admin/js/urlify.js similarity index 100% rename from www/conservancy/static/admin-media/js/urlify.js rename to www/conservancy/static/admin/js/urlify.js