implement new changes

main/blocks.py

@@ -63,7 +63,12 @@ class CTAMixin(StructBlock):
     class Meta:
         icon = "doc-empty"
         label = "Výzva s odkazem"
-        template = "main/blocks/article_quote_block.html"
+
+
+class NavbarMenuItemBlock(CTAMixin):
+    class Meta:
+        label = "Tlačítko"
+        template = "main/includes/molecules/navbar/additional_button.html"
 
 
 class ProgramGroupBlockMixin(StructBlock):

main/migrations/0094_remove_mainhomepage_contact_newcomers_link_and_more.py

+# Generated by Django 4.1.10 on 2023-12-21 13:29
+
+from django.db import migrations, models
+import wagtail.blocks
+import wagtail.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0093_mainarticlespage_perex'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='mainhomepage',
+            name='contact_newcomers_link',
+        ),
+        migrations.RemoveField(
+            model_name='mainhomepage',
+            name='contact_newcomers_text',
+        ),
+        migrations.RemoveField(
+            model_name='mainhomepage',
+            name='donation_page_link',
+        ),
+        migrations.RemoveField(
+            model_name='mainhomepage',
+            name='donation_page_text',
+        ),
+        migrations.AddField(
+            model_name='mainhomepage',
+            name='menu_button_content',
+            field=wagtail.fields.StreamField([('navbar_menu_item', wagtail.blocks.StructBlock([('button_link', wagtail.blocks.URLBlock(label='Odkaz tlačítka')), ('button_text', wagtail.blocks.CharBlock(label='Text tlačítka'))]))], blank=True, use_json_field=True, verbose_name='Obsah menu pro zapojení se'),
+        ),
+        migrations.AddField(
+            model_name='mainhomepage',
+            name='menu_button_name',
+            field=models.CharField(default='Zapojte se', max_length=16, verbose_name='Text na tlačítku pro zapojení'),
+            preserve_default=False,
+        ),
+    ]

main/models.py

@@ -5,6 +5,7 @@ from django.conf import settings
 from django.contrib import messages
 from django.core.paginator import Paginator
 from django.db import models
+from django.forms.models import model_to_dict
 from django.http import HttpResponseRedirect, JsonResponse
 from django.shortcuts import render
 from django.utils import timezone
@@ -56,30 +57,18 @@ class MainHomePage(
 ):
     # header
 
