diff --git a/main/migrations/0012_remove_mainpersonpage_facebook_and_more.py b/main/migrations/0012_remove_mainpersonpage_facebook_and_more.py
deleted file mode 100644
index 1b5ca640e1db8f187db674337087d2f81869352a..0000000000000000000000000000000000000000
--- a/main/migrations/0012_remove_mainpersonpage_facebook_and_more.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Generated by Django 4.0.7 on 2022-08-24 13:05
-
-from django.db import migrations, models
-import django.db.models.deletion
-import wagtail.blocks
-import wagtail.fields
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('wagtailimages', '0024_index_image_file_hash'),
- ('main', '0011_alter_mainarticlepage_content_and_more'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='mainpersonpage',
- name='facebook',
- ),
- migrations.RemoveField(
- model_name='mainpersonpage',
- name='instagram',
- ),
- migrations.RemoveField(
- model_name='mainpersonpage',
- name='twitter',
- ),
- migrations.AddField(
- model_name='mainpersonpage',
- name='main_image',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image', verbose_name='Hlavní obrázek'),
- ),
- migrations.AddField(
- model_name='mainpersonpage',
- name='people',
- field=wagtail.fields.StreamField([('people_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek')), ('slug', wagtail.blocks.CharBlock(help_text='Není třeba vyplňovat, bude automaticky vyplněno', label='Slug skupiny', required=False)), ('person_list', wagtail.blocks.ListBlock(wagtail.blocks.PageChooserBlock(label='Detail osoby', page_type=['main.MainPersonPage']), label='Skupina osob'))], label='Seznam osob'))], blank=True, use_json_field=None, verbose_name='Lidé'),
- ),
- migrations.AddField(
- model_name='mainpersonpage',
- name='profile_image',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image', verbose_name='Profilový obrázek'),
- ),
- migrations.AddField(
- model_name='mainpersonpage',
- name='social_links',
- field=wagtail.fields.StreamField([('social_links', wagtail.blocks.StructBlock([('text', wagtail.blocks.CharBlock(label='Titulkek odkazu (text, který se zobrazí místo dlouhého odkazu)')), ('link', wagtail.blocks.URLBlock(label='Odkaz')), ('icon', wagtail.blocks.CharBlock(help_text='Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons', label='Ikona'))]))], blank=True, use_json_field=None, verbose_name='Odkazy na sociální sítě'),
- ),
- migrations.AlterField(
- model_name='mainhomepage',
- name='social_links',
- field=wagtail.fields.StreamField([('social_links', wagtail.blocks.StructBlock([('text', wagtail.blocks.CharBlock(label='Titulkek odkazu (text, který se zobrazí místo dlouhého odkazu)')), ('link', wagtail.blocks.URLBlock(label='Odkaz')), ('icon', wagtail.blocks.CharBlock(help_text='Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons', label='Ikona'))]))], blank=True, use_json_field=None, verbose_name='Odkazy na sociální sítě v zápatí webu'),
- ),
- migrations.AlterField(
- model_name='mainpeoplepage',
- name='people',
- field=wagtail.fields.StreamField([('people_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek')), ('slug', wagtail.blocks.CharBlock(help_text='Není třeba vyplňovat, bude automaticky vyplněno', label='Slug skupiny', required=False)), ('person_list', wagtail.blocks.ListBlock(wagtail.blocks.PageChooserBlock(label='Detail osoby', page_type=['main.MainPersonPage']), label='Skupina osob'))], label='Seznam osob'))], blank=True, use_json_field=None, verbose_name='Lidé'),
- ),
- ]
diff --git a/main/migrations/0016_remove_mainpersonpage_facebook_and_more.py b/main/migrations/0016_remove_mainpersonpage_facebook_and_more.py
new file mode 100644
index 0000000000000000000000000000000000000000..57ac4e56b40f00d7f13f2d5b1b3c59ebce5c61a0
--- /dev/null
+++ b/main/migrations/0016_remove_mainpersonpage_facebook_and_more.py
@@ -0,0 +1,155 @@
+# Generated by Django 4.0.7 on 2022-08-24 14:12
+
+import django.db.models.deletion
+import wagtail.blocks
+import wagtail.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("wagtailimages", "0024_index_image_file_hash"),
+ ("main", "0015_mainarticlespage_last_import_log"),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name="mainpersonpage",
+ name="facebook",
+ ),
+ migrations.RemoveField(
+ model_name="mainpersonpage",
+ name="instagram",
+ ),
+ migrations.RemoveField(
+ model_name="mainpersonpage",
+ name="twitter",
+ ),
+ migrations.AddField(
+ model_name="mainpersonpage",
+ name="main_image",
+ field=models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.PROTECT,
+ related_name="+",
+ to="wagtailimages.image",
+ verbose_name="Hlavní obrázek",
+ ),
+ ),
+ migrations.AddField(
+ model_name="mainpersonpage",
+ name="people",
+ field=wagtail.fields.StreamField(
+ [
+ (
+ "people_group",
+ wagtail.blocks.StructBlock(
+ [
+ ("title", wagtail.blocks.CharBlock(label="Titulek")),
+ (
+ "slug",
+ wagtail.blocks.CharBlock(
+ help_text="Není třeba vyplňovat, bude automaticky vyplněno",
+ label="Slug skupiny",
+ required=False,
+ ),
+ ),
+ (
+ "person_list",
+ wagtail.blocks.ListBlock(
+ wagtail.blocks.PageChooserBlock(
+ label="Detail osoby",
+ page_type=["main.MainPersonPage"],
+ ),
+ label="Skupina osob",
+ ),
+ ),
+ ],
+ label="Seznam osob",
+ ),
+ )
+ ],
+ blank=True,
+ use_json_field=None,
+ verbose_name="Lidé",
+ ),
+ ),
+ migrations.AddField(
+ model_name="mainpersonpage",
+ name="profile_image",
+ field=models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.PROTECT,
+ related_name="+",
+ to="wagtailimages.image",
+ verbose_name="Profilový obrázek",
+ ),
+ ),
+ migrations.AddField(
+ model_name="mainpersonpage",
+ name="social_links",
+ field=wagtail.fields.StreamField(
+ [
+ (
+ "social_links",
+ wagtail.blocks.StructBlock(
+ [
+ (
+ "text",
+ wagtail.blocks.CharBlock(
+ label="Titulkek odkazu (text, který se zobrazí místo dlouhého odkazu)"
+ ),
+ ),
+ ("link", wagtail.blocks.URLBlock(label="Odkaz")),
+ (
+ "icon",
+ wagtail.blocks.CharBlock(
+ help_text="Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons",
+ label="Ikona",
+ ),
+ ),
+ ]
+ ),
+ )
+ ],
+ blank=True,
+ use_json_field=None,
+ verbose_name="Odkazy na sociální sítě",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="mainhomepage",
+ name="social_links",
+ field=wagtail.fields.StreamField(
+ [
+ (
+ "social_links",
+ wagtail.blocks.StructBlock(
+ [
+ (
+ "text",
+ wagtail.blocks.CharBlock(
+ label="Titulkek odkazu (text, který se zobrazí místo dlouhého odkazu)"
+ ),
+ ),
+ ("link", wagtail.blocks.URLBlock(label="Odkaz")),
+ (
+ "icon",
+ wagtail.blocks.CharBlock(
+ help_text="Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons",
+ label="Ikona",
+ ),
+ ),
+ ]
+ ),
+ )
+ ],
+ blank=True,
+ use_json_field=None,
+ verbose_name="Odkazy na sociální sítě v zápatí webu",
+ ),
+ ),
+ ]
diff --git a/main/migrations/0017_remove_mainarticlespage_timeline.py b/main/migrations/0017_remove_mainarticlespage_timeline.py
new file mode 100644
index 0000000000000000000000000000000000000000..536f73fdc9412a0f9dd90e10b6e38e5dd4459fb9
--- /dev/null
+++ b/main/migrations/0017_remove_mainarticlespage_timeline.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.0.7 on 2022-08-24 14:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("main", "0016_remove_mainpersonpage_facebook_and_more"),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name="mainarticlespage",
+ name="timeline",
+ ),
+ ]
diff --git a/main/models.py b/main/models.py
index f69b6831ad5707e405f7736b194d905f9e148dfb..562b29fc88bfc15289123e7843e135706b404ddd 100644
--- a/main/models.py
+++ b/main/models.py
@@ -195,18 +195,6 @@ class MainArticlesPage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page
):
perex = models.TextField()
- timeline = StreamField( # TODO delete
- [
- (
- "article_list",
- PageChooserBlock(
- page_type="main.MainArticlePage", label="Vybrat aktualitu"
- ),
- )
- ],
- verbose_name="Timeline",
- blank=True,
- )
last_import_log = models.TextField(
"Výstup z posledního importu", null=True, blank=True
)
@@ -238,7 +226,7 @@ class MainArticlesPage(
subpage_types = ["main.MainArticlePage"]
### PANELS
- content_panels = Page.content_panels + [FieldPanel("perex"), FieldPanel("timeline")]
+ content_panels = Page.content_panels + [FieldPanel("perex")]
promote_panels = make_promote_panels()
### EDIT HANDLERS
diff --git a/main/templates/main/includes/layout/photo_page_header.html b/main/templates/main/includes/layout/photo_page_header.html
index e09dd29ed8d61d558aa0a46b10d50f658918e7c8..8fbf7a82c3250de5d0f060d6e7e282c5453ab54e 100644
--- a/main/templates/main/includes/layout/photo_page_header.html
+++ b/main/templates/main/includes/layout/photo_page_header.html
@@ -13,4 +13,4 @@
</h1>
</div>
</div>
-</header>
\ No newline at end of file
+</header>