X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e180be7cce99d59054b206a061386188c5652f02..c36c3891e56611e2ad4c518daa46b8cc3f28188e:/src/social/models.py
diff --git a/src/social/models.py b/src/social/models.py
index 6f1f697fa..cb1326b15 100644
--- a/src/social/models.py
+++ b/src/social/models.py
@@ -1,24 +1,23 @@
-# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
#
from random import randint
from django.db import models
from django.conf import settings
from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy as _, string_concat
-from ssify import flush_ssi_includes
+from django.urls import reverse
from catalogue.models import Book
+from wolnelektury.utils import cached_render, clear_cached_renders
class BannerGroup(models.Model):
- name = models.CharField(_('name'), max_length=255, unique=True)
- created_at = models.DateTimeField(_('created at'), auto_now_add=True)
+ name = models.CharField('nazwa', max_length=255, unique=True)
+ created_at = models.DateTimeField('utworzona', auto_now_add=True)
class Meta:
ordering = ('name',)
- verbose_name = _('banner group')
- verbose_name_plural = _('banner groups')
+ verbose_name = 'grupa bannerów'
+ verbose_name_plural = 'grupy bannerów'
def __str__(self):
return self.name
@@ -36,46 +35,42 @@ class BannerGroup(models.Model):
class Cite(models.Model):
- book = models.ForeignKey(Book, verbose_name=_('book'), null=True, blank=True)
- text = models.TextField(_('text'), blank=True)
- small = models.BooleanField(_('small'), default=False, help_text=_('Make this cite display smaller.'))
- vip = models.CharField(_('VIP'), max_length=128, null=True, blank=True)
- link = models.URLField(_('link'))
- video = models.URLField(_('video'), blank=True)
- picture = models.ImageField(_('picture'), blank=True,
+ book = models.ForeignKey(Book, models.CASCADE, verbose_name='ksiÄ
żka', null=True, blank=True)
+ text = models.TextField('tekst', blank=True)
+ small = models.BooleanField(
+ 'maÅy', default=False, help_text='Sprawia, że cytat wyÅwietla siÄ mniejszym fontem.')
+ vip = models.CharField('VIP', max_length=128, null=True, blank=True)
+ link = models.URLField('odnoÅnik')
+ video = models.URLField('wideo', blank=True)
+ picture = models.ImageField('ilustracja', blank=True,
help_text='Najlepsze wymiary: 975 x 315 z tekstem, 487 x 315 bez tekstu.')
- picture_alt = models.CharField(_('picture alternative text'), max_length=255, blank=True)
- picture_title = models.CharField(_('picture title'), max_length=255, null=True, blank=True)
- picture_author = models.CharField(_('picture author'), max_length=255, blank=True, null=True)
- picture_link = models.URLField(_('picture link'), blank=True, null=True)
- picture_license = models.CharField(_('picture license name'), max_length=255, blank=True, null=True)
- picture_license_link = models.URLField(_('picture license link'), blank=True, null=True)
-
- sticky = models.BooleanField(_('sticky'), default=False, db_index=True,
- help_text=_('Sticky cites will take precedense.'))
- banner = models.BooleanField(_('banner'), default=False, help_text=string_concat(_('Adjust size to image, ignore the text'), '
(PrzestarzaÅe; użyj funkcji "Obraz" w sekcji "Media box")'))
-
- background_plain = models.BooleanField(_('plain background'), default=False)
- background_color = models.CharField(_('background color'), max_length=32, blank=True)
+ picture_alt = models.CharField('alternatywny tekst ilustracji', max_length=255, blank=True)
+ picture_title = models.CharField('tytuÅ ilustracji', max_length=255, null=True, blank=True)
+ picture_author = models.CharField('autor ilustracji', max_length=255, blank=True, null=True)
+ picture_link = models.URLField('link ilustracji', blank=True, null=True)
+ picture_license = models.CharField('nazwa licencji ilustracji', max_length=255, blank=True, null=True)
+ picture_license_link = models.URLField('adres licencji ilustracji', blank=True, null=True)
+
+ sticky = models.BooleanField('przyklejony', default=False, db_index=True,
+ help_text='Przyklejone cytaty majÄ
pierwszeÅstwo.')
+ background_plain = models.BooleanField('jednobarwne tÅo', default=False)
+ background_color = models.CharField('kolor tÅa', max_length=32, blank=True)
image = models.ImageField(
- _('image'), upload_to='social/cite', null=True, blank=True,
- help_text=_('Best image is exactly 975px wide and weights under 100kB.'))
- image_shift = models.IntegerField(
- _('shift'), null=True, blank=True,
- help_text=string_concat(_('Vertical shift, in percents. 0 means top, 100 is bottom. Default is 50%.'), '
(PrzestarzaÅe; użyj obrazka o wÅaÅciwych proporcjach;)'))
- image_title = models.CharField(_('title'), max_length=255, null=True, blank=True)
- image_author = models.CharField(_('author'), max_length=255, blank=True, null=True)
- image_link = models.URLField(_('link'), blank=True, null=True)
- image_license = models.CharField(_('license name'), max_length=255, blank=True, null=True)
- image_license_link = models.URLField(_('license link'), blank=True, null=True)
-
- created_at = models.DateTimeField(_('created at'), auto_now_add=True)
- group = models.ForeignKey(BannerGroup, verbose_name=_('group'), null=True, blank=True, on_delete=models.SET_NULL)
+ 'obraz tÅa', upload_to='social/cite', null=True, blank=True,
+ help_text='Najlepsze tÅo ma wielkoÅÄ 975 x 315 px i waży poniżej 100kB.')
+ image_title = models.CharField('tytuÅ obrazu tÅa', max_length=255, null=True, blank=True)
+ image_author = models.CharField('autor obrazu tÅa', max_length=255, blank=True, null=True)
+ image_link = models.URLField('link obrazu tÅa', blank=True, null=True)
+ image_license = models.CharField('nazwa licencji obrazu tÅa', max_length=255, blank=True, null=True)
+ image_license_link = models.URLField('adres licencji obrazu tÅa', blank=True, null=True)
+
+ created_at = models.DateTimeField('utworzony', auto_now_add=True)
+ group = models.ForeignKey(BannerGroup, verbose_name='grupa', null=True, blank=True, on_delete=models.SET_NULL)
class Meta:
ordering = ('vip', 'text')
- verbose_name = _('banner')
- verbose_name_plural = _('banners')
+ verbose_name = 'banner'
+ verbose_name_plural = 'bannery'
def __str__(self):
t = []
@@ -103,9 +98,6 @@ class Cite(models.Model):
return self.vip or self.text or self.book
def layout(self):
- if self.banner:
- # TODO: move all banners to pictures.
- return 'banner'
pieces = []
if self.has_box():
pieces.append('box')
@@ -116,51 +108,65 @@ class Cite(models.Model):
def save(self, *args, **kwargs):
ret = super(Cite, self).save(*args, **kwargs)
- self.flush_includes()
+ self.clear_cache()
return ret
- def flush_includes(self):
- flush_ssi_includes([
- template % (self.pk, lang)
- for template in [
- '/ludzie/cite/%s.%s.html',
- '/ludzie/cite_main/%s.%s.html',
- ]
- for lang in [lc for (lc, _ln) in settings.LANGUAGES]] +
- ['/ludzie/cite_info/%s.html' % self.pk])
+ @cached_render('social/cite_promo.html')
+ def main_box(self):
+ return {
+ 'cite': self,
+ 'main': True,
+ }
+
+ def clear_cache(self):
+ clear_cached_renders(self.main_box)
class Carousel(models.Model):
- slug = models.SlugField(_('slug'), unique=True)
+ placement = models.SlugField('miejsce', choices=[
+ ('main', 'main'),
+ ('main_2022', 'main 2022'),
+ ])
+ priority = models.SmallIntegerField('priorytet', default=0)
+ language = models.CharField('jÄzyk', max_length=2, blank=True, default='', choices=settings.LANGUAGES)
class Meta:
- ordering = ('slug',)
- verbose_name = _('carousel')
- verbose_name_plural = _('carousels')
+# ordering = ('placement', '-priority')
+ verbose_name = 'karuzela'
+ verbose_name_plural = 'karuzele'
def __str__(self):
- return self.slug
+ return self.placement
+
+ @classmethod
+ def get(cls, placement):
+ carousel = cls.objects.filter(placement=placement).order_by('-priority', '?').first()
+ if carousel is None:
+ carousel = cls.objects.create(placement=placement)
+ return carousel
+
class CarouselItem(models.Model):
- order = models.PositiveSmallIntegerField(_('order'), unique=True)
- carousel = models.ForeignKey(Carousel, models.CASCADE, verbose_name=_('carousel'))
- banner = models.ForeignKey(Cite, models.CASCADE, null=True, blank=True, verbose_name=_('banner'))
- banner_group = models.ForeignKey(BannerGroup, models.CASCADE, null=True, blank=True, verbose_name=_('banner group'))
+ order = models.PositiveSmallIntegerField('kolejnoÅÄ')
+ carousel = models.ForeignKey(Carousel, models.CASCADE, verbose_name='karuzela')
+ banner = models.ForeignKey(
+ Cite, models.CASCADE, null=True, blank=True, verbose_name='banner')
+ banner_group = models.ForeignKey(
+ BannerGroup, models.CASCADE, null=True, blank=True, verbose_name='grupa bannerów')
class Meta:
ordering = ('order',)
- unique_together = [('carousel', 'order')]
- verbose_name = _('carousel item')
- verbose_name_plural = _('carousel items')
+ verbose_name = 'element karuzeli'
+ verbose_name_plural = 'elementy karuzeli'
def __str__(self):
return str(self.banner or self.banner_group)
def clean(self):
if not self.banner and not self.banner_group:
- raise ValidationError(_('Either banner or banner group is required.'))
+ raise ValidationError('ProszÄ wskazaÄ banner albo grupÄ bannerów.')
elif self.banner and self.banner_group:
- raise ValidationError(_('Either banner or banner group is required.'))
+ raise ValidationError('ProszÄ wskazaÄ banner albo grupÄ bannerów.')
def get_banner(self):
return self.banner or self.banner_group.get_banner()