X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/75957f735219259d3b4bc361f80ccd3d7b92a0e9..56c5bac0c6b5fc622a0b274861a98b9dca00259e:/src/social/models.py?ds=inline diff --git a/src/social/models.py b/src/social/models.py index b8f50abba..37cfecd24 100644 --- a/src/social/models.py +++ b/src/social/models.py @@ -6,7 +6,7 @@ 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 django.utils.translation import ugettext_lazy as _ from catalogue.models import Book from wolnelektury.utils import cached_render, clear_cached_renders @@ -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')