Changeset - f742f86f4be4
[Not reviewed]
! ! !
Tom Marble - 9 years ago 2015-03-04 19:30:51
tmarble@info9.net
fixed /admin
67 files changed with 21 insertions and 3 deletions:
0 comments (0 inline, 0 general)
www/conservancy/apps/news/views.py
Show inline comments
 
# 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
 
# for debugging...
 
from django.http import HttpResponse
 

	
...
 
@@ -38,24 +39,41 @@ def custom_index(request, queryset, *args, **kwargs):
 

	
 
    future_events = Event.future.all().filter(date_tentative=False).order_by("date")
 
    past_events = Event.past.all().order_by("-date")[:6]
 

	
 
    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)
 

	
 
#    num_navigation = 3 # in each direction
 
#    page_navigation = range(max((page - num_navigation), 1),
 
#                            min((page + num_navigation), page_count) + 1)
www/conservancy/static/admin/css/base.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/base.css to www/conservancy/static/admin/css/base.css
www/conservancy/static/admin/css/changelists.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/changelists.css to www/conservancy/static/admin/css/changelists.css
www/conservancy/static/admin/css/dashboard.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/dashboard.css to www/conservancy/static/admin/css/dashboard.css
www/conservancy/static/admin/css/forms.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/forms.css to www/conservancy/static/admin/css/forms.css
www/conservancy/static/admin/css/global.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/global.css to www/conservancy/static/admin/css/global.css
www/conservancy/static/admin/css/layout.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/layout.css to www/conservancy/static/admin/css/layout.css
www/conservancy/static/admin/css/login.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/login.css to www/conservancy/static/admin/css/login.css
www/conservancy/static/admin/css/patch-iewin.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/patch-iewin.css to www/conservancy/static/admin/css/patch-iewin.css
www/conservancy/static/admin/css/rtl.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/rtl.css to www/conservancy/static/admin/css/rtl.css
www/conservancy/static/admin/css/widgets.css
Show inline comments
 
file renamed from www/conservancy/static/admin-media/css/widgets.css to www/conservancy/static/admin/css/widgets.css
www/conservancy/static/admin/img/admin/arrow-down.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/arrow-down.gif to www/conservancy/static/admin/img/admin/arrow-down.gif
Show images
www/conservancy/static/admin/img/admin/arrow-up.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/arrow-up.gif to www/conservancy/static/admin/img/admin/arrow-up.gif
Show images
www/conservancy/static/admin/img/admin/changelist-bg.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/changelist-bg.gif to www/conservancy/static/admin/img/admin/changelist-bg.gif
Show images
www/conservancy/static/admin/img/admin/chooser-bg.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/chooser-bg.gif to www/conservancy/static/admin/img/admin/chooser-bg.gif
Show images
www/conservancy/static/admin/img/admin/chooser_stacked-bg.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/chooser_stacked-bg.gif to www/conservancy/static/admin/img/admin/chooser_stacked-bg.gif
Show images
www/conservancy/static/admin/img/admin/default-bg-reverse.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/default-bg-reverse.gif to www/conservancy/static/admin/img/admin/default-bg-reverse.gif
Show images
www/conservancy/static/admin/img/admin/default-bg.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/default-bg.gif to www/conservancy/static/admin/img/admin/default-bg.gif
Show images
www/conservancy/static/admin/img/admin/deleted-overlay.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/deleted-overlay.gif to www/conservancy/static/admin/img/admin/deleted-overlay.gif
Show images
www/conservancy/static/admin/img/admin/icon-no.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon-no.gif to www/conservancy/static/admin/img/admin/icon-no.gif
Show images
www/conservancy/static/admin/img/admin/icon-unknown.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon-unknown.gif to www/conservancy/static/admin/img/admin/icon-unknown.gif
Show images
www/conservancy/static/admin/img/admin/icon-yes.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon-yes.gif to www/conservancy/static/admin/img/admin/icon-yes.gif
Show images
www/conservancy/static/admin/img/admin/icon_addlink.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon_addlink.gif to www/conservancy/static/admin/img/admin/icon_addlink.gif
Show images
www/conservancy/static/admin/img/admin/icon_alert.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon_alert.gif to www/conservancy/static/admin/img/admin/icon_alert.gif
Show images
www/conservancy/static/admin/img/admin/icon_calendar.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon_calendar.gif to www/conservancy/static/admin/img/admin/icon_calendar.gif
Show images
www/conservancy/static/admin/img/admin/icon_changelink.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon_changelink.gif to www/conservancy/static/admin/img/admin/icon_changelink.gif
Show images
www/conservancy/static/admin/img/admin/icon_clock.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon_clock.gif to www/conservancy/static/admin/img/admin/icon_clock.gif
Show images
www/conservancy/static/admin/img/admin/icon_deletelink.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon_deletelink.gif to www/conservancy/static/admin/img/admin/icon_deletelink.gif
Show images
www/conservancy/static/admin/img/admin/icon_error.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon_error.gif to www/conservancy/static/admin/img/admin/icon_error.gif
Show images
www/conservancy/static/admin/img/admin/icon_searchbox.png
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon_searchbox.png to www/conservancy/static/admin/img/admin/icon_searchbox.png
Show images
www/conservancy/static/admin/img/admin/icon_success.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/icon_success.gif to www/conservancy/static/admin/img/admin/icon_success.gif
Show images
www/conservancy/static/admin/img/admin/inline-delete-8bit.png
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/inline-delete-8bit.png to www/conservancy/static/admin/img/admin/inline-delete-8bit.png
Show images
www/conservancy/static/admin/img/admin/inline-delete.png
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/inline-delete.png to www/conservancy/static/admin/img/admin/inline-delete.png
Show images
www/conservancy/static/admin/img/admin/inline-restore-8bit.png
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/inline-restore-8bit.png to www/conservancy/static/admin/img/admin/inline-restore-8bit.png
Show images
www/conservancy/static/admin/img/admin/inline-restore.png
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/inline-restore.png to www/conservancy/static/admin/img/admin/inline-restore.png
Show images
www/conservancy/static/admin/img/admin/inline-splitter-bg.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/inline-splitter-bg.gif to www/conservancy/static/admin/img/admin/inline-splitter-bg.gif
Show images
www/conservancy/static/admin/img/admin/nav-bg-grabber.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/nav-bg-grabber.gif to www/conservancy/static/admin/img/admin/nav-bg-grabber.gif
Show images
www/conservancy/static/admin/img/admin/nav-bg-reverse.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/nav-bg-reverse.gif to www/conservancy/static/admin/img/admin/nav-bg-reverse.gif
Show images
www/conservancy/static/admin/img/admin/nav-bg.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/nav-bg.gif to www/conservancy/static/admin/img/admin/nav-bg.gif
Show images
www/conservancy/static/admin/img/admin/selector-add.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/selector-add.gif to www/conservancy/static/admin/img/admin/selector-add.gif
Show images
www/conservancy/static/admin/img/admin/selector-addall.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/selector-addall.gif to www/conservancy/static/admin/img/admin/selector-addall.gif
Show images
www/conservancy/static/admin/img/admin/selector-remove.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/selector-remove.gif to www/conservancy/static/admin/img/admin/selector-remove.gif
Show images
www/conservancy/static/admin/img/admin/selector-removeall.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/selector-removeall.gif to www/conservancy/static/admin/img/admin/selector-removeall.gif
Show images
www/conservancy/static/admin/img/admin/selector-search.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/selector-search.gif to www/conservancy/static/admin/img/admin/selector-search.gif
Show images
www/conservancy/static/admin/img/admin/selector_stacked-add.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/selector_stacked-add.gif to www/conservancy/static/admin/img/admin/selector_stacked-add.gif
Show images
www/conservancy/static/admin/img/admin/selector_stacked-remove.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/selector_stacked-remove.gif to www/conservancy/static/admin/img/admin/selector_stacked-remove.gif
Show images
www/conservancy/static/admin/img/admin/tool-left.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/tool-left.gif to www/conservancy/static/admin/img/admin/tool-left.gif
Show images
www/conservancy/static/admin/img/admin/tool-left_over.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/tool-left_over.gif to www/conservancy/static/admin/img/admin/tool-left_over.gif
Show images
www/conservancy/static/admin/img/admin/tool-right.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/tool-right.gif to www/conservancy/static/admin/img/admin/tool-right.gif
Show images
www/conservancy/static/admin/img/admin/tool-right_over.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/tool-right_over.gif to www/conservancy/static/admin/img/admin/tool-right_over.gif
Show images
www/conservancy/static/admin/img/admin/tooltag-add.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/tooltag-add.gif to www/conservancy/static/admin/img/admin/tooltag-add.gif
Show images
www/conservancy/static/admin/img/admin/tooltag-add_over.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/tooltag-add_over.gif to www/conservancy/static/admin/img/admin/tooltag-add_over.gif
Show images
www/conservancy/static/admin/img/admin/tooltag-arrowright.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/tooltag-arrowright.gif to www/conservancy/static/admin/img/admin/tooltag-arrowright.gif
Show images
www/conservancy/static/admin/img/admin/tooltag-arrowright_over.gif
Show inline comments
 
