Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bloc "menu latéral" #195

Merged
merged 6 commits into from
Aug 26, 2024
Merged

Bloc "menu latéral" #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e968e6
First version of the sidemenu block
Ash-Crow Jul 25, 2024
3d1d755
add block id
Ash-Crow Jul 25, 2024
d11c898
add page slug in the id for other side menus
Ash-Crow Jul 25, 2024
cd9eac6
Start work on pagetreeblock
Ash-Crow Aug 20, 2024
cad2aa3
Add page tree
Ash-Crow Aug 26, 2024
c5242e1
Better translation
Ash-Crow Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,515 changes: 2,515 additions & 0 deletions blog/migrations/0031_alter_blogentrypage_body_alter_blogindexpage_body.py
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions blog/templates/blog/blog_index_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ <h1>
<div class="fr-sidemenu__inner">
<button class="fr-sidemenu__btn"
hidden
aria-controls="fr-sidemenu-wrapper"
aria-controls="fr-sidemenu-wrapper-{{ page.slug }}"
aria-expanded="false">{% translate "Filters" %}</button>
<div class="fr-collapse" id="fr-sidemenu-wrapper">
<div class="fr-collapse" id="fr-sidemenu-wrapper-{{ page.slug }}">
<div class="fr-sidemenu__title" id="fr-sidemenu-title">{% translate "Filters" %}</div>
{% if categories and page.filter_by_category %}
<div class="fr-my-3w">
Expand Down
41 changes: 41 additions & 0 deletions content_manager/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,41 @@ class Meta:
template = "content_manager/blocks/full_width_background.html"


class PageTreeBlock(blocks.StructBlock):
page = blocks.PageChooserBlock(label=_("Parent page"))

class Meta:
icon = "minus"
template = "content_manager/blocks/pagetree.html"


class SideMenuBlock(blocks.StreamBlock):
html = blocks.RawHTMLBlock(
label="HTML",
help_text=_("Warning: Use HTML block with caution. Malicious code can compromise the security of the site."),
)
pagetree = PageTreeBlock(label=_("Page tree"))

class Meta:
icon = "minus"


class FullWidthBackgroundWithSidemenuBlock(blocks.StructBlock):
bg_image = ImageChooserBlock(label=_("Background image"), required=False)
bg_color_class = BackgroundColorChoiceBlock(
label=_("Background color"),
required=False,
help_text=_("Uses the French Design System colors"),
)
main_content = FullWidthBlock(label=_("Main content"))
sidemenu_title = blocks.CharBlock(label=_("Side menu title"), required=False)
sidemenu_content = SideMenuBlock(label=_("Side menu content"))

class Meta:
icon = "minus"
template = "content_manager/blocks/full_width_background_with_sidemenu.html"


