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

fix: Correction au niveau des logos d'entête #1538

Merged
merged 3 commits into from
Nov 21, 2024
+27 −60
Merged

fix: Correction au niveau des logos d'entête #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0e2062
replace obsolete SITE_CONFIG var
SebastienReuiller Nov 21, 2024
326f5cf
use expose_settings to avoid to much db queries
SebastienReuiller Nov 21, 2024
5fac88b
finally remove useless SITE_CONFIG
SebastienReuiller Nov 21, 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
81 changes: 26 additions & 55 deletions lemarche/templates/layouts/_header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand All @@ -17,27 +15,22 @@
<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 }} — 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>
{% 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:15rem"
src="{% static_theme_images 'logo-marche-inclusion.svg' %}"
alt="Le marché de l'inclusion">
</a>
</div>
{% block burger_menu %}
{% translate "Menu" as menu_label %}
Expand All @@ -46,37 +39,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 %}
Expand All @@ -89,19 +63,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>
</header>
6 changes: 1 addition & 5 deletions lemarche/templates/layouts/base.html
View file
Open in desktop
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
Loading