diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE new file mode 100644 index 00000000..4762ecb7 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE @@ -0,0 +1,22 @@ +## 🎯 Objectif + +_Un résumé de l’objectif de la PR_ + +_Précisez si c’est un bugfix, une nouvelle fonctionnalité… Expliquez rapidement le gain "fonctionnel" de vos modifications._ + +## 🔍 Implémentation + +- _Une liste des modifications_ + +## ⚠️ Informations supplémentaires + +_(optionnel) Documentation, commandes à lancer, variables d’environnement, etc._ + +## 🏕 Amélioration continue + +- _(optionnel) Une liste d’autres modifications pas en lien direct avec la PR_ + +## 🖼️ Images + +_(optionnel) Une ou plusieurs captures d’écran, si pertinent_ + diff --git a/config/settings.py b/config/settings.py index 1573550b..603730ee 100644 --- a/config/settings.py +++ b/config/settings.py @@ -92,7 +92,6 @@ "django.template.context_processors.request", "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", - "dsfr.context_processors.site_config", "wagtail.contrib.settings.context_processors.settings", "wagtailmenus.context_processors.wagtailmenus", ], diff --git a/content_manager/templates/content_manager/blocks/card.html b/content_manager/templates/content_manager/blocks/card.html index 5aef36ef..c33bee44 100644 --- a/content_manager/templates/content_manager/blocks/card.html +++ b/content_manager/templates/content_manager/blocks/card.html @@ -11,7 +11,7 @@

{{ block.value.title }} {% if block.value.url or block.value.document.url %}{% endif %}

-

{{ block.value.text|linebreaksbr }}

+

{{ block.value.description|linebreaksbr }}

diff --git a/content_manager/templates/content_manager/content_page.html b/content_manager/templates/content_manager/content_page.html index 8765f712..59ccf983 100644 --- a/content_manager/templates/content_manager/content_page.html +++ b/content_manager/templates/content_manager/content_page.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% load static dsfr_tags wagtailcore_tags wagtailimages_tags %} {% block title %} - {{ page.seo_title|default:page.title }} — {{ SITE_CONFIG.site_title }} + {{ page.seo_title|default:page.title }} — {{ settings.content_manager.CmsDsfrConfig.site_title }} {% endblock title %} {% if page.search_description %} {% block description %} diff --git a/templates/base.html b/templates/base.html index c40d1165..632a0f15 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,7 +11,7 @@ {% dsfr_favicon %} {% block extra_css %}{% endblock extra_css %} - {% block title %}{% if title %}{{ title }} — {{ SITE_CONFIG.site_title }}{% else %}{{ SITE_CONFIG.site_title }}{% endif %}{% endblock title %} + {% block title %}{% if title %}{{ title }} — {{ settings.content_manager.CmsDsfrConfig.site_title }}{% else %}{{ settings.content_manager.CmsDsfrConfig.site_title }}{% endif %}{% endblock title %} {% block tracking %} {% if settings.content_manager.AnalyticsSettings.head_scripts %} {{settings.content_manager.AnalyticsSettings.head_scripts|safe}}