From 95a8e7e24e570235b5321a25c1d7ab91c9ad92ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexa=20Valentov=C3=A1?= <git@imaniti.org> Date: Tue, 25 Feb 2025 12:44:35 +0100 Subject: [PATCH 1/3] Update wording & add link --- main/models.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/main/models.py b/main/models.py index d23252bb..bbb6f576 100644 --- a/main/models.py +++ b/main/models.py @@ -622,16 +622,18 @@ class MainCareerPage( recipient_email = EmailMessage( # Subject - f"PotvrzenĂ pĹ™ihlášky k pracovnĂ pozici {self.title}", + f"PotvrzenĂ pĹ™ihlášky k vĂ˝bÄ›rovĂ©mu Ĺ™ĂzenĂ {self.title}", # Message f""" DobrĂ˝ den, -potvrzujeme pĹ™ijetĂ Vašà pĹ™ihlášky k pracovnĂ pozici '{self.title}'. +potvrzujeme pĹ™ijetĂ Vašà pĹ™ihlášky k vĂ˝bÄ›rovĂ©mu Ĺ™ĂzenĂ '{self.title}'. Budeme vás co nejdĹ™Ăve kontaktovat s dalšĂmi informacemi. +V pĹ™ĂpadÄ› nejasnostĂ mĹŻĹľete kontaktovat kancelář, kontakty lze nalĂ©zt zde: https://wiki.pirati.cz/kas/start + DÄ›kujeme, -Pirátská Strana +Pirátská strana """, # From email "vyberka@pirati.cz", @@ -641,11 +643,11 @@ Pirátská Strana administrator_email = EmailMessage( # Subject - f"Nová pĹ™ihláška k pracovnĂ pozici {self.title} - {form.cleaned_data['name']} {form.cleaned_data['surname']}", + f"Nová pĹ™ihláška k vĂ˝bÄ›rovĂ©mu Ĺ™ĂzenĂ {self.title} - {form.cleaned_data['name']} {form.cleaned_data['surname']}", # Message ( f""" -K pracovnĂ pozici {self.title} se {current_time} pĹ™ihlásil novĂ˝ zájemce. +K vĂ˝bÄ›rovĂ©mu Ĺ™ĂzenĂ {self.title} se {current_time} pĹ™ihlásil novĂ˝ zájemce. VyplnÄ›nĂ© Ăşdaje: @@ -663,7 +665,7 @@ CV, motivaÄŤnĂ dopis a ostatnĂ soubory jsou v pĹ™Ălohách. Názvy souborĹŻ: OstatnĂ soubory: {other_files_names} -PĹ™i otevĂránĂ souborĹŻ buÄŹte opatrnĂ, virovĂ˝ probÄ›hl, ale nemusĂ bĂ˝t pĹ™esnĂ˝! +PĹ™i otevĂránĂ souborĹŻ buÄŹte opatrnĂ, virovĂ˝ sken probÄ›hl, ale nemusĂ bĂ˝t pĹ™esnĂ˝! """ ), # From email -- GitLab From 5e1c92d011bb4d7a5d403293a4cc468c4e25eda8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexa=20Valentov=C3=A1?= <git@imaniti.org> Date: Tue, 25 Feb 2025 12:53:57 +0100 Subject: [PATCH 2/3] update mobile styling --- .../styleguide2/includes/molecules/menus/carousel.html | 8 +++++++- .../styleguide2/includes/organisms/layout/navbar.html | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/shared/templates/styleguide2/includes/molecules/menus/carousel.html b/shared/templates/styleguide2/includes/molecules/menus/carousel.html index 7f3c27a5..8d1d1a6b 100644 --- a/shared/templates/styleguide2/includes/molecules/menus/carousel.html +++ b/shared/templates/styleguide2/includes/molecules/menus/carousel.html @@ -6,9 +6,15 @@ <{% if self.button_url %}a{% else %}div{% endif %} class=" {% block wrapper_classes %} - block relative xl:h-screen h-[70vh] + block h-[700px] relative {% endblock %} + {% if not page.root_page.has_expanded_navbar %} + xl:h-screen + {% else %} + xl:h-[70vh] + {% endif %} + {% if self.button_url %}group cursor-pointer{% endif %} " diff --git a/shared/templates/styleguide2/includes/organisms/layout/navbar.html b/shared/templates/styleguide2/includes/organisms/layout/navbar.html index 4b544250..7d594d39 100644 --- a/shared/templates/styleguide2/includes/organisms/layout/navbar.html +++ b/shared/templates/styleguide2/includes/organisms/layout/navbar.html @@ -15,7 +15,7 @@ fixed left-0 top-[-1px] z-20 w-full duration-200 navbar {% if is_transparent and page.root_page.has_expanded_navbar %} - xl:sticky + xl:sticky sticky {% else %} xl:absolute {% endif %} -- GitLab From 4c02d50c506d6a143347fc418e9c0f44ee204542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexa=20Valentov=C3=A1?= <git@imaniti.org> Date: Tue, 25 Feb 2025 12:57:14 +0100 Subject: [PATCH 3/3] run hooks --- calendar_utils/icalevents/icalparser.py | 1 + district/blocks.py | 10 ++++++---- .../migrations/0307_alter_districthomepage_content.py | 3 ++- main/blocks.py | 4 ++-- main/migrations/0145_alter_mainhomepage_content.py | 3 ++- main/migrations/0147_alter_mainhomepage_content.py | 3 ++- shared/static/styleguide2/pirati-ui.svg | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/calendar_utils/icalevents/icalparser.py b/calendar_utils/icalevents/icalparser.py index 9854a89d..42e2a268 100644 --- a/calendar_utils/icalevents/icalparser.py +++ b/calendar_utils/icalevents/icalparser.py @@ -2,6 +2,7 @@ Parse iCal data to Events. """ from datetime import date, datetime, timedelta + # for UID generation from random import randint from typing import Optional diff --git a/district/blocks.py b/district/blocks.py index ad6adbab..ba257341 100644 --- a/district/blocks.py +++ b/district/blocks.py @@ -16,8 +16,9 @@ from wagtail.images.blocks import ImageChooserBlock from shared.blocks import CandidateBlock as SharedCandidateBlockMixin from shared.blocks import CandidateListBlock as SharedCandidateListBlockMixin -from shared.blocks import \ - CandidateSecondaryListBlock as SharedCandidateSecondaryListBlockMixin +from shared.blocks import ( + CandidateSecondaryListBlock as SharedCandidateSecondaryListBlockMixin, +) from shared.blocks import ( CardLinkBlockMixin, CardLinkWithHeadlineBlockMixin, @@ -30,8 +31,9 @@ from shared.blocks import ( ProgramGroupBlockMixin, ) from shared.blocks import ProgramGroupBlockPopout as SharedProgramGroupBlockPopout -from shared.blocks import \ - ProgramGroupWithCandidatesBlock as SharedProgramGroupWithCandidatesBlockMixin +from shared.blocks import ( + ProgramGroupWithCandidatesBlock as SharedProgramGroupWithCandidatesBlockMixin, +) from shared.blocks import SecondaryCandidateBlock as SharedSecondaryCandidateBlockMixin from shared.blocks import TeamBlockMixin diff --git a/district/migrations/0307_alter_districthomepage_content.py b/district/migrations/0307_alter_districthomepage_content.py index 2146096b..6564643e 100644 --- a/district/migrations/0307_alter_districthomepage_content.py +++ b/district/migrations/0307_alter_districthomepage_content.py @@ -1,9 +1,10 @@ # Generated by Django 5.0.7 on 2025-02-10 11:09 -import shared.blocks.children.misc import wagtail.fields from django.db import migrations +import shared.blocks.children.misc + class Migration(migrations.Migration): diff --git a/main/blocks.py b/main/blocks.py index 3cb239ad..e7b0ead8 100644 --- a/main/blocks.py +++ b/main/blocks.py @@ -1,5 +1,6 @@ from django.utils.text import slugify from wagtail.blocks import ( + BooleanBlock, CharBlock, ListBlock, PageChooserBlock, @@ -7,7 +8,6 @@ from wagtail.blocks import ( StructBlock, TextBlock, URLBlock, - BooleanBlock ) from wagtail.images.blocks import ImageChooserBlock @@ -92,7 +92,7 @@ class HomePageCarouseSlideBlock(StructBlock): help_text="Odkaz funguje i bez tlaÄŤĂtka. Pokud chceš tlaÄŤĂtko skrĂ˝t, nevyplĹuj text.", required=False, ) - + class Meta: template = "styleguide2/includes/molecules/menus/carousel.html" icon = "form" diff --git a/main/migrations/0145_alter_mainhomepage_content.py b/main/migrations/0145_alter_mainhomepage_content.py index d248c936..adca267d 100644 --- a/main/migrations/0145_alter_mainhomepage_content.py +++ b/main/migrations/0145_alter_mainhomepage_content.py @@ -1,9 +1,10 @@ # Generated by Django 5.0.7 on 2025-02-10 11:09 -import shared.blocks.children.misc import wagtail.fields from django.db import migrations +import shared.blocks.children.misc + class Migration(migrations.Migration): diff --git a/main/migrations/0147_alter_mainhomepage_content.py b/main/migrations/0147_alter_mainhomepage_content.py index a8dec082..7b0da8b3 100644 --- a/main/migrations/0147_alter_mainhomepage_content.py +++ b/main/migrations/0147_alter_mainhomepage_content.py @@ -1,9 +1,10 @@ # Generated by Django 5.0.7 on 2025-02-24 21:14 -import shared.blocks.children.misc import wagtail.fields from django.db import migrations +import shared.blocks.children.misc + class Migration(migrations.Migration): diff --git a/shared/static/styleguide2/pirati-ui.svg b/shared/static/styleguide2/pirati-ui.svg index ffc20ecc..c6e3a71a 100644 --- a/shared/static/styleguide2/pirati-ui.svg +++ b/shared/static/styleguide2/pirati-ui.svg @@ -127,4 +127,4 @@ <glyph unicode="" glyph-name="price-tags" horiz-adv-x="1280" d="M1232 960h-384c-26.4 0-63.274-15.274-81.942-33.942l-476.116-476.116c-18.668-18.668-18.668-49.214 0-67.882l412.118-412.118c18.668-18.668 49.214-18.668 67.882 0l476.118 476.118c18.666 18.666 33.94 55.54 33.94 81.94v384c0 26.4-21.6 48-48 48zM992 576c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM128 416l544 544h-80c-26.4 0-63.274-15.274-81.942-33.942l-476.116-476.116c-18.668-18.668-18.668-49.214 0-67.882l412.118-412.118c18.668-18.668 49.214-18.668 67.882 0l30.058 30.058-416 416z" /> <glyph unicode="" glyph-name="twitter" horiz-adv-x="1001" d="M596.009 526.629l372.819 433.371h-88.346l-323.718-376.29-258.553 376.29h-298.21l390.983-569.018-390.983-454.457h88.351l341.855 397.375 273.051-397.375h298.21l-405.458 590.103zM475 385.969l-354.815 507.521h135.702l624.636-893.48h-135.702l-269.821 385.959z" /> <glyph unicode="" glyph-name="stats-dots" d="M128 64h896v-128h-1024v1024h128zM288 128c-53.020 0-96 42.98-96 96s42.98 96 96 96c2.828 0 5.622-0.148 8.388-0.386l103.192 171.986c-9.84 15.070-15.58 33.062-15.58 52.402 0 53.020 42.98 96 96 96s96-42.98 96-96c0-19.342-5.74-37.332-15.58-52.402l103.192-171.986c2.766 0.238 5.56 0.386 8.388 0.386 2.136 0 4.248-0.094 6.35-0.23l170.356 298.122c-10.536 15.408-16.706 34.036-16.706 54.11 0 53.020 42.98 96 96 96s96-42.98 96-96c0-53.020-42.98-96-96-96-2.14 0-4.248 0.094-6.35 0.232l-170.356-298.124c10.536-15.406 16.706-34.036 16.706-54.11 0-53.020-42.98-96-96-96s-96 42.98-96 96c0 19.34 5.74 37.332 15.578 52.402l-103.19 171.984c-2.766-0.238-5.56-0.386-8.388-0.386s-5.622 0.146-8.388 0.386l-103.192-171.986c9.84-15.068 15.58-33.060 15.58-52.4 0-53.020-42.98-96-96-96z" /> -</font></defs></svg> \ No newline at end of file +</font></defs></svg> -- GitLab