I think I corrected a regression

chris2fr · Nov 10, 2024 · 5ba4a1e · 5ba4a1e
1 parent 9c55a87
commit 5ba4a1e
Show file tree

Hide file tree

Showing 78 changed files with 1,719 additions and 1,719 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/sites_faciles/context_processors.py b/sites_faciles/context_processors.py
@@ -26,7 +26,7 @@ def skiplinks(request) -> dict:
     return {
         "skiplinks": [
             {"link": "#content", "label": "Contenu"},
-            {"link": "#village-navigation", "label": "Menu"},
+            {"link": "#design-system-navigation", "label": "Menu"},
         ]
     }
 
@@ -65,14 +65,14 @@ def sitevars(request):
     return {
         "langcode": settings.language,
         "home_url": "/{}/".format(settings.language),
-        "data_sites_faciles_mourning": "data-village-mourning" if settings.mourning else "",
+        "data_sites_faciles_mourning": "data-design-system-mourning" if settings.mourning else "",
         "full_site_title": settings.site_title,
     }
     #
     # context["langcode"] = settings.language
     # context["data_sites_faciles_mourning"] = ""
     # if settings.mourning:
-    #     context["data_sites_faciles_mourning"] = "data-village-mourning"
+    #     context["data_sites_faciles_mourning"] = "data-design-system-mourning"
     # context["full_title"] = settings.site_title
     # if context["page"].title:
     #     context["full_title"] = context["page"].title + " - " + context["full_title"]

