From f0e2062c1cd381ec10ed5055d0cd788fa867a4d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Reuiller?= <sebastien@reuiller.email>
Date: Thu, 21 Nov 2024 14:58:26 +0100
Subject: [PATCH 1/3] replace obsolete SITE_CONFIG var

---
 lemarche/templates/layouts/_header.html | 80 ++++++++-----------------
 lemarche/templates/layouts/base.html    |  6 +-
 2 files changed, 28 insertions(+), 58 deletions(-)

diff --git a/lemarche/templates/layouts/_header.html b/lemarche/templates/layouts/_header.html
index 91802f5e0..a01fefd5a 100644
--- a/lemarche/templates/layouts/_header.html
+++ b/lemarche/templates/layouts/_header.html
@@ -1,13 +1,11 @@
 {% load i18n static theme_inclusion %}
-
 {% if not user.is_authenticated %}
-    {% if page.slug == "accueil-structure" %}
-        {% include "includes/_header_for_buyers.html" %}
-    {% else %}
-        {% include "includes/_header_for_siaes.html" %}
-    {% endif %}
+  {% if page.slug == "accueil-structure" %}
+    {% include "includes/_header_for_buyers.html" %}
+  {% else %}
+    {% include "includes/_header_for_siaes.html" %}
+  {% endif %}
 {% endif %}
-
 <header role="banner" class="fr-header" id="header">
   <div class="fr-header__body">
     <div class="fr-container">
@@ -17,27 +15,21 @@
             <div class="fr-header__logo">
               {% block brand %}
                 {% translate "Home page" as home_page %}
-                <a href="/" title="{{ home_page }} — {{ SITE_CONFIG.site_title }}">
+                <a href="/"
+                   title="{{ home_page }} — {{ settings.content_manager.CmsDsfrConfig.header_brand }}">
                   <p class="fr-logo">
-                    {{ SITE_CONFIG.header_brand_html|default_if_none:"république<br />française" | safe }}
+                    {{ settings.content_manager.CmsDsfrConfig.header_brand_html|default_if_none:"république<br />française" | safe }}
                   </p>
                 </a>
               {% endblock brand %}
             </div>
-            {% comment "" %}
-            {% block operator_logo %}
-              {% if SITE_CONFIG.operator_logo_file and SITE_CONFIG.operator_logo_alt %}
-                <div class="fr-header__operator">
-                  <img class="fr-responsive-img"
-                       src="{{ SITE_CONFIG.operator_logo_file.url }}"
-                       alt="{{ SITE_CONFIG.operator_logo_alt }}"
-                       {% if SITE_CONFIG.operator_logo_width >= 1 %}style="max-width:{{ SITE_CONFIG.operator_logo_width }}rem;"{% endif %} />
-                </div>
-              {% endif %}
-              {% endblock operator_logo %}
-              {% endcomment %}
-              <div class="fr-header__operator">
-                <a href="{{ HOME_PAGE_PATH }}"><img class="fr-responsive-img" style="max-width:8rem;" src="{% static_theme_images 'logo-marche-inclusion.svg' %}" alt="Le marché de l'inclusion"></a>
+            <div class="fr-header__operator">
+              <a href="{{ HOME_PAGE_PATH }}">
+                <img class="fr-responsive-img"
+                     style="max-width:16rem"
+                     src="{% static_theme_images 'logo-marche-inclusion.svg' %}"
+                     alt="Le marché de l'inclusion">
+              </a>
             </div>
             {% block burger_menu %}
               {% translate "Menu" as menu_label %}
@@ -46,37 +38,18 @@
                         data-fr-opened="false"
                         aria-controls="fr-menu-mobile"
                         id="fr-btn-menu-mobile"
-                        title="{{ menu_label }}">
-                  {{ menu_label }}
-                </button>
+                        title="{{ menu_label }}">{{ menu_label }}</button>
               </div>
             {% endblock burger_menu %}
           </div>
-          <div class="fr-header__service">
-            {% block service_title %}
-              <a href="/" title="Accueil — {{ SITE_CONFIG.site_title }}">
-                <p class="fr-header__service-title">
-                  {{ SITE_CONFIG.site_title }}
-                  {% if SITE_CONFIG.beta_tag %}
-                    <span class="fr-badge fr-badge--sm fr-badge--green-emeraude">BETA</span>
-                  {% endif %}
-                </p>
-              </a>
-            {% endblock service_title %}
-            <p class="fr-header__service-tagline">
-              {% block service_tagline %}
-                {{ SITE_CONFIG.site_tagline }}
-              {% endblock service_tagline %}
-            </p>
-          </div>
         </div>
         <div class="fr-header__tools">
           <div class="fr-header__tools-links">
-              {% block header_tools %}
-                {% with tender_siae_unread_count=user.tender_siae_unread_count %}
-                  {% include "layouts/_header_nav_primary_items.html" %}
-                {% endwith %}
-              {% endblock header_tools %}
+            {% block header_tools %}
+              {% with tender_siae_unread_count=user.tender_siae_unread_count %}
+                {% include "layouts/_header_nav_primary_items.html" %}
+              {% endwith %}
+            {% endblock header_tools %}
           </div>
           {% block header_search %}
           {% endblock header_search %}