STREAMFIELD_COMMON_BLOCKS = [
("paragraph", blocks.RichTextBlock(label=_("Rich text"))),
("image", ImageBlock()),
Expand All @@ -966,6 +1001,12 @@ class Meta:
("separator", SeparatorBlock(label=_("Separator"), group=_("Page structure"))),
("multicolumns", MultiColumnsWithTitleBlock(label=_("Multiple columns"), group=_("Page structure"))),
("fullwidthbackground", FullWidthBackgroundBlock(label=_("Full width background"), group=_("Page structure"))),
(
"fullwidthbackgroundwithsidemenu",
FullWidthBackgroundWithSidemenuBlock(
label=_("Full width background with side menu"), group=_("Page structure")
),
),
(
"subpageslist",
blocks.StaticBlock(
Expand Down
Binary file modified content_manager/locale/fr/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
122 changes: 76 additions & 46 deletions content_manager/locale/fr/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-23 16:16+0200\n"
"PO-Revision-Date: 2024-08-23 16:17+0200\n"
"POT-Creation-Date: 2024-08-26 15:14+0200\n"
"PO-Revision-Date: 2024-08-26 15:38+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fr\n"
Expand All @@ -27,12 +27,12 @@ msgid "Header image"
msgstr "Image d’en-tête"

#: content_manager/abstract.py:37 content_manager/blocks.py:897
#: content_manager/blocks.py:936
#: content_manager/blocks.py:936 content_manager/blocks.py:969
msgid "Background color"
msgstr "Couleur de fond"

#: content_manager/abstract.py:41 content_manager/blocks.py:899
#: content_manager/blocks.py:938
#: content_manager/blocks.py:938 content_manager/blocks.py:971
msgid "Uses the French Design System colors"
msgstr "Utilise les couleurs du système de design de l'État"

Expand Down Expand Up @@ -439,7 +439,7 @@ msgid "Image width"
msgstr "Largeur de l’image"

#: content_manager/blocks.py:523 content_manager/blocks.py:631
#: content_manager/blocks.py:841 content_manager/blocks.py:948
#: content_manager/blocks.py:841 content_manager/blocks.py:983
msgid "Rich text"
msgstr "Texte avec mise en forme"

Expand Down Expand Up @@ -472,7 +472,7 @@ msgid "Caption"
msgstr "Légende"

#: content_manager/blocks.py:595 content_manager/blocks.py:847
#: content_manager/blocks.py:954
#: content_manager/blocks.py:989
msgid "Quote"
msgstr "Citation"

Expand Down Expand Up @@ -544,7 +544,7 @@ msgid "Video ratio"
msgstr "Ratio de la vidéo"

#: content_manager/blocks.py:698 content_manager/blocks.py:844
#: content_manager/blocks.py:956
#: content_manager/blocks.py:991
msgid "Transcription"
msgstr "Transcription"

Expand Down Expand Up @@ -598,56 +598,56 @@ msgstr "Afficher les filtres"
msgid "Event calendar"
msgstr "Agenda"

#: content_manager/blocks.py:843 content_manager/blocks.py:955
#: content_manager/blocks.py:843 content_manager/blocks.py:990
msgid "Video"
msgstr "Vidéo"

#: content_manager/blocks.py:845 content_manager/blocks.py:952
#: content_manager/blocks.py:845 content_manager/blocks.py:987
msgid "Callout"
msgstr "Mise en avant"

#: content_manager/blocks.py:845 content_manager/blocks.py:846
#: content_manager/blocks.py:847 content_manager/blocks.py:850
#: content_manager/blocks.py:851 content_manager/blocks.py:862
#: content_manager/blocks.py:887 content_manager/blocks.py:927
#: content_manager/blocks.py:952 content_manager/blocks.py:953
#: content_manager/blocks.py:954 content_manager/blocks.py:960
#: content_manager/blocks.py:961 content_manager/blocks.py:962
#: content_manager/blocks.py:963
#: content_manager/blocks.py:987 content_manager/blocks.py:988
#: content_manager/blocks.py:989 content_manager/blocks.py:995
#: content_manager/blocks.py:996 content_manager/blocks.py:997
#: content_manager/blocks.py:998
msgid "DSFR components"
msgstr "Composants du DSFR"

#: content_manager/blocks.py:846 content_manager/blocks.py:953
#: content_manager/blocks.py:846 content_manager/blocks.py:988
msgid "Highlight"
msgstr "Mise en exergue"

#: content_manager/blocks.py:848
msgid "Text and call to action"
msgstr "Texte et appel à action"

#: content_manager/blocks.py:849 content_manager/blocks.py:959
#: content_manager/blocks.py:849 content_manager/blocks.py:994
msgid "Single link"
msgstr "Lien isolé"

#: content_manager/blocks.py:850 content_manager/blocks.py:965
#: content_manager/blocks.py:850 content_manager/blocks.py:1000
msgid "Iframe"
msgstr "Iframe"

#: content_manager/blocks.py:851 content_manager/blocks.py:961
#: content_manager/blocks.py:851 content_manager/blocks.py:996
msgid "Tile"
msgstr "Tuile"

#: content_manager/blocks.py:852 content_manager/blocks.py:980
#: content_manager/blocks.py:852 content_manager/blocks.py:1021
msgid "Blog recent entries"
msgstr "Articles récents du blog"

#: content_manager/blocks.py:852 content_manager/blocks.py:854
#: content_manager/blocks.py:975 content_manager/blocks.py:980
#: content_manager/blocks.py:984
#: content_manager/blocks.py:1016 content_manager/blocks.py:1021
#: content_manager/blocks.py:1025
msgid "Website structure"
msgstr "Structure du site"

#: content_manager/blocks.py:854 content_manager/blocks.py:984
#: content_manager/blocks.py:854 content_manager/blocks.py:1025
msgid "Event calendar recent entries"
msgstr "Articles récents de l’agenda"

Expand All @@ -671,12 +671,14 @@ msgstr "Contenu de la colonnne"
msgid "Adjustable column"
msgstr "Colonne ajustable"

#: content_manager/blocks.py:888 content_manager/blocks.py:966
#: content_manager/blocks.py:967 content_manager/blocks.py:968
#: content_manager/blocks.py:888 content_manager/blocks.py:1001
#: content_manager/blocks.py:1002 content_manager/blocks.py:1003
#: content_manager/blocks.py:1007
msgid "Page structure"
msgstr "Structure de la page"

#: content_manager/blocks.py:895 content_manager/blocks.py:934
#: content_manager/blocks.py:967
msgid "Background image"
msgstr "Image de fond"

Expand All @@ -700,72 +702,96 @@ msgstr "Format de couleur incorrect, doit être #fff ou #f5f5f5"
msgid "Columns"
msgstr "Colonnes"

#: content_manager/blocks.py:926 content_manager/blocks.py:950
#: content_manager/blocks.py:926 content_manager/blocks.py:985
msgid "Image and text"
msgstr "Image et texte"

#: content_manager/blocks.py:927 content_manager/blocks.py:960
#: content_manager/blocks.py:927 content_manager/blocks.py:995
msgid "Horizontal card"
msgstr "Carte horizontale"

#: content_manager/blocks.py:951
#: content_manager/blocks.py:948
msgid "Parent page"
msgstr "Page parente"

#: content_manager/blocks.py:958 content_manager/blocks.py:1038
msgid ""
"Warning: Use HTML block with caution. Malicious code can compromise the "
"security of the site."
msgstr ""
"Avertissement : Utilisez le bloc HTML avec précaution. Un code malveillant "
"peut compromettre la sécurité du site."

#: content_manager/blocks.py:960
msgid "Page tree"
msgstr "Arborescence de pages"

#: content_manager/blocks.py:973
msgid "Main content"
msgstr "Contenu principal"

#: content_manager/blocks.py:974
msgid "Side menu title"
msgstr "Titre du menu latéral"

#: content_manager/blocks.py:975
msgid "Side menu content"
msgstr "Contenu du menu latéral"

#: content_manager/blocks.py:986
msgid "Alert message"
msgstr "Message d’alerte"

#: content_manager/blocks.py:957
#: content_manager/blocks.py:992
msgid "Badge list"
msgstr "Liste de badges"

#: content_manager/blocks.py:958
#: content_manager/blocks.py:993
msgid "Tag list"
msgstr "Liste de tags"

#: content_manager/blocks.py:962
#: content_manager/blocks.py:997
msgid "Accordions"
msgstr "Accordéons"

#: content_manager/blocks.py:963
#: content_manager/blocks.py:998
msgid "Stepper"
msgstr "Étapier"

#: content_manager/blocks.py:964
#: content_manager/blocks.py:999
msgid "Markdown"
msgstr "Markdown"

#: content_manager/blocks.py:964 content_manager/blocks.py:965
#: content_manager/blocks.py:999
#: content_manager/blocks.py:999 content_manager/blocks.py:1000
#: content_manager/blocks.py:1040
msgid "Expert syntax"
msgstr "Syntaxe experte"

#: content_manager/blocks.py:966
#: content_manager/blocks.py:1001
msgid "Separator"
msgstr "Séparateur"

#: content_manager/blocks.py:967
#: content_manager/blocks.py:1002
msgid "Multiple columns"
msgstr "Multi-colonnes"

#: content_manager/blocks.py:968
#: content_manager/blocks.py:1003
msgid "Full width background"
msgstr "Fond pleine largeur"

#: content_manager/blocks.py:972
#: content_manager/blocks.py:1007
msgid "Full width background with side menu"
msgstr "Fond pleine largeur avec menu latéral"

#: content_manager/blocks.py:1013
msgid "Subpages list"
msgstr "Liste des sous-pages"

#: content_manager/blocks.py:973
#: content_manager/blocks.py:1014
msgid "A simple, alphabetical list of the subpages of the current page."
msgstr ""
"Une liste alphabétique toute simple des sous-pages de la page actuelle."

#: content_manager/blocks.py:997
msgid ""
"Warning: Use HTML block with caution. Malicious code can compromise the "
"security of the site."
msgstr ""
"Avertissement : Utilisez le bloc HTML avec précaution. Un code malveillant "
"peut compromettre la sécurité du site."

#: content_manager/constants.py:4
msgid "Primary"
msgstr "Primaire"
Expand Down Expand Up @@ -1105,6 +1131,10 @@ msgstr "Taille de fichier inconnue"
msgid "See all events"
msgstr "Voir tous les événements"

#: content_manager/templates/content_manager/blocks/full_width_background_with_sidemenu.html:16
msgid "In this section"
msgstr "Dans cette rubrique"

#: content_manager/templates/content_manager/blocks/image.html:13
msgid "Go to page"
msgstr "Aller à la page"
Expand Down
Loading
Loading