-
- 
-
+
- /',
+ views.ProgramPageView.as_view(), name='program-page'),
+ path('programs//diffusions/',
+ views.DiffusionsView.as_view(), name='diffusion-list'),
+
+ path('diffusion//',
+ views.ProgramPageView.as_view(), name='diffusion-page'),
+
path('diffusions/',
views.TimetableView.as_view(), name='timetable'),
- path('diffusions/',
+ path('diffusions//',
views.TimetableView.as_view(), name='timetable'),
path('diffusions/all',
views.DiffusionsView.as_view(), name='diffusion-list'),
- path('diffusions/',
- views.DiffusionsView.as_view(), name='diffusion-list'),
path('logs/', views.LogsView.as_view(), name='logs'),
- path('logs/', views.LogsView.as_view(), name='logs'),
+ path('logs//', views.LogsView.as_view(), name='logs'),
path('', views.route_page, name='page'),
]
diff --git a/aircox_web/views.py b/aircox_web/views.py
index 5313cf9..61fa81b 100644
--- a/aircox_web/views.py
+++ b/aircox_web/views.py
@@ -1,16 +1,17 @@
from collections import OrderedDict, deque
import datetime
+from django.db.models import Q
from django.core.paginator import Paginator
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext_lazy as _
-from django.views.generic import TemplateView, ListView
+from django.views.generic import TemplateView, DetailView, ListView
from django.views.generic.base import TemplateResponseMixin, ContextMixin
from content_editor.contents import contents_for_item
from aircox import models as aircox
-from .models import Site, Page
+from .models import Site, Page, DiffusionPage, ProgramPage
from .renderer import site_renderer, page_renderer
@@ -35,6 +36,7 @@ def route_page(request, path=None, *args, model=None, site=None, **kwargs):
class BaseView(TemplateResponseMixin, ContextMixin):
title = None
+ cover = None
site = None
def dispatch(self, request, *args, site=None, **kwargs):
@@ -48,64 +50,85 @@ class BaseView(TemplateResponseMixin, ContextMixin):
kwargs['site_regions'] = contents.render_regions(site_renderer)
kwargs.setdefault('site', self.site)
- if self.title is not None:
- kwargs.setdefault('title', self.title)
+ kwargs.setdefault('cover', self.cover)
return super().get_context_data(**kwargs)
-class ArticleView(BaseView, TemplateView):
+class PageView(BaseView):
""" Base view class for pages. """
- template_name = 'aircox_web/article.html'
+ template_name = 'aircox_web/page.html'
+ context_object_name = 'page'
page = None
- def get_context_data(self, **kwargs):
- # article content
- page = kwargs.setdefault('page', self.page or self.kwargs.get('page'))
- if kwargs.get('regions') is None:
- contents = contents_for_item(page, page_renderer._renderers.keys())
- kwargs['regions'] = contents.render_regions(page_renderer)
+ def get_queryset(self):
+ return super().get_queryset().live()
- kwargs.setdefault('title', page.title)
+ def get_context_data(self, **kwargs):
+ page = getattr(self, 'object', None)
+ if page is not None:
+ if kwargs.get('regions') is None:
+ contents = contents_for_item(
+ page, page_renderer._renderers.keys())
+ kwargs['regions'] = contents.render_regions(page_renderer)
+
+ kwargs.setdefault('title', page.title)
+ kwargs.setdefault('cover', page.cover)
+ kwargs.setdefault('page', page)
return super().get_context_data(**kwargs)
-class ProgramView(ArticleView):
+class ProgramPageView(PageView, DetailView):
""" Base view class for pages. """
template_name = 'aircox_web/program.html'
- next_diffs_count = 5
+ model = ProgramPage
+
+ def get_queryset(self):
+ return super().get_queryset().select_related('program')
def get_context_data(self, program=None, **kwargs):
- # TODO: pagination
- program = program or self.page.program
- #next_diffs = program.diffusion_set.on_air().after().order_by('start')
- return super().get_context_data(
- program=program,
- # next_diffs=next_diffs[:self.next_diffs_count],
- **kwargs,
+ kwargs.setdefault('program', self.object.program)
+ kwargs['diffusions'] = DiffusionPage.objects.filter(
+ diffusion__program=kwargs['program']
)
+ return super().get_context_data(**kwargs)
-class DiffusionView(ArticleView):
+class DiffusionView(PageView):
template_name = 'aircox_web/diffusion.html'
+# TODO: pagination: in template, only a limited number of pages displayed
+
+# DiffusionsView use diffusion instead of diffusion page for different reasons:
+# more straightforward, it handles reruns
class DiffusionsView(BaseView, ListView):
template_name = 'aircox_web/diffusions.html'
- model = aircox.Diffusion
- paginate_by = 10
- title = _('Diffusions')
+ model = DiffusionPage
+ paginate_by = 30
program = None
- # TODO: get program object + display program title when filtered by program
- # TODO: pagination: in template, only a limited number of pages displayed
+ def get(self, request, *args, **kwargs):
+ program_slug = kwargs.get('program_slug')
+ if program_slug:
+ self.program = get_object_or_404(
+ aircox.Program, slug=kwargs.get('program_slug'))
+ return super().get(request, *args, **kwargs)
def get_queryset(self):
- qs = super().get_queryset().station(self.site.station).on_air() \
- .filter(initial__isnull=True) #TODO, page__isnull=False)
- program = self.kwargs.get('program')
- if program:
- qs = qs.filter(program__page__slug=program)
- return qs.order_by('-start')
+ qs = super().get_queryset().live() \
+ .select_related('diffusion')
+ if self.program:
+ qs = qs.filter(diffusion__program=self.program)
+ else:
+ qs = qs.select_related('diffusion__program')
+ return qs.order_by('-diffusion__start')
+
+ def get_context_data(self, **kwargs):
+ program = kwargs.setdefault('program', self.program)
+ if program is not None and hasattr(program, 'page'):
+ kwargs.setdefault('cover', program.page.cover)
+ kwargs.setdefault('page', program.page)
+ return super().get_context_data(**kwargs)
class TimetableView(BaseView, ListView):
@@ -120,9 +143,9 @@ class TimetableView(BaseView, ListView):
end = None
def get_queryset(self):
- self.date = self.kwargs.get('date', datetime.date.today())
+ self.date = self.kwargs.get('date') or datetime.date.today()
self.start = self.date - datetime.timedelta(days=self.date.weekday())
- self.end = self.date + datetime.timedelta(days=7-self.date.weekday())
+ self.end = self.start + datetime.timedelta(days=7)
return super().get_queryset().station(self.site.station) \
.range(self.start, self.end) \
.order_by('start')
-
{% for object in object_list %}
-
{% if is_paginated %}
{% endfor %}
+ {% endwith %}
{% endblock %}
diff --git a/aircox_web/templatetags/aircox_web.py b/aircox_web/templatetags/aircox_web.py
index 8d4051f..471f829 100644
--- a/aircox_web/templatetags/aircox_web.py
+++ b/aircox_web/templatetags/aircox_web.py
@@ -8,19 +8,22 @@ from aircox_web.models import Page
random.seed()
register = template.Library()
+
@register.simple_tag(name='diffusion_page')
def do_diffusion_page(diffusion):
""" Return page for diffusion. """
for obj in (diffusion, diffusion.program):
page = getattr(obj, 'page', None)
- if page is not None and page.status is not Page.STATUS.draft:
+ if page is not None and page.status == Page.STATUS.published:
return page
+
@register.simple_tag(name='unique_id')
def do_unique_id(prefix=''):
value = str(random.random()).replace('.', '')
return prefix + '_' + value if prefix else value
+
@register.filter(name='is_diffusion')
def do_is_diffusion(obj):
return isinstance(obj, aircox.Diffusion)
diff --git a/aircox_web/urls.py b/aircox_web/urls.py
index c10b393..9caa64c 100644
--- a/aircox_web/urls.py
+++ b/aircox_web/urls.py
@@ -2,22 +2,29 @@ from django.conf.urls import url
from django.urls import path, register_converter
from . import views, models
-from .converters import PagePathConverter, DateConverter
+from .converters import PagePathConverter, DateConverter, WeekConverter
register_converter(PagePathConverter, 'page_path')
register_converter(DateConverter, 'date')
+register_converter(WeekConverter, 'week')
urlpatterns = [
+ path('programs/
- {% if page and context_page != page %}
- {{ page.title }}
- {% else %}
- {{ page.title|default:program.name }}
- {% endif %}
- {% if object.page is page %}
- — {{ program.name }}
- {% endif %}
- {% if object.initial %}
- {% with object.initial.date as date %}
-
- {% trans "rerun" %}
-
- {% endwith %}
- {% endif %}
-
+
+
+
+ + {% if page and context_page != page %} + {{ page.title }} + {% else %} + {{ page.title|default:program.name }} + {% endif %} +
+ + + {% if object.page is page and context_page != program.page %} + — {{ program.page.title }} + {% endif %} + + {% if not hide_schedule %} + + {% endif %} + + {% if object.initial %} + {% with object.initial.date as date %} + + {% trans "rerun" %} + + {% endwith %} + {% endif %} + +
{{ page.headline|default:program.page.headline }}
diff --git a/aircox_web/templates/aircox_web/diffusions.html b/aircox_web/templates/aircox_web/diffusions.html
index d1a0fec..af1d29a 100644
--- a/aircox_web/templates/aircox_web/diffusions.html
+++ b/aircox_web/templates/aircox_web/diffusions.html
@@ -1,35 +1,53 @@
{% extends "aircox_web/page.html" %}
{% load i18n aircox_web %}
-{% block main %}
-{{ block.super }}
+{% block title %}
+{% if program %}
+ {% with program.name as program %}
+ {% blocktrans %}Diffusions of {{ program }}{% endblocktrans %}
+ {% endwith %}
+{% else %}
+ {% trans "All diffusions" %}
+ {% endif %}
+{% endblock %}
+
+{% block header %}
+{{ block.super }}
+{% if program %}
++ ❬ {{ program.name }} +
+{% include "aircox_web/program_header.html" %} +{% endif %} +{% endblock %} + + +{% block content %}
-
+ {% with object.diffusion as object %}
+ {% include "aircox_web/diffusion_item.html" %}
+ {% endwith %}
{% endfor %}
+
-
-
-
- {% include "aircox_web/diffusion_item.html" %}
-
-