ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 8 Pull Requests Activity

work on schedule; section.as_view()

Browse Source
This commit is contained in:
bkfox
2016-06-07 01:57:06 +02:00
parent 2365cc8b8e
commit b99dec05e3
8 changed files with 184 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cms/models.py
View File

@ -103,6 +103,9 @@ class Post (models.Model, Routable):
"""
Base model that can be used as is if wanted. Represent a generic
publication on the website.
You can declare an extra property "info" that can be used to append
info in lists rendering.
"""
# metadata
thread_type = models.ForeignKey(

64
cms/sections.py
View File

@ -35,8 +35,6 @@ class Section(View):
* name: set name/id of the section container
* css_class: css classes of the container
* attr: HTML attributes of the container
* hide_empty: if true, section is not rendered when content is empty
* title: title of the section
* header: header of the section
* footer: footer of the section
@ -50,13 +48,28 @@ class Section(View):
name = ''
css_class = ''
attrs = None
# hide_empty = False
title = ''
header = ''
footer = ''
object = None
force_object = None
request = None
object = None
kwargs = None
@classmethod
def as_view (cl, *args, **kwargs):
"""
Similar to View.as_view, but instead, wrap a constructor of the
given class that is used as is.
"""
def func(**kwargs_):
if kwargs_:
kwargs.update(kwargs_)
instance = cl(*args, **kwargs)
return instance
return func
def add_css_class(self, css_class):
if self.css_class:
if css_class not in self.css_class:
@ -80,7 +93,11 @@ class Section(View):
def get_content(self):
return ''
def get_context_data(self):
def get_context_data(self, request = None, object = None, **kwargs):
if request: self.request = request
if object: self.object = object
if kwargs: self.kwargs = kwargs
return {
'view': self,
'tag': self.tag,
@ -93,14 +110,10 @@ class Section(View):
'object': self.object,
}
def get_context(self, request, object=None, **kwargs):
self.object = self.force_object or object
self.request = request
self.kwargs = kwargs
return self.get_context_data()
def get(self, request, object=None, **kwargs):
context = self.get_context(request, object, **kwargs)
def get(self, request, object=None, return_context=False, **kwargs):
context = self.get_context_data(request=request, object=object, **kwargs)
if return_context:
return context
if not context:
return ''
return render_to_string(self.template_name, context, request=request)
@ -131,9 +144,12 @@ class Content(Section):
Attributes:
* content: raw HTML code to render
* rel_attr: name of the attribute of self.object to use
* re_image_attr: if true and there is an image on the current object,
render the object's image
"""
content = None
rel_attr = 'content'
rel_image_attr = 'image'
def get_content(self):
if self.content is None:
@ -142,6 +158,10 @@ class Content(Section):
content = escape(content)
content = re.sub(r'(^|\n\n)((\n?[^\n])+)', r'<p>\2</p>', content)
content = re.sub(r'\n', r'<br>', content)
if self.rel_image_attr and hasattr(self.object, self.rel_image_attr):
image = getattr(self.object, self.rel_image_attr)
content = '<img src="{}">'.format(image.url) + content
return content
return str(self.content)
@ -222,12 +242,13 @@ class List(Section):
def get_object_list(self):
return self.object_list
def get_context_data(self):
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
object_list = self.object_list or self.get_object_list()
if not object_list and not self.message_empty:
return
context = super().get_context_data()
context.update({
'base_template': 'aircox/cms/section.html',
'list': self,
@ -276,14 +297,15 @@ class Comments(List):
})
return ''
def get_context_data(self):
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
comment_form = None
if self.object:
post = self.object
if hasattr(post, 'allow_comments') and post.allow_comments:
comment_form = (self.comment_form or CommentForm())
context = super().get_context_data()
context.update({
'comment_form': comment_form,
})
@ -319,11 +341,15 @@ class Menu(Section):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.css_class += ' menu menu_{}'.format(self.name or self.position)
self.add_css_class('menu')
self.add_css_class('menu_' + str(self.name or self.position))
self.sections = [ section() if callable(section) else section
for section in self.sections ]
if not self.attrs:
self.attrs = {}
def get_context_data(self):
def get_context_data(self, *args, **kwargs):
super().get_context_data(*args, **kwargs)
return {
'tag': self.tag,
'css_class': self.css_class,

44
cms/templates/aircox/cms/list.html
View File

@ -7,7 +7,7 @@
{% block content %}
<ul>
<ul class="content">
{% for item in object_list %}
<li {% if item.css_class %}class="{{ item.css_class }}"{% endif %}
{% for k, v in item.attrs.items %}
@ -16,6 +16,25 @@
{% if item.detail_url %}
<a href="{{ item.detail_url }}">
{% endif %}
{% if 'image' in list.fields and item.image %}
<img src="{% thumbnail item.image list.image_size crop %}">
{% endif %}
<div class="content">
{% if 'title' in list.fields and item.title %}
<h2 class="title">{{ item.title }}</h2>
{% endif %}
{% if 'content' in list.fields and item.content %}
<div class="text">
{% if list.truncate %}
{{ item.content|striptags|truncatewords:list.truncate }}
{% else %}
{{ item.content|striptags }}
{% endif %}
</div>
{% endif %}
</div>
<div class="meta">
{% if item.date and 'date' in list.fields or 'time' in list.fields %}
@ -45,25 +64,6 @@
{% endif %}
</div>
{% if 'image' in list.fields and item.image %}
<img src="{% thumbnail item.image list.image_size crop %}">
{% endif %}
<div class="content">
{% if 'title' in list.fields and item.title %}
<h2 class="title">{{ item.title }}</h2>
{% endif %}
{% if 'content' in list.fields and item.content %}
<div class="text">
{% if list.truncate %}
{{ item.content|striptags|truncatewords:list.truncate }}
{% else %}
{{ item.content|striptags }}
{% endif %}
</div>
{% endif %}
</div>
{% if item.detail_url %}
</a>
@ -75,8 +75,8 @@
{% endfor %}
</ul>
{% if object_list %}
{% if page_obj or list.url %}
{% if object_list and not embed %}
{% if list.url or page_obj %}
<nav>
{% if not page_obj or embed %}
{% comment %}link to show more elements of the list{% endcomment %}

52
cms/views.py
View File

@ -72,10 +72,6 @@ class PostListView(PostBaseView, ListView):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if self.list:
self.template_name = self.list.template_name
self.css_class = self.list.css_class
self.add_css_class('list')
def dispatch(self, request, *args, **kwargs):
self.route = self.kwargs.get('route') or self.route
@ -88,9 +84,7 @@ class PostListView(PostBaseView, ListView):
qs = self.route.get_queryset(self.model, self.request,
**self.kwargs)
else:
# FIXME: should neven happen
qs = self.queryset or self.model.objects.all()
qs = qs.filter(published = True)
query = self.request.GET
@ -101,45 +95,47 @@ class PostListView(PostBaseView, ListView):
else:
qs = qs.order_by('date', 'id')
if query.get('fields'):
self.fields = [
field for field in query.get('fields')
if field in self.__class__.fields
]
return qs
def get_context_data(self, **kwargs):
if self.list:
list = self.list
def init_list(self):
if not self.list:
self.list = sections.List(
truncate = 32,
fields = ['date', 'time', 'image', 'title', 'content'],
)
else:
list = sections.List(
truncate = 32,
fields = [ 'date', 'time', 'image', 'title', 'content' ],
)
self.list = self.list()
self.template_name = self.list.template_name
self.css_class = self.list.css_class
context = list.get_context(request = self.request, **self.kwargs) or {}
if self.request.GET.get('fields'):
self.list.fields = [
field for field in self.request.GET.getlist('fields')
if field in self.list.fields
]
def get_context_data(self, **kwargs):
self.init_list()
self.add_css_class('list')
context = self.list.get_context_data(self.request, **self.kwargs) or {}
context.update(super().get_context_data(**kwargs))
context.update(self.get_base_context(**kwargs))
if self.title:
title = self.title
else:
title = self.route and \
self.route.get_title(self.model, self.request,
elif self.route:
title = self.route.get_title(self.model, self.request,
**self.kwargs)
context.update({
'title': title,
'base_template': 'aircox/cms/website.html',
'css_class': self.css_class,
'list': list,
'list': self.list,
})
# FIXME: list.url = if self.route: self.model(self.route, self.kwargs) else ''
return context
def get_url(self):
return ''
class PostDetailView(DetailView, PostBaseView):
"""
@ -156,7 +152,7 @@ class PostDetailView(DetailView, PostBaseView):
def __init__(self, sections = None, *args, **kwargs):
super().__init__(*args, **kwargs)
self.add_css_class('detail')
self.sections = sections or []
self.sections = [ section() for section in (sections or []) ]
def get_queryset(self):
if self.request.GET.get('embed'):

2
programs/models.py
View File

@ -662,7 +662,7 @@ class Diffusion(models.Model):
**filter_args
).order_by('-start')
def is_date_in_my_range(self, date):
def is_date_in_my_range(self, date = None):
"""
Return true if the given date is in the diffusion's start-end
range.

7
website/models.py
View File

@ -50,3 +50,10 @@ class Diffusion (RelatedPost):
if not self.tags and self.pk:
self.tags = self.thread.tags
@property
def info(self):
if not self.related or not self.related.initial:
return
return _('rerun of %(day)s') % {
'day': self.related.initial.start.strftime('%A %d/%m')
}

77
website/sections.py
View File

@ -14,8 +14,6 @@ class Diffusions(sections.List):
Section that print diffusions. When rendering, if there is no post yet
associated, use the programs' article.
"""
next_count = 5
prev_count = 5
order_by = '-start'
show_schedule = False
@ -32,16 +30,16 @@ class Diffusions(sections.List):
if filter_args:
qs = qs.filter(**filter_args).order_by('start')
r = []
if not self.next_count and not self.prev_count:
return qs
if self.next_count:
r += list(programs.Diffusion.get(next=True, queryset = qs)
.order_by('-start')[:self.next_count])
if self.prev_count:
r += list(programs.Diffusion.get(prev=True, queryset = qs)
.order_by('-start')[:self.prev_count])
return r
return qs
#r = []
#if self.next_count:
# r += list(programs.Diffusion.get(next=True, queryset = qs)
# .order_by('-start')[:self.next_count])
#if self.prev_count:
# r += list(programs.Diffusion.get(prev=True, queryset = qs)
# .order_by('-start')[:self.prev_count])
#return r
def get_object_list(self):
diffs = self.get_diffs()
@ -59,7 +57,7 @@ class Diffusions(sections.List):
if diff.initial:
post.info = _('rerun of %(day)s') % {
'day': diff.initial.date.strftime('%A %d/%m')
'day': diff.initial.start.strftime('%A %d/%m')
}
if self.object:
@ -121,10 +119,7 @@ class Schedule(Diffusions):
Render a list of diffusions in the form of a schedule
"""
template_name = 'aircox/website/schedule.html'
next_count = None
prev_count = None
date = None
days = 7
nav_date_format = '%a. %d'
fields = [ 'time', 'image', 'title']
@ -134,13 +129,16 @@ class Schedule(Diffusions):
@staticmethod
def get_week_dates(date):
"""
Return a list of dates of the week of the given date.
"""
first = date - tz.timedelta(days=date.weekday())
return [ first + tz.timedelta(days=i) for i in range(0, 7) ]
def date_or_default(self):
if self.date:
return self.date
elif 'year' in self.kwargs:
elif self.kwargs and 'year' in self.kwargs:
return tz.datetime(year = int(self.kwargs['year']),
month = int(self.kwargs['month']),
day = int(self.kwargs['day']),
@ -148,18 +146,21 @@ class Schedule(Diffusions):
microsecond = 0)
return tz.datetime.now()
def get_diffs(self):
def get_object_list(self):
date = self.date_or_default()
diffs = super().get_diffs(
start__year = date.year,
start__month = date.month,
start__day = date.day,
)
return diffs
qs = routes.DateRoute.get_queryset(
models.Diffusion, self.request,
year = date.year,
month = date.month,
day = date.day
).order_by('date')
return qs
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
def get_context_data(self, **kwargs):
date = self.date_or_default()
dates_url = [
dates = [
(date, models.Diffusion.route_url(
routes.DateRoute,
year = date.year, month = date.month, day = date.day
@ -167,13 +168,33 @@ class Schedule(Diffusions):
for date in self.get_week_dates(date)
]
context = super().get_context_data(**kwargs)
next_week = dates[-1][0] + tz.timedelta(days=1)
next_week = models.Diffusion.route_url(
routes.DateRoute,
year = next_week.year, month = next_week.month,
day = next_week.day
)
prev_week = dates[0][0] - tz.timedelta(days=1)
prev_week = models.Diffusion.route_url(
routes.DateRoute,
year = prev_week.year, month = prev_week.month,
day = prev_week.day
)
context.update({
'date': date,
'dates_url': dates_url,
'dates': dates,
'next_week': next_week,
'prev_week': prev_week,
})
return context
@property
def url(self):
return None
#class DatesOfDiffusion(sections.List):
# title = _('Dates of diffusion')

55
website/templates/aircox/website/schedule.html
View File

@ -6,42 +6,53 @@
function update_schedule(event) {
var target = event.currentTarget;
var url = target.getAttribute('href');
var schedule = target;
while(schedule && schedule.className.indexOf('schedule'))
schedule = schedule.parentNode;
if(!schedule)
return false;
// prevent event
event.preventDefault();
// get schedule
while(schedule) {
if (schedule.className &&
schedule.className.indexOf('section_schedule') != -1)
break;
schedule = schedule.parentNode;
}
if(!schedule)
return;
console.log(schedule.className)
// xhr
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function() {
if(xhr.readyState != 4 || xhr.status != 200 && xhr.status)
return;
var obj = document.createElement('div');
obj.innerHTML = xhr.responseText;
target.replaceChild(
obj.querySelector('.content'),
schedule.querySelector('.schedule .content')
)
target.replaceChild(
obj.querySelector('.schedule header'),
schedule.querySelector('.schedule header')
)
// target.querySelector('nav a').href = url
}
var obj = document.implementation.createHTMLDocument('result');
obj.documentElement.innerHTML = xhr.responseText;
obj = obj.documentElement;
xhr.open('GET', url + '?embed=1', true);
schedule.querySelector('header').innerHTML =
obj.querySelector('header').innerHTML;
schedule.querySelector('.content').innerHTML =
obj.querySelector('.content').innerHTML;
}
fields = [ {% for field in list.fields %}"fields={{ field }}",{% endfor %} ];
fields = fields.join('&');
xhr.open('GET', url + '?embed=1&' + fields, true);
xhr.send();
return false;
}
</script>
{% for curr, url in dates_url %}
<a href="{{ url }}" onclick="return update_schedule(event);" {% if curr == date %}
class="selected"{% endif %}>
<a href="{{ prev_week }}" onclick="update_schedule(event); return true;">&lt;</a>
{% for curr, url in dates %}
<a href="{{ url }}" {% if curr == date %}class="selected" {% endif %}
onclick="update_schedule(event); return true;">
{{ curr|date:'D. d' }}
</a>
{% endfor %}
<a href="{{ next_week }}" onclick="update_schedule(event); return true;">&gt;</a>
</header>
{% endblock %}