file renamed from www/conservancy/static/admin-media/img/admin/tooltag-arrowright_over.gif to www/conservancy/static/admin/img/admin/tooltag-arrowright_over.gif
Show images
www/conservancy/static/admin/js/SelectBox.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/SelectBox.js to www/conservancy/static/admin/js/SelectBox.js
www/conservancy/static/admin/js/SelectFilter.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/SelectFilter.js to www/conservancy/static/admin/js/SelectFilter.js
www/conservancy/static/admin/js/SelectFilter2.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/SelectFilter2.js to www/conservancy/static/admin/js/SelectFilter2.js
www/conservancy/static/admin/js/admin/CollapsedFieldsets.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/admin/CollapsedFieldsets.js to www/conservancy/static/admin/js/admin/CollapsedFieldsets.js
www/conservancy/static/admin/js/admin/DateTimeShortcuts.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/admin/DateTimeShortcuts.js to www/conservancy/static/admin/js/admin/DateTimeShortcuts.js
www/conservancy/static/admin/js/admin/RelatedObjectLookups.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/admin/RelatedObjectLookups.js to www/conservancy/static/admin/js/admin/RelatedObjectLookups.js
www/conservancy/static/admin/js/admin/ordering.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/admin/ordering.js to www/conservancy/static/admin/js/admin/ordering.js
www/conservancy/static/admin/js/calendar.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/calendar.js to www/conservancy/static/admin/js/calendar.js
www/conservancy/static/admin/js/core.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/core.js to www/conservancy/static/admin/js/core.js
www/conservancy/static/admin/js/dateparse.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/dateparse.js to www/conservancy/static/admin/js/dateparse.js
www/conservancy/static/admin/js/getElementsBySelector.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/getElementsBySelector.js to www/conservancy/static/admin/js/getElementsBySelector.js
www/conservancy/static/admin/js/timeparse.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/timeparse.js to www/conservancy/static/admin/js/timeparse.js
www/conservancy/static/admin/js/urlify.js
Show inline comments
 
file renamed from www/conservancy/static/admin-media/js/urlify.js to www/conservancy/static/admin/js/urlify.js
0 comments (0 inline, 0 general)