X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c0a7799619e217e2eac724b1a688ad37f0182253..51099aa7aa297f5f38fe052c5caa49b22170e7ac:/src/social/models.py
diff --git a/src/social/models.py b/src/social/models.py
index c9334d833..e85298803 100644
--- a/src/social/models.py
+++ b/src/social/models.py
@@ -6,9 +6,9 @@ from django.db import models
from django.conf import settings
from django.core.exceptions import ValidationError
from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _, string_concat
-from ssify import flush_ssi_includes
+from django.utils.translation import gettext_lazy as _, get_language
from catalogue.models import Book
+from wolnelektury.utils import cached_render, clear_cached_renders
class BannerGroup(models.Model):
@@ -53,21 +53,16 @@ class Cite(models.Model):
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)
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)
+ _('background image'), upload_to='social/cite', null=True, blank=True,
+ help_text=_('Best background is 975 x 315 px and under 100kB.'))
+ image_title = models.CharField(_('background title'), max_length=255, null=True, blank=True)
+ image_author = models.CharField(_('background author'), max_length=255, blank=True, null=True)
+ image_link = models.URLField(_('background link'), blank=True, null=True)
+ image_license = models.CharField(_('background license name'), max_length=255, blank=True, null=True)
+ image_license_link = models.URLField(_('background 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)
@@ -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,40 +108,52 @@ 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(_('placement'), choices=[
+ ('main', 'main'),
+ ('main_2022', 'main 2022'),
+ ])
+ priority = models.SmallIntegerField(_('priority'), default=0)
+ language = models.CharField(_('language'), max_length=2, blank=True, default='', choices=settings.LANGUAGES)
class Meta:
- ordering = ('slug',)
+# ordering = ('placement', '-priority')
verbose_name = _('carousel')
verbose_name_plural = _('carousels')
def __str__(self):
- return self.slug
+ return self.placement
+
+ @classmethod
+ def get(cls, placement):
+ carousel = cls.objects.filter(models.Q(language='') | models.Q(language=get_language()), 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)
+ order = models.PositiveSmallIntegerField(_('order'))
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'))
class Meta:
ordering = ('order',)
- unique_together = [('carousel', 'order')]
verbose_name = _('carousel item')
verbose_name_plural = _('carousel items')