@@ -89,19 +62,16 @@
          id="fr-menu-mobile"
          aria-labelledby="fr-btn-menu-mobile">
       <div class="fr-container">
-        <button class="fr-btn--close fr-btn" aria-controls="fr-menu-mobile">
-          {% translate "Close" %}
-        </button>
-        <div class="fr-header__menu-links">
-        </div>
+        <button class="fr-btn--close fr-btn" aria-controls="fr-menu-mobile">{% translate "Close" %}</button>
+        <div class="fr-header__menu-links"></div>
         {% translate "Main menu" as main_menu_label %}
         <nav role="navigation"
              class="fr-nav"
              id="fr-navigation"
              aria-label="{{ main_menu_label }}">
-             {% include 'layouts/_header_nav_secondary_items.html' %}
+          {% include 'layouts/_header_nav_secondary_items.html' %}
         </nav>
       </div>
     </div>
   {% endblock main_menu %}
-</header>
\ No newline at end of file
+</header>
diff --git a/lemarche/templates/layouts/base.html b/lemarche/templates/layouts/base.html
index 4cd83e95d..fc6b471a9 100644
--- a/lemarche/templates/layouts/base.html
+++ b/lemarche/templates/layouts/base.html
@@ -1,7 +1,7 @@
 {% load static compress dsfr_tags %}
 <!DOCTYPE html>
 <html lang="{% block lang %}fr{% endblock lang %}"
-      {% if SITE_CONFIG.mourning %}data-fr-mourning{% endif %}>
+      {% if settings.content_manager.CmsDsfrConfig.mourning %}data-fr-mourning{% endif %}>
   <head>
     <meta charset="utf-8" />
     <meta name="viewport"
@@ -48,8 +48,8 @@
     {% block header %}
       {% include "layouts/_header.html" %}
     {% endblock header %}
-    {% if SITE_CONFIG.notice %}
-      {% dsfr_notice title=SITE_CONFIG.notice %}
+    {% if settings.content_manager.CmsDsfrConfig.notice %}
+      {% dsfr_notice title=settings.content_manager.CmsDsfrConfig.notice %}
     {% endif %}
     {% block breadcrumb %}
       {% comment %} empty because managed for each type of page {% endcomment %}

From 326f5cf433a0d1fd713b14d15dae91e6b865722b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Reuiller?= <sebastien@reuiller.email>
Date: Thu, 21 Nov 2024 15:30:09 +0100
Subject: [PATCH 2/3] use expose_settings to avoid to much db queries

---
 lemarche/templates/layouts/_header.html       | 5 ++---
 lemarche/templates/layouts/base.html          | 6 +++---
 lemarche/utils/settings_context_processors.py | 4 ++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lemarche/templates/layouts/_header.html b/lemarche/templates/layouts/_header.html
index a01fefd5a..e187f42bc 100644
--- a/lemarche/templates/layouts/_header.html
+++ b/lemarche/templates/layouts/_header.html
@@ -15,10 +15,9 @@
             <div class="fr-header__logo">
               {% block brand %}
                 {% translate "Home page" as home_page %}
-                <a href="/"
-                   title="{{ home_page }} — {{ settings.content_manager.CmsDsfrConfig.header_brand }}">
+                <a href="/" title="{{ home_page }} — {{ SITE_CONFIG.header_brand }}">
                   <p class="fr-logo">
-                    {{ settings.content_manager.CmsDsfrConfig.header_brand_html|default_if_none:"république<br />française" | safe }}
+                    {{ SITE_CONFIG.header_brand_html|default_if_none:"république<br />française" | safe }}
                   </p>
                 </a>
               {% endblock brand %}
diff --git a/lemarche/templates/layouts/base.html b/lemarche/templates/layouts/base.html
index fc6b471a9..4cd83e95d 100644
--- a/lemarche/templates/layouts/base.html
+++ b/lemarche/templates/layouts/base.html
@@ -1,7 +1,7 @@
 {% load static compress dsfr_tags %}
 <!DOCTYPE html>
 <html lang="{% block lang %}fr{% endblock lang %}"
-      {% if settings.content_manager.CmsDsfrConfig.mourning %}data-fr-mourning{% endif %}>
+      {% if SITE_CONFIG.mourning %}data-fr-mourning{% endif %}>
   <head>
     <meta charset="utf-8" />
     <meta name="viewport"
@@ -48,8 +48,8 @@
     {% block header %}
       {% include "layouts/_header.html" %}
     {% endblock header %}
-    {% if settings.content_manager.CmsDsfrConfig.notice %}
-      {% dsfr_notice title=settings.content_manager.CmsDsfrConfig.notice %}
+    {% if SITE_CONFIG.notice %}
+      {% dsfr_notice title=SITE_CONFIG.notice %}
     {% endif %}
     {% block breadcrumb %}
       {% comment %} empty because managed for each type of page {% endcomment %}
