X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/019dfd7e87efcf03b08decb7af6552df3e3df215..c83e534451c1ca43da0ed9585298a96f059f77fb:/src/social/models.py diff --git a/src/social/models.py b/src/social/models.py index cd78a3cff..37cfecd24 100644 --- a/src/social/models.py +++ b/src/social/models.py @@ -5,10 +5,10 @@ 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.urls import reverse from django.utils.translation import ugettext_lazy as _ -from ssify import flush_ssi_includes from catalogue.models import Book +from wolnelektury.utils import cached_render, clear_cached_renders class BannerGroup(models.Model): @@ -36,29 +36,33 @@ class BannerGroup(models.Model): class Cite(models.Model): - book = models.ForeignKey(Book, verbose_name=_('book'), null=True, blank=True) + book = models.ForeignKey(Book, models.CASCADE, 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) + picture = models.ImageField(_('picture'), 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=_('Adjust size to image, ignore the text')) - + 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=_(u'Vertical shift, in percents. 0 means top, 100 is bottom. Default is 50%.')) - 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) @@ -69,11 +73,23 @@ class Cite(models.Model): verbose_name_plural = _('banners') def __str__(self): - return u"%s: %s…" % (self.vip, self.text[:60]) + t = [] + if self.text: + t.append(self.text[:60]) + if self.book_id: + t.append('[ks.]'[:60]) + t.append(self.link[:60]) + if self.vip: + t.append('vip: ' + self.vip) + if self.picture: + t.append('[obr.]') + if self.video: + t.append('[vid.]') + return ', '.join(t) def get_absolute_url(self): """This is used for testing.""" - return "%s?choose_cite=%d" % (reverse('main_page'), self.id) + return "%s?banner=%d" % (reverse('main_page'), self.id) def has_box(self): return self.video or self.picture @@ -82,33 +98,28 @@ 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') if self.has_body(): pieces.append('text') - if self.small: - pieces.append('small') return '-'.join(pieces) 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):