-    contact_newcomers_link = models.URLField(
-        "URL pro zájemce o členství",
-        blank=True,
-        null=True,
-        default="https://nalodeni.pirati.cz",
-    )
-    contact_newcomers_text = models.TextField(
-        "Text na tlačítku pro zájemce o členství",
-        blank=True,
-        null=True,
-        default="Nalodit se",
+    menu_button_name = models.CharField(
+        verbose_name="Text na tlačítku pro zapojení",
+        max_length=16
     )
 
-    donation_page_link = models.URLField(
-        "URL pro příjem darů (tlačítko Dary)",
-        blank=True,
-        null=True,
-        default="https://dary.pirati.cz",
-    )
-    donation_page_text = models.TextField(
-        "Text na tlačítku pro příjem darů",
+    menu_button_content = StreamField(
+        [
+            ("navbar_menu_item", blocks.NavbarMenuItemBlock()),
+        ],
+        verbose_name="Obsah menu pro zapojení se",
         blank=True,
-        null=True,
-        default="Darovat",
+        use_json_field=True,
     )
 
     # content
@@ -146,11 +135,9 @@ class MainHomePage(
     promote_panels = make_promote_panels(admin_help.build(admin_help.IMPORTANT_TITLE))
 
     settings_panels = [
-        FieldPanel("contact_newcomers_link"),
-        FieldPanel("contact_newcomers_text"),
+        FieldPanel("menu_button_name"),
+        FieldPanel("menu_button_content"),
         PageChooserPanel("gdpr_and_cookies_page"),
-        FieldPanel("donation_page_link"),
-        FieldPanel("donation_page_text"),
         FieldPanel("social_links"),
         FieldPanel("matomo_id"),
     ]
@@ -714,6 +701,10 @@ class MainPeoplePage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin,
 
     ### OTHERS
 
+    @property
+    def perex(self) -> str:
+        return self.perex_col_1 + self.perex_col_2
+
     class Meta:
         verbose_name = "Lidé a týmy"
 

main/templates/main/includes/molecules/blocks/icon_title_text_block.html

@@ -14,7 +14,7 @@
         src="{{ icon.url }}"
         class="
           hidden inline-block mr-6
-          lg:shown
+          lg:block
           xl:justify-self-end
         "
       >

main/templates/main/includes/molecules/navbar/additional_button.html

+<a
+  class="
+    btn__body-wrap hover:no-underline
+
+    hidden lg:inline
+  "
+  href="{{ self.button_link }}"
+>
+  <div
+    class="
+      btn__body border-none border-4 w-24 h-11 py-4 px-6
+
+      bg-pirati-yellow text-black hover:bg-yellow-600
+
+      xl:w-auto
+    "
+  >{{ self.button_text }}</div>
+</a>
+
+
+<a
+  href="{{ self.button_link }}"
+  class="
+    btn btn--to-yellow--600 group btn--hoveractive uppercase
+
+    lg:hidden inline
+  "
+>
+  <div class="btn__body-wrap">
+    <div class="btn__body px-0 group group-hover:border-yellow-600 border-yellow-500 text-black border-4 bg-transparent w-48 h-11 xl:w-auto py-8">
+      {{ self.button_text }}
+    </div>
+  </div>
+</a>

main/templates/main/includes/molecules/navbar/additional_button.yaml

+context:
+  button:
+    name: 'Text'
+    url: '#'

main/templates/main/includes/organisms/articles/articles_section.html

-{% load wagtailcore_tags wagtailimages_tags %}
+{% load wagtailcore_tags wagtailimages_tags perex %}
 
 <div class="bg-black text-white">
   <div class="container--medium __js-root">
@@ -27,7 +27,7 @@
       {% for article in article_data_list %}
         {% image article.image fill-500x500 as article_image %}
 
-        {% include 'main/includes/molecules/boxes/card_box.html' with url=article.url image=article_image date=article.date header=article.title content=article.perex %}
+        {% include 'main/includes/molecules/boxes/card_box.html' with url=article.url image=article_image date=article.date header=article.title content=article.perex|shorten_perex %}
       {% endfor %}
     </ui-horizontal-scrollable>
 

main/templates/main/includes/organisms/layout/navbar.html

-{% load static %}
+{% load static wagtailcore_tags %}
 
 <!-- Navbar -->
 <nav
   class="
     static absolute left-0 top-0 z-20 w-full duration-200 navbar
 
-    2xl:bg-transparent
+    xl:bg-transparent
 
     {% if is_transparent %}navbar--transparent{% endif %}
     {% if is_on_dark_background %}navbar--on-dark-bg{% endif %}
@@ -13,7 +13,7 @@
 >
   <div class="container--wide py-3 xl:py-6 flex justify-between items-center">
 
-    <div class="flex items-center 2xl:items-start">
+    <div class="flex items-center xl:items-start">
       <!-- BEGIN Logo-->
       <a href="{{ page.root_page.url }}" class="z-20">
         <img class="navbar__logo--white w-[150px] lg:w-[unset]" src="{% static 'main/images/logo-full-white.svg' %}" alt="">
@@ -22,7 +22,7 @@
       <!-- END Logo -->
     </div>
 
-    <div class="flex-col gap-3 2xl:flex hidden">
+    <div class="flex-col gap-3 xl:flex hidden">
 
       <!-- BEGIN Social media-->
       <div class="flex gap-7 justify-end items-center">
@@ -83,26 +83,36 @@
           >{{ menu_item.value.title }}</a>
         {% endfor %}
 
-        {% if page.root_page.contact_newcomers_link and page.root_page.contact_newcomers_text %}
-          <a
-            href="{{ page.root_page.contact_newcomers_link }}"
-            class="btn btn--yellow-500 btn--to-yellow-600 btn--hoveractive xl:w-auto uppercase"
+        {% if page.root_page.menu_button_name and page.root_page.menu_button_content %}
+          {% block navbar_menu_button %}
+            <div
+              class="group btn btn--hoveractive uppercase cursor-pointer relative"
             >
-            <div class="btn__body-wrap w-42 h-11">
-              <div class="btn__body w-42 h-11 xl:w-auto py-4 px-6">{{ page.root_page.contact_newcomers_text }}</div>
+              <div class="btn__body-wrap w-24 h-11 min-w-[9rem]">
+                <div
+                  class="
+                    navbar__border-button btn__body border-none border-4 w-24 h-11 py-4 px-6
+
+                    bg-pirati-yellow !text-black hover:bg-yellow-600
+
+                    xl:w-auto
+                  "
+                >{{ page.root_page.menu_button_name }}</div>
               </div>
-          </a>
-        {% endif %}
 
-        {% if page.root_page.donation_page_link and page.root_page.donation_page_text %}
-          <a
-            href="{{ page.root_page.donation_page_link }}"
-            class="btn btn--to-yellow--600 group btn--hoveractive uppercase"
+              <div
+                class="
+                  absolute w-full top-[2.75rem] left-0 opacity-0 duration-150 pointer-events-none
+
+                  group group-hover:opacity-100 group-hover:pointer-events-auto
+                "
               >
-            <div class="btn__body-wrap w-24 h-11 min-w-[7rem]">
-              <div class="navbar__border-button btn__body group group-hover:border-yellow-600 border-yellow-500 border-4 bg-transparent w-24 h-11 xl:w-auto py-4 px-6">{{ page.root_page.donation_page_text }}</div>
+                {% for button in page.root_page.menu_button_content %}
+                  {% include_block button %}
+                {% endfor %}
               </div>
-          </a>
+            </div>
+          {% endblock %}
         {% endif %}
       </div>
       <!-- END Menu -->
@@ -112,7 +122,7 @@
     <!-- Hamburger Icon -->
     <input class="hidden navbar__mobile-menu__toggle" type="checkbox" id="navbar__mobile-menu__toggle">
 
-    <label class="z-30 hamb text-black 2xl:hidden" for="navbar__mobile-menu__toggle">
+    <label class="z-30 hamb text-black xl:hidden" for="navbar__mobile-menu__toggle">
       <span>
         <span class="bar1"></span>
         <span class="bar2"></span>
@@ -176,27 +186,9 @@
 
         <div class="flex flex-col gap-12 md:justify-between xl:mr-16">
           <div class="flex flex-col gap-4 items-start md:items-end">
-            {% if page.root_page.contact_newcomers_link and page.root_page.contact_newcomers_text %}
-              <a
-                href="{{ page.root_page.contact_newcomers_link }}"
-                class="btn btn--yellow-500 btn--to-yellow-600 btn--hoveractive xl:w-auto uppercase"
-              >
-                <div class="btn__body-wrap w-42">
-                  <div class="btn__body w-42 h-11 xl:w-auto py-8 px-6">{{ page.root_page.contact_newcomers_text }}</div>
-                </div>
-              </a>
-            {% endif %}
-
-            {% if page.root_page.donation_page_link and page.root_page.donation_page_text %}
-              <a
-                href="{{ page.root_page.donation_page_link }}"
-                class="btn btn--to-yellow--600 group btn--hoveractive uppercase"
-              >
-                <div class="btn__body-wrap min-w-[7rem]">
-                  <div class="btn__body group group-hover:border-yellow-600 border-yellow-500 text-black border-4 bg-transparent w-36 h-11 xl:w-auto py-8">{{ page.root_page.donation_page_text }}</div>
-                </div>
-              </a>
-            {% endif %}
+            {% for button in page.root_page.menu_button_content %}
+              {% include_block button %}
+            {% endfor %}
           </div>
 
           <div class="flex gap-5 text-lg md:justify-end">

main/templates/main/main_person_page.html

 {% extends "main/base.html" %}
-{% load wagtailcore_tags wagtailimages_tags shared_filters %}
+{% load wagtailcore_tags wagtailimages_tags shared_filters perex %}
 
 {% block content %}
   {% include 'main/includes/organisms/layout/navbar.html' with selected_item='Kdo jsme' is_transparent=True is_on_dark_background=True %}
@@ -99,7 +99,7 @@
 
                 {% image related_article.image fill-500x500 as article_image %}
 
-                {% include 'main/includes/molecules/boxes/card_box.html' with url=related_article.url image=article_image header=related_article.title description_classes='!bg-grey-180' date=related_article.date %}
+                {% include 'main/includes/molecules/boxes/card_box.html' with url=related_article.url image=article_image header=related_article.title content=related_article.perex|shorten_perex description_classes='!bg-grey-180' date=related_article.date %}
               {% endfor %}
             </div>
           </div>

main/templates/main/main_program_page.html

@@ -17,7 +17,7 @@
           {% for program in page.program %}
             <template v-if="isCurrentView('view{{ forloop.counter }}')">
               {% if program.block_type == "program_group" %}
-                <div class="mx-auto">
+                <div>
                   {% if program.value.perex %}
                     <div class="mb-12">
                       <div class="prose">

main/templatetags/perex.py

+from django.template import Library
+
+register = Library()
+
+
+@register.filter
+def shorten_perex(perex) -> str:
+    if len(perex) > 245:
+        return perex[:245] + "..."
+
+    return perex