diff --git a/sites_faciles/sites_faciles_forms/models.py b/sites_faciles/sites_faciles_forms/models.py
@@ -104,8 +104,8 @@ class FormPage(EmailFormMixin, FormMixin, ContentPage):
             [
                 FieldRowPanel(
                     [
-                        FieldPanel("from_address", classname="village-input"),
-                        FieldPanel("to_address", classname="village-input"),
+                        FieldPanel("from_address", classname="design-system-input"),
+                        FieldPanel("to_address", classname="design-system-input"),
                     ]
                 ),
                 FieldPanel("subject"),

diff --git a/sites_faciles/sites_faciles_page/models.py b/sites_faciles/sites_faciles_page/models.py
@@ -262,7 +262,7 @@ def get_context(self, request, *args, **kwargs):
         # context["langcode"] = settings.language
         # context["data_sites_faciles_mourning"] = ""
         # if settings.mourning:
-        #     context["data_sites_faciles_mourning"] = "data-village-mourning"
+        #     context["data_sites_faciles_mourning"] = "data-design-system-mourning"
         # context["full_title"] = settings.site_title
         if context["page"].title:
             context["full_title"] = context["page"].title + " - "  # + context["full_site_title"]

diff --git a/sites_faciles/static/sites-faciles/css/icon-picker.css b/sites_faciles/static/sites-faciles/css/icon-picker.css
@@ -1,7 +1,7 @@
-[class*=" village-icon-"]::after,
-[class*=" village-icon-"]::before,
-[class^="village-icon-"]::after,
-[class^="village-icon-"]::before {
+[class*=" design-system-icon-"]::after,
+[class*=" design-system-icon-"]::before,
+[class^="design-system-icon-"]::after,
+[class^="design-system-icon-"]::before {
     --icon-size: 1.5rem;
     background-color: currentColor;
     display: inline-block;
@@ -13,7 +13,7 @@
     width: var(--icon-size);
 }
 
-[class*=" village-icon-"]::before,
-[class^="village-icon-"]::before {
+[class*=" design-system-icon-"]::before,
+[class^="design-system-icon-"]::before {
     content: "";
 }
diff --git a/sites_faciles/static/sites-faciles/css/style.css b/sites_faciles/static/sites-faciles/css/style.css
@@ -1,55 +1,55 @@
-/* Prefix the classes defined here with wagtailvillage- */
-.wagtailvillage-hero {
+/* Prefix the classes defined here with design-system- */
+.design-system-hero {
   background-size: cover;
   background-position: center;
   background-repeat: no-repeat;
 }
 
-.wagtailvillage-hero h1,
-.wagtailvillage-hero h2,
-.wagtailvillage-hero h3,
-.wagtailvillage-hero p  {
+.design-system-hero h1,
+.design-system-hero h2,
+.design-system-hero h3,
+.design-system-hero p  {
   color: white;
 }
 
-.wagtailvillage-hero a.village-btn--secondary {
-  /* color: var(--village-primary-850-200); */
-  border-color: var(--village-primary-sun-625);
+.design-system-hero a.design-system-btn--secondary {
+  /* color: var(--design-system-primary-850-200); */
+  border-color: var(--design-system-primary-sun-625);
   background-color: white;
   color: black;
 }
 
-.wagtailvillage-hero a.village-btn--secondary:hover {
+.design-system-hero a.design-system-btn--secondary:hover {
   color: unset;
   border-color: unset;
 }
 
-header.village-header {
+header.design-system-header {
   justify-content: space-between;
 }
 
-.wagtailvillage-hero-large {
+.design-system-hero-large {
   display: flex;
   justify-content: center;
   align-items: center;
   text-align: center;
 }
 
-.wagtailvillage-background-dark h1,
-.wagtailvillage-background-dark p {
+.design-system-background-dark h1,
+.design-system-background-dark p {
   color: white;
 }
 
-.village-header__service-title em {
+.design-system-header__service-title em {
   font-weight: lighter;
 }
 
-.wagtailvillage-author_card__header {
+.design-system-author_card__header {
   flex: 0 0 6rem !important;
   width: 6rem !important;
 }
 
-.wagtailvillage-author-img {
+.design-system-author-img {
   border-radius: 50%;
   height: 4.5rem !important;
   margin: 1.5rem;
@@ -67,24 +67,24 @@ h1, h2, h3, h4, h5, h6 {
   font-weight: unset;
 }
 
-.village-logo:after {
+.design-system-logo:after {
   background-image: unset;
 }
 
-.village-logo:before {
+.design-system-logo:before {
   background-image: unset;
 }
 
-div.village-footer__brand {
+div.design-system-footer__brand {
   column-gap: 1rem;
 }
 
-ul.village-nav__list {
+ul.design-system-nav__list {
   padding-left: 1rem;
   padding-right: 1rem;
 }
 
-.village-nav__list  > * > .village-nav__link {
+.design-system-nav__list  > * > .design-system-nav__link {
   align-content: center;
 }
 
@@ -100,9 +100,9 @@ ul.village-nav__list {
   fill: var(--text-default-grey);
 }
 /* 
---background-action-high-village-primary-hover
---background-action-high-village-primary-active
---background-action-high-village-primary */
+--background-action-high-design-system-primary-hover
+--background-action-high-design-system-primary-active
+--background-action-high-design-system-primary */
 
 /* For Astro Homepage */
 
@@ -120,24 +120,24 @@ main.lesgrandsvoisins-home h1.title p {
   line-height: revert;
 }
 @media (min-width: 62em) {
-  header.lesgrandsvoisins-home div.village-header__body{
+  header.lesgrandsvoisins-home div.design-system-header__body{
     display: none;
   }
 }
 
 @media (max-width: 62em) {
-  header.lesgrandsvoisins-home button.village-btn--search {
+  header.lesgrandsvoisins-home button.design-system-btn--search {
     display: none;
   }
 }
 
-/* header.lesgrandsvoisins-home button.village-btn--display {
+/* header.lesgrandsvoisins-home button.design-system-btn--display {
   display: none;
 } */
 
 
 
-/* header.lesgrandsvoisins-home div.village-header__tools {
+/* header.lesgrandsvoisins-home div.design-system-header__tools {
   display: none;
 } */
 
@@ -153,19 +153,19 @@ main.lesgrandsvoisins-home h1.title p {
   pointer-events: none;
 } */
 
-.village-header .village-header__menu .village-container {
+.design-system-header .design-system-header__menu .design-system-container {
   column-gap: 1rem;
   height: auto;
 }
 
-.village-header__service {
+.design-system-header__service {
   display: none;
 }
 
 body {
   color: var(--text-title-grey);
 }
 
-#village-menu-close-btn {
+#design-system-menu-close-btn {
   height: fit-content;
 }
diff --git a/sites_faciles/static/sites-faciles/css/style2.sass b/sites_faciles/static/sites-faciles/css/style2.sass
@@ -1,28 +1,28 @@
-/* Prefix the classes defined here with wagtailvillage- */
+/* Prefix the classes defined here with design-system- */
 
-.wagtailvillage-hero
+.design-system-hero
     background-size: cover
     background-position: center
     background-repeat: no-repeat
 
-.wagtailvillage-hero-large
+.design-system-hero-large
     display: flex
     justify-content: center
     align-items: center
     text-align: center
 
-.wagtailvillage-background-dark
+.design-system-background-dark
     & h1, p
         color: white
 
-.village-header__service-title em
+.design-system-header__service-title em
     font-weight: lighter
 
-.wagtailvillage-author_card__header
+.design-system-author_card__header
     flex: 0 0 6rem !important
     width: 6rem !important
 
-.wagtailvillage-author-img
+.design-system-author-img
     border-radius: 50%
     height: 4.5rem !important
     margin: 1.5rem

diff --git a/sites_faciles/templates/404.html b/sites_faciles/templates/404.html
@@ -1,28 +1,28 @@
 {% extends "base.html" %}
 {% load static %}
 {% block content %}
-    <div class="village-container">
-        <div class="village-my-7w village-mt-md-12w village-mb-md-10w village-grid-row village-grid-row--gutters village-grid-row--middle village-grid-row--center">
-            <div class="village-py-0 village-col-12 village-col-md-6">
+    <div class="design-system-container">
+        <div class="design-system-my-7w design-system-mt-md-12w design-system-mb-md-10w design-system-grid-row design-system-grid-row--gutters design-system-grid-row--middle design-system-grid-row--center">
+            <div class="design-system-py-0 design-system-col-12 design-system-col-md-6">
                 <h1>Page non trouvée</h1>
-                <p class="village-text--sm village-mb-3w">Erreur 404</p>
-                <p class="village-text--lead village-mb-3w">
+                <p class="design-system-text--sm design-system-mb-3w">Erreur 404</p>
+                <p class="design-system-text--lead design-system-mb-3w">
                     La page que vous cherchez est introuvable. Veuillez nous excuser pour la gène occasionnée.
                 </p>
-                <p class="village-text--sm village-mb-5w">
+                <p class="design-system-text--sm design-system-mb-5w">
                     Si vous avez tapé l’adresse web dans le navigateur, vérifiez qu’elle est correcte. La page n’est peut-être plus disponible.
                     <br />
                     Dans ce cas, pour continuer votre visite, vous pouvez consulter notre page d’accueil.
                 </p>
-                <ul class="village-btns-group village-btns-group--inline-md">
+                <ul class="design-system-btns-group design-system-btns-group--inline-md">
                     <li>
-                        <a class="village-btn" href="/">Page d’accueil</a>
+                        <a class="design-system-btn" href="/">Page d’accueil</a>
                     </li>
                 </ul>
             </div>
-            <div class="village-col-12 village-col-md-3 village-col-offset-md-1 village-px-6w village-px-md-0 village-py-0">
+            <div class="design-system-col-12 design-system-col-md-3 design-system-col-offset-md-1 design-system-px-6w design-system-px-md-0 design-system-py-0">
                 <img src="{% static 'sites-faciles/artwork/technical-error.svg' %}"
-                     class="village-responsive-img"
+                     class="design-system-responsive-img"
                      alt=""
                      width="300"
                      height="300" />

diff --git a/sites_faciles/templates/500.html b/sites_faciles/templates/500.html
@@ -1,24 +1,24 @@
 {% extends "base.html" %}
 {% load static %}
 {% block content %}
-    <div class="village-container">
-        <div class="village-my-7w village-mt-md-12w village-mb-md-10w village-grid-row village-grid-row--gutters village-grid-row--middle village-grid-row--center">
-            <div class="village-py-0 village-col-12 village-col-md-6">
+    <div class="design-system-container">
+        <div class="design-system-my-7w design-system-mt-md-12w design-system-mb-md-10w design-system-grid-row design-system-grid-row--gutters design-system-grid-row--middle design-system-grid-row--center">
+            <div class="design-system-py-0 design-system-col-12 design-system-col-md-6">
                 <h1>Erreur inattendue</h1>
-                <p class="village-text--sm village-mb-3w">Erreur 500</p>
-                <p class="village-text--lead village-mb-3w">Essayez de rafraîchir la page ou bien ressayez plus tard.</p>
-                <p class="village-text--sm village-mb-5w">
+                <p class="design-system-text--sm design-system-mb-3w">Erreur 500</p>
+                <p class="design-system-text--lead design-system-mb-3w">Essayez de rafraîchir la page ou bien ressayez plus tard.</p>
+                <p class="design-system-text--sm design-system-mb-5w">
                     Désolé, le service rencontre un problème, nous travaillons pour le résoudre le plus rapidement possible.
                 </p>
-                <ul class="village-btns-group village-btns-group--inline-md">
+                <ul class="design-system-btns-group design-system-btns-group--inline-md">
                     <li>
-                        <a class="village-btn" href="/">Page d’accueil</a>
+                        <a class="design-system-btn" href="/">Page d’accueil</a>
                     </li>
                 </ul>
             </div>
-            <div class="village-col-12 village-col-md-3 village-col-offset-md-1 village-px-6w village-px-md-0 village-py-0">
+            <div class="design-system-col-12 design-system-col-md-3 design-system-col-offset-md-1 design-system-px-6w design-system-px-md-0 design-system-py-0">
                 <img src="{% static 'sites-faciles/artwork/technical-error.svg' %}"
-                     class="village-responsive-img"
+                     class="design-system-responsive-img"
                      alt=""
                      width="300"
                      height="300" />

diff --git a/sites_faciles/templates/base.html b/sites_faciles/templates/base.html
@@ -5,8 +5,8 @@
 <!DOCTYPE html>
 
 <html lang="{% get_current_language as LANGUAGE_CODE %}{{ LANGUAGE_CODE }}"
-      data-village-scheme="system"
-      {% block mourning %}{% if settings.sites_faciles.WagtailSitesFacilesConfig.mourning %}data-village-mourning{% endif %}{% endblock mourning %}>
+      data-design-system-scheme="system"
+      {% block mourning %}{% if settings.sites_faciles.WagtailSitesFacilesConfig.mourning %}data-design-system-mourning{% endif %}{% endblock mourning %}>
   <head>
     <meta charset="utf-8" />
     <meta name="viewport"
@@ -53,7 +53,7 @@
       {% include "sites_faciles/header.html" %}
     {% endblock header %}
 
-    <div class="village-container village-mt-4w village-mb-6w">
+    <div class="design-system-container design-system-mt-4w design-system-mb-6w">
       {% block breadcrumb %}
         {% design_system_breadcrumb %}
       {% endblock breadcrumb %}

diff --git a/sites_faciles/templates/menus/custom_flat_menu.html b/sites_faciles/templates/menus/custom_flat_menu.html
@@ -2,7 +2,7 @@
 {% for item in menu_items %}
     <li>
         <a href="{{ item.href }}"
-            class="village-btn"
+            class="design-system-btn"
             {% if item.active_class %} aria-current="page"{% endif %}
             target="_self">{{ item.text }}</a>
     </li>

diff --git a/sites_faciles/templates/menus/custom_flat_menu_footer.html b/sites_faciles/templates/menus/custom_flat_menu_footer.html
@@ -1,7 +1,7 @@
 {% for item in menu_items %}
-    <li class="village-footer__bottom-item">
+    <li class="design-system-footer__bottom-item">
         <a href="{{ item.href }}"
-            class="village-footer__bottom-link"
+            class="design-system-footer__bottom-link"
             {% if item.active_class %} aria-current="page"{% endif %}
             target="_self">{{ item.text }}</a>
     </li>