From: Radek Czajka Date: Fri, 30 Apr 2021 11:34:37 +0000 (+0200) Subject: Add option for smaller font in banners. X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/0cb33211fcab57efdee7c4d235e3ae0bcb96f7b9 Add option for smaller font in banners. --- diff --git a/src/annoy/locale/pl/LC_MESSAGES/django.mo b/src/annoy/locale/pl/LC_MESSAGES/django.mo index 8593b1d83..87db8eb00 100644 Binary files a/src/annoy/locale/pl/LC_MESSAGES/django.mo and b/src/annoy/locale/pl/LC_MESSAGES/django.mo differ diff --git a/src/annoy/locale/pl/LC_MESSAGES/django.po b/src/annoy/locale/pl/LC_MESSAGES/django.po index 71c39365e..c70a0d9ee 100644 --- a/src/annoy/locale/pl/LC_MESSAGES/django.po +++ b/src/annoy/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2021-04-29 15:39+0200\n" +"PO-Revision-Date: 2021-04-30 13:32+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: pl\n" @@ -31,75 +31,79 @@ msgstr "styl" msgid "Affects blackout." msgstr "Dotyczy blackoutu." -#: annoy/models.py:18 +#: annoy/models.py:17 +msgid "small font" +msgstr "mały font" + +#: annoy/models.py:19 msgid "action label" msgstr "etykieta akcji" -#: annoy/models.py:20 +#: annoy/models.py:21 msgid "If empty, whole banner will serve as a link" msgstr "Jeśli pusta, cały banner będzie służył jako link." -#: annoy/models.py:22 +#: annoy/models.py:23 msgid "open label" msgstr "etykieta otwierania" -#: annoy/models.py:23 +#: annoy/models.py:24 msgid "close label" msgstr "etykieta zamykania" -#: annoy/models.py:24 annoy/models.py:103 +#: annoy/models.py:25 annoy/models.py:104 msgid "text" msgstr "tekst" -#: annoy/models.py:25 +#: annoy/models.py:26 msgid "image" msgstr "obraz" -#: annoy/models.py:26 +#: annoy/models.py:27 msgid "url" msgstr "URL" -#: annoy/models.py:28 +#: annoy/models.py:29 msgid "priority" msgstr "priortytet" -#: annoy/models.py:29 +#: annoy/models.py:30 msgid "Banners with higher priority come first." msgstr "Bannery z wyższym priorytetem mają pierwszeństwo." -#: annoy/models.py:30 +#: annoy/models.py:31 msgid "since" msgstr "od" -#: annoy/models.py:31 +#: annoy/models.py:32 msgid "until" msgstr "do" -#: annoy/models.py:32 +#: annoy/models.py:33 msgid "show members" msgstr "widoczny dla członków klubu" -#: annoy/models.py:33 +#: annoy/models.py:34 msgid "staff preview" msgstr "podgląd tylko dla zespołu" -#: annoy/models.py:36 +#: annoy/models.py:37 msgid "banner" msgstr "banner" -#: annoy/models.py:37 +#: annoy/models.py:38 msgid "banners" msgstr "bannery" -#: annoy/models.py:75 +#: annoy/models.py:76 msgid "pararaphs" msgstr "akapity" -#: annoy/models.py:79 +#: annoy/models.py:80 msgid "dynamic insert" msgstr "dynamiczna wstawka" -#: annoy/models.py:80 +#: annoy/models.py:81 msgid "dynamic inserts" msgstr "dynamiczne wstawki" diff --git a/src/annoy/migrations/0010_auto_20210430_1331.py b/src/annoy/migrations/0010_auto_20210430_1331.py new file mode 100644 index 000000000..0b5b29dcb --- /dev/null +++ b/src/annoy/migrations/0010_auto_20210430_1331.py @@ -0,0 +1,23 @@ +# Generated by Django 2.2.19 on 2021-04-30 11:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('annoy', '0009_banner_style'), + ] + + operations = [ + migrations.AddField( + model_name='banner', + name='smallfont', + field=models.BooleanField(default=False, verbose_name='small font'), + ), + migrations.AlterField( + model_name='banner', + name='style', + field=models.CharField(blank=True, choices=[('blackout_full', 'Full screen'), ('blackout_upper', 'Upper half of screen')], help_text='Affects blackout.', max_length=255, verbose_name='style'), + ), + ] diff --git a/src/annoy/models.py b/src/annoy/models.py index 4df3a5e37..fe5f8fafb 100644 --- a/src/annoy/models.py +++ b/src/annoy/models.py @@ -14,6 +14,7 @@ class Banner(models.Model): choices=STYLES, help_text=_('Affects blackout.') ) + smallfont = models.BooleanField(_('small font'), default=False) action_label = models.CharField( _('action label'), max_length=255, blank=True, diff --git a/src/annoy/static/annoy/banner.scss b/src/annoy/static/annoy/banner.scss index 746f869a8..398bac0d0 100644 --- a/src/annoy/static/annoy/banner.scss +++ b/src/annoy/static/annoy/banner.scss @@ -128,6 +128,11 @@ padding: 0; overflow: hidden; + &.banner-smallfont { + font-size: 13pt; + line-height: 22pt; + } + .annoy-banner-inner { padding: 0 40% 0 15%; height: 100%; diff --git a/src/annoy/templates/annoy/banner.html b/src/annoy/templates/annoy/banner.html index 62b641a43..97f10c1ad 100644 --- a/src/annoy/templates/annoy/banner.html +++ b/src/annoy/templates/annoy/banner.html @@ -7,7 +7,13 @@ {{ banner.open_label }} {% endif %} -
+
{% if not banner.action_label %} {% endif %}