diff --git a/lemarche/utils/settings_context_processors.py b/lemarche/utils/settings_context_processors.py
index 106a1f20c..7e12ca07b 100644
--- a/lemarche/utils/settings_context_processors.py
+++ b/lemarche/utils/settings_context_processors.py
@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.urls import reverse_lazy
 
+from content_manager.models import CmsDsfrConfig
 from lemarche.users.models import User
 
 
@@ -15,6 +16,8 @@ def expose_settings(request):
     if request.user.is_authenticated and request.user.kind == User.KIND_SIAE:
         home_page = settings.SIAE_HOME_PAGE
 
+    site_config = CmsDsfrConfig.objects.first()
+
     return {
         "BITOUBI_ENV": settings.BITOUBI_ENV,
         "BITOUBI_ENV_COLOR": settings.BITOUBI_ENV_COLOR,
@@ -27,6 +30,7 @@ def expose_settings(request):
         # template & wording
         "BASE_TEMPLATE": base_template,
         "HOME_PAGE_PATH": home_page,
+        "SITE_CONFIG": site_config,
         "ABOUT": settings.ABOUT,
         "ACCESSIBILITY": settings.ACCESSIBILITY,
         "CGU": settings.CGU,

From 5fac88bcf570966ac35b5b633cefb61406aeb9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Reuiller?= <sebastien@reuiller.email>
Date: Thu, 21 Nov 2024 15:50:57 +0100
Subject: [PATCH 3/3] finally remove useless SITE_CONFIG

---
 lemarche/templates/layouts/_header.html       | 8 +++++---
 lemarche/templates/layouts/base.html          | 6 +-----
 lemarche/utils/settings_context_processors.py | 4 ----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lemarche/templates/layouts/_header.html b/lemarche/templates/layouts/_header.html
index e187f42bc..e47c31fbb 100644
--- a/lemarche/templates/layouts/_header.html
+++ b/lemarche/templates/layouts/_header.html
@@ -15,9 +15,11 @@
             <div class="fr-header__logo">
               {% block brand %}
                 {% translate "Home page" as home_page %}
-                <a href="/" title="{{ home_page }} — {{ SITE_CONFIG.header_brand }}">
+                <a href="/" title="{{ home_page }} — Le marché de l'inclusion">
                   <p class="fr-logo">
-                    {{ SITE_CONFIG.header_brand_html|default_if_none:"république<br />française" | safe }}
+                    République
+                    <br />
+                    Française
                   </p>
                 </a>
               {% endblock brand %}
@@ -25,7 +27,7 @@
             <div class="fr-header__operator">
               <a href="{{ HOME_PAGE_PATH }}">
                 <img class="fr-responsive-img"
-                     style="max-width:16rem"
+                     style="max-width:15rem"
                      src="{% static_theme_images 'logo-marche-inclusion.svg' %}"
                      alt="Le marché de l'inclusion">
               </a>
diff --git a/lemarche/templates/layouts/base.html b/lemarche/templates/layouts/base.html
index 4cd83e95d..25de916d5 100644
--- a/lemarche/templates/layouts/base.html
+++ b/lemarche/templates/layouts/base.html
@@ -1,7 +1,6 @@
 {% load static compress dsfr_tags %}
 <!DOCTYPE html>
-<html lang="{% block lang %}fr{% endblock lang %}"
-      {% if SITE_CONFIG.mourning %}data-fr-mourning{% endif %}>
+<html lang="{% block lang %}fr{% endblock lang %}">
   <head>
     <meta charset="utf-8" />
     <meta name="viewport"
@@ -48,9 +47,6 @@
     {% block header %}
       {% include "layouts/_header.html" %}
     {% endblock header %}
-    {% if SITE_CONFIG.notice %}
-      {% dsfr_notice title=SITE_CONFIG.notice %}
-    {% endif %}
     {% block breadcrumb %}
       {% comment %} empty because managed for each type of page {% endcomment %}
     {% endblock breadcrumb %}
diff --git a/lemarche/utils/settings_context_processors.py b/lemarche/utils/settings_context_processors.py
index 7e12ca07b..106a1f20c 100644
--- a/lemarche/utils/settings_context_processors.py
+++ b/lemarche/utils/settings_context_processors.py
@@ -1,7 +1,6 @@
 from django.conf import settings
 from django.urls import reverse_lazy
 
-from content_manager.models import CmsDsfrConfig
 from lemarche.users.models import User
 
 
@@ -16,8 +15,6 @@ def expose_settings(request):
     if request.user.is_authenticated and request.user.kind == User.KIND_SIAE:
         home_page = settings.SIAE_HOME_PAGE
 
-    site_config = CmsDsfrConfig.objects.first()
-
     return {
         "BITOUBI_ENV": settings.BITOUBI_ENV,
         "BITOUBI_ENV_COLOR": settings.BITOUBI_ENV_COLOR,
@@ -30,7 +27,6 @@ def expose_settings(request):
         # template & wording
         "BASE_TEMPLATE": base_template,
         "HOME_PAGE_PATH": home_page,
-        "SITE_CONFIG": site_config,
         "ABOUT": settings.ABOUT,
         "ACCESSIBILITY": settings.ACCESSIBILITY,
         "CGU": settings.CGU,