Skip to content

Commit

Permalink
finally remove useless SITE_CONFIG
Browse files Browse the repository at this point in the history
  • Loading branch information
SebastienReuiller committed Nov 21, 2024
1 parent 326f5cf commit 5fac88b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
8 changes: 5 additions & 3 deletions lemarche/templates/layouts/_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@
<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 %}
</div>
<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>
Expand Down
6 changes: 1 addition & 5 deletions lemarche/templates/layouts/base.html
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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 %}
Expand Down
4 changes: 0 additions & 4 deletions lemarche/utils/settings_context_processors.py
Original file line number Diff line number Diff line change
@@ -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


Expand All @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit 5fac88b

Please sign in to comment.