Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • pi/pi-cms
  • mail1/pi-cms
2 results
Select Git revision
Loading items
Show changes
Commits on Source (28)
Showing
with 832 additions and 16 deletions
from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
from .models import Tag
class TagAdmin(ModelAdmin):
model = Tag
menu_label = "Štítky"
menu_icon = "tag"
menu_order = 290
add_to_settings_menu = False
exclude_from_explorer = False
modeladmin_register(TagAdmin)
# Generated by Django 4.2.4 on 2023-08-19 22:46
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("home", "0023_homepage_academic_council"),
]
operations = [
migrations.AddField(
model_name="homepersonpage",
name="name_titles",
field=models.CharField(
blank=True, max_length=32, null=True, verbose_name="Tituly"
),
),
]
# Generated by Django 4.2.4 on 2023-08-19 23:08
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wagtailimages", "0025_alter_image_file_alter_rendition_file"),
("home", "0024_homepersonpage_name_titles"),
]
operations = [
migrations.AddField(
model_name="homearticlepage",
name="image",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to="wagtailimages.image",
verbose_name="Obrázek",
),
),
migrations.AddField(
model_name="homearticlepage",
name="show_image_on_homepage",
field=models.BooleanField(
default=False, verbose_name="Zobrazovat obrázek na homepage"
),
),
]
# Generated by Django 4.2.4 on 2023-08-20 14:17
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wagtailcore", "0083_workflowcontenttype"),
("home", "0025_homearticlepage_image_and_more"),
]
operations = [
migrations.CreateModel(
name="SocialMediaSettings",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"mastodon",
models.URLField(blank=True, help_text="Mastodon URL", null=True),
),
(
"twitter",
models.URLField(blank=True, help_text="Twitter URL", null=True),
),
(
"linkedin",
models.URLField(blank=True, help_text="LinkedIn URL", null=True),
),
(
"facebook",
models.URLField(blank=True, help_text="Facebook URL", null=True),
),
(
"site",
models.OneToOneField(
editable=False,
on_delete=django.db.models.deletion.CASCADE,
to="wagtailcore.site",
),
),
],
options={
"verbose_name": "Sociální sítě",
},
),
]
# Generated by Django 4.2.4 on 2023-08-20 15:50
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("home", "0026_socialmediasettings"),
]
operations = [
migrations.RemoveField(
model_name="homedocumentpage",
name="tags",
),
migrations.RemoveField(
model_name="homeeventpage",
name="tags",
),
]
# Generated by Django 4.2.4 on 2023-08-20 16:06
import django.db.models.deletion
import modelcluster.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("taggit", "0005_auto_20220424_2025"),
("home", "0027_remove_homedocumentpage_tags_and_more"),
]
operations = [
migrations.CreateModel(
name="ArticleTag",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
],
options={
"abstract": False,
},
),
migrations.RemoveField(
model_name="homearticlepage",
name="tags",
),
migrations.DeleteModel(
name="Tag",
),
migrations.AddField(
model_name="articletag",
name="content_object",
field=modelcluster.fields.ParentalKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="tagged_items",
to="home.homearticlepage",
),
),
migrations.AddField(
model_name="articletag",
name="tag",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="%(app_label)s_%(class)s_items",
to="taggit.tag",
),
),
]
# Generated by Django 4.2.4 on 2023-08-20 16:06
import modelcluster.contrib.taggit
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("taggit", "0005_auto_20220424_2025"),
("home", "0028_articletag_remove_homearticlepage_tags_delete_tag_and_more"),
]
operations = [
migrations.AddField(
model_name="homearticlepage",
name="tags",
field=modelcluster.contrib.taggit.ClusterTaggableManager(
blank=True,
help_text="A comma-separated list of tags.",
through="home.ArticleTag",
to="taggit.Tag",
verbose_name="Štítky",
),
),
]
# Generated by Django 4.2.4 on 2023-08-20 16:50
import django.db.models.deletion
import django.utils.timezone
import wagtail.contrib.routable_page.models
import wagtail.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wagtailimages", "0025_alter_image_file_alter_rendition_file"),
("wagtailcore", "0083_workflowcontenttype"),
("home", "0029_homearticlepage_tags"),
]
operations = [
migrations.CreateModel(
name="HomeVideosPage",
fields=[
(
"page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
(
"content",
wagtail.fields.RichTextField(
blank=True, null=True, verbose_name="Obsah"
),
),
],
options={
"verbose_name": "Rozcestník videí",
},
bases=(
wagtail.contrib.routable_page.models.RoutablePageMixin,
"wagtailcore.page",
),
),
migrations.CreateModel(
name="HomeVideoPage",
fields=[
(
"page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
(
"author",
models.CharField(
blank=True,
max_length=128,
null=True,
verbose_name="Jméno autora",
),
),
(
"date",
models.DateField(
default=django.utils.timezone.now,
verbose_name="Datum vytvoření",
),
),
("content", wagtail.fields.RichTextField(verbose_name="Obsah")),
(
"embed_url",
models.URLField(
help_text="Pro získání adresy zmáčkni tlačítko Sdílet, vyber záložku Embed a zaškrtní zobrazování pouze URL.",
verbose_name="URL Embedu",
),
),
(
"author_page",
models.ForeignKey(
blank=True,
help_text="Pokud je vybrána stránka, není nutno vyplňovat jméno autora níže.",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to="home.homepersonpage",
verbose_name="Stránka autora",
),
),
(
"thumbnail",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to="wagtailimages.image",
verbose_name="Náhledový obrázek",
),
),
],
options={
"abstract": False,
},
bases=(
wagtail.contrib.routable_page.models.RoutablePageMixin,
"wagtailcore.page",
),
),
]
# Generated by Django 4.2.4 on 2023-08-20 16:53
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("home", "0030_homevideospage_homevideopage"),
]
operations = [
migrations.AlterModelOptions(
name="homevideopage",
options={"verbose_name": "Video"},
),
]
# Generated by Django 4.2.4 on 2023-08-20 16:54
import wagtail.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("home", "0031_alter_homevideopage_options"),
]
operations = [
migrations.AlterField(
model_name="homevideopage",
name="content",
field=wagtail.fields.RichTextField(
blank=True, null=True, verbose_name="Obsah"
),
),
]
# Generated by Django 4.2.2 on 2023-08-20 18:44
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("home", "0024_alter_homepage_academic_council_description_and_more"),
("home", "0032_alter_homevideopage_content"),
]
operations = []
# Generated by Django 4.2.4 on 2023-08-21 18:21
import django.db.models.deletion
import modelcluster.contrib.taggit
import modelcluster.fields
import wagtail_color_panel.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("contenttypes", "0002_remove_content_type_name"),
("home", "0033_merge_20230820_1844"),
]
operations = [
migrations.CreateModel(
name="Tag",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"name",
models.CharField(max_length=100, unique=True, verbose_name="name"),
),
(
"slug",
models.SlugField(
allow_unicode=True,
max_length=100,
unique=True,
verbose_name="slug",
),
),
(
"bg_color",
wagtail_color_panel.fields.ColorField(
blank=True, max_length=7, null=True, verbose_name="Barva pozadí"
),
),
(
"fg_color",
wagtail_color_panel.fields.ColorField(
blank=True, max_length=7, null=True, verbose_name="Barva textu"
),
),
],
options={
"abstract": False,
},
),
migrations.CreateModel(
name="TaggedArticle",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"object_id",
models.IntegerField(db_index=True, verbose_name="object ID"),
),
(
"content_object",
modelcluster.fields.ParentalKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="tagged_items",
to="home.homearticlepage",
),
),
(
"content_type",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="%(app_label)s_%(class)s_tagged_items",
to="contenttypes.contenttype",
verbose_name="content type",
),
),
(
"tag",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="%(app_label)s_%(class)s_items",
to="home.tag",
),
),
],
options={
"abstract": False,
},
),
migrations.DeleteModel(
name="ArticleTag",
),
migrations.AlterField(
model_name="homearticlepage",
name="tags",
field=modelcluster.contrib.taggit.ClusterTaggableManager(
blank=True,
help_text="A comma-separated list of tags.",
through="home.TaggedArticle",
to="home.Tag",
verbose_name="Štítky",
),
),
]
# Generated by Django 4.2.4 on 2023-08-21 18:26
import wagtail_color_panel.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("home", "0034_tag_taggedarticle_delete_articletag_and_more"),
]
operations = [
migrations.AlterField(
model_name="tag",
name="bg_color",
field=wagtail_color_panel.fields.ColorField(
default="#fafafa", max_length=7, verbose_name="Barva pozadí"
),
),
migrations.AlterField(
model_name="tag",
name="fg_color",
field=wagtail_color_panel.fields.ColorField(
default="#000000", max_length=7, verbose_name="Barva textu"
),
),
]
# Generated by Django 4.2.4 on 2023-08-21 18:44
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("home", "0035_alter_tag_bg_color_alter_tag_fg_color"),
]
operations = [
migrations.AlterField(
model_name="taggedarticle",
name="tag",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="article_tags",
to="home.tag",
),
),
]
# Generated by Django 4.2.4 on 2023-08-21 19:06
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("home", "0036_alter_taggedarticle_tag"),
]
operations = [
migrations.RemoveField(
model_name="homearticlepage",
name="tags",
),
]
# Generated by Django 4.2.4 on 2023-08-21 19:06
import modelcluster.contrib.taggit
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("home", "0037_remove_homearticlepage_tags"),
]
operations = [
migrations.AddField(
model_name="homearticlepage",
name="tags",
field=modelcluster.contrib.taggit.ClusterTaggableManager(
blank=True,
help_text="A comma-separated list of tags.",
through="home.TaggedArticle",
to="home.Tag",
verbose_name="Štítky",
),
),
]
# Generated by Django 4.2.4 on 2023-08-21 19:09
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("home", "0038_homearticlepage_tags"),
]
operations = [
migrations.RemoveField(
model_name="taggedarticle",
name="content_type",
),
migrations.RemoveField(
model_name="taggedarticle",
name="object_id",
),
]
from django.db import models
from django.utils import timezone
from modelcluster.contrib.taggit import ClusterTaggableManager
from modelcluster.fields import ParentalKey
from taggit.models import ItemBase, TagBase
from wagtail.admin.panels import (
FieldPanel,
InlinePanel,
MultiFieldPanel,
ObjectList,
TabbedInterface,
)
from wagtail.blocks import PageChooserBlock
from wagtail.contrib.routable_page.models import RoutablePageMixin, path
from wagtail.contrib.settings.models import BaseSiteSetting, register_setting
from wagtail.documents import get_document_model
from wagtail.fields import RichTextField, StreamField
from wagtail.models import Page
from wagtail_color_panel.edit_handlers import NativeColorPanel
from wagtail_color_panel.fields import ColorField
from .blocks import PersonBlock
# --- BEGIN Tags ---
class Tag(TagBase):
bg_color = ColorField(verbose_name="Barva pozadí", default="#fafafa")
fg_color = ColorField(verbose_name="Barva textu", default="#000000")
panels = [
FieldPanel("name"),
FieldPanel("slug"),
NativeColorPanel("bg_color"),
NativeColorPanel("fg_color"),
]
class TaggedArticle(ItemBase):
content_object = ParentalKey(
"home.HomeArticlePage", on_delete=models.CASCADE, related_name="tagged_items"
)
tag = models.ForeignKey(Tag, on_delete=models.CASCADE, related_name="article_tags")
# --- END Tags ---
class HomePage(RoutablePageMixin, Page):
heading_text = RichTextField(verbose_name="Hlavní text stránky")
......@@ -137,6 +169,7 @@ class HomePage(RoutablePageMixin, Page):
"home.HomeArticlesPage",
"home.HomeEventsPage",
"home.HomeDocumentsPage",
"home.HomeVideosPage",
"home.HomePeoplePage",
]
......@@ -242,10 +275,10 @@ class HomePage(RoutablePageMixin, Page):
verbose_name = "Domovská stránka"
# --- BEGIN Articles, events and documents ---
# --- BEGIN Articles, events, videos and documents ---
class HomeArticlesPage(RoutablePageMixin, Page):
class HomeArticlesPage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
......@@ -257,13 +290,27 @@ class HomeArticlesPage(RoutablePageMixin, Page):
@property
def articles(self):
return HomeArticlePage.objects.live().order_by("-date").all()
return HomeArticlePage.objects.live().order_by("-date")
def get_context(self, request):
context = super().get_context(request)
articles = self.articles
# Filter by tag
tag = request.GET.get("tag")
if tag:
articles = articles.filter(tags__name=tag)
context["filtered_tag"] = tag
context["articles"] = articles
return context
class Meta:
verbose_name = "Rozcestník článků"
class HomeEventsPage(RoutablePageMixin, Page):
class HomeEventsPage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
......@@ -281,7 +328,7 @@ class HomeEventsPage(RoutablePageMixin, Page):
verbose_name = "Rozcestník akcí"
class HomeDocumentsPage(RoutablePageMixin, Page):
class HomeDocumentsPage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
......@@ -293,15 +340,39 @@ class HomeDocumentsPage(RoutablePageMixin, Page):
@property
def documents(self):
return HomeDocumentPage.objects.child_of(self).live().order_by("-date").all()
documents = list(
HomeDocumentPage.objects.child_of(self).order_by("-date").live().all()
)
document_directories = list(
HomeDocumentsPage.objects.child_of(self).live().all()
)
return documents + document_directories
class Meta:
verbose_name = "Rozcestník dokumentů"
class HomeContentPageMixin(RoutablePageMixin, Page):
tags = models.ManyToManyField("Tag", verbose_name="Štítky")
class HomeVideosPage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
subpage_types = ["home.HomeVideoPage"]
content_panels = Page.content_panels + [
FieldPanel("content", icon="pilcrow"),
]
@property
def videos(self):
return HomeVideoPage.objects.live().order_by("-date").all()
class Meta:
verbose_name = "Rozcestník videí"
class HomeContentPageMixin(Page):
author_page = models.ForeignKey(
"home.HomePersonPage",
on_delete=models.SET_NULL,
......@@ -348,6 +419,43 @@ class HomeContentPageMixin(RoutablePageMixin, Page):
class HomeArticlePage(HomeContentPageMixin):
image = models.ForeignKey(
"wagtailimages.Image",
null=True,
blank=True,
on_delete=models.SET_NULL,
related_name="+",
verbose_name="Obrázek",
)
content = RichTextField(
verbose_name="Obsah",
features=[
"h2",
"h3",
"h4",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
"embed",
"footnotes",
],
)
show_image_on_homepage = models.BooleanField(
verbose_name="Zobrazovat obrázek na homepage",
default=False,
)
tags = ClusterTaggableManager(
through=TaggedArticle, blank=True, verbose_name="Štítky"
)
perex = models.TextField(verbose_name="Perex")
content_panels = Page.content_panels + [
......@@ -358,9 +466,18 @@ class HomeArticlePage(HomeContentPageMixin):
],
heading="Autor",
),
MultiFieldPanel(
[
FieldPanel("image", icon="image", heading=" "),
FieldPanel("show_image_on_homepage"),
],
heading="Obrázek",
),
FieldPanel("date", icon="calendar"),
FieldPanel("perex", icon="pilcrow"),
FieldPanel("tags", icon="tag"),
FieldPanel("content", icon="pilcrow"),
InlinePanel("footnotes", label="Footnotes", icon="pilcrow"),
]
class Meta:
......@@ -418,11 +535,46 @@ class HomeDocumentPage(HomeContentPageMixin):
verbose_name = "Dokument"
# --- END Articles, events and documents ---
class HomeVideoPage(HomeContentPageMixin):
embed_url = models.URLField(
verbose_name="URL Embedu",
help_text="Pro získání adresy zmáčkni tlačítko Sdílet, vyber záložku Embed a zaškrtní zobrazování pouze URL.",
)
thumbnail = models.ForeignKey(
"wagtailimages.Image",
null=True,
blank=True,
on_delete=models.SET_NULL,
related_name="+",
verbose_name="Náhledový obrázek",
)
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
content_panels = Page.content_panels + [
FieldPanel("embed_url", icon="link"),
FieldPanel("thumbnail", icon="image"),
MultiFieldPanel(
[
FieldPanel("author_page", icon="user"),
FieldPanel("author", icon="user"),
],
heading="Autor",
),
FieldPanel("date", icon="calendar"),
FieldPanel("content", icon="pilcrow"),
]
class Meta:
verbose_name = "Video"
# --- END Articles, events, videos and documents ---
# --- BEGIN People ---
class HomePeoplePage(RoutablePageMixin, Page):
class HomePeoplePage(Page):
content = RichTextField(verbose_name="Obsah", blank=True, null=True)
parent_page_type = ["home.HomePage"]
......@@ -434,13 +586,13 @@ class HomePeoplePage(RoutablePageMixin, Page):
@property
def people(self):
return HomePersonPage.objects.live().order_by("-title").all()
return HomePersonPage.objects.live().order_by("title").all()
class Meta:
verbose_name = "Rozcestník osob"
class HomePersonPage(RoutablePageMixin, Page):
class HomePersonPage(Page):
image = models.ForeignKey(
"wagtailimages.Image",
null=True,
......@@ -450,6 +602,13 @@ class HomePersonPage(RoutablePageMixin, Page):
verbose_name="Profilový obrázek",
)
name_titles = models.CharField(
max_length=32,
blank=True,
null=True,
verbose_name="Tituly",
)
position = models.TextField(verbose_name="Pracovní pozice", blank=True, null=True)
email = models.EmailField(verbose_name="Emailová adresa", blank=True, null=True)
......@@ -457,22 +616,63 @@ class HomePersonPage(RoutablePageMixin, Page):
description = RichTextField(verbose_name="Popis", blank=True, null=True)
content_panels = Page.content_panels + [
FieldPanel("name_titles", icon="pilcrow"),
FieldPanel("image", icon="image"),
FieldPanel("position", icon="pilcrow"),
FieldPanel("email", icon="mail"),
FieldPanel("description", icon="pilcrow"),
]
@property
def full_name(self) -> str:
name = self.title
if self.name_titles is not None:
name = f"{self.name_titles} {name}"
return name
@property
def inline_position(self) -> str:
"""Returns this person's position formatted to fit on a single line."""
if self.position is None:
return None
split_positions = self.position.split("\n")
split_positions = [position.strip() for position in split_positions]
return ", ".join(split_positions)
class Meta:
verbose_name = "Osoba"
# --- END People ---
# --- BEGIN Settings ---
@register_setting
class SocialMediaSettings(BaseSiteSetting):
mastodon = models.URLField(blank=True, null=True, help_text="Mastodon URL")
twitter = models.URLField(blank=True, null=True, help_text="Twitter URL")
linkedin = models.URLField(blank=True, null=True, help_text="LinkedIn URL")
facebook = models.URLField(blank=True, null=True, help_text="Facebook URL")
class Tag(models.Model):
name = models.CharField(verbose_name="Jméno", max_length=32)
panels = [
MultiFieldPanel(
[
FieldPanel("mastodon"),
FieldPanel("twitter"),
FieldPanel("linkedin"),
FieldPanel("facebook"),
],
heading="Nastavení sociálních sítí",
)
]
class Meta:
verbose_name = "Štítek"
verbose_name_plural = "Štítky"
verbose_name = "Sociální sítě"
# --- END Settings ---