Skip to content

Commit

Permalink
quality
Browse files Browse the repository at this point in the history
  • Loading branch information
@vincentporte
vincentporte committed Aug 7, 2024
1 parent f905b95 commit ce49e7b
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 23 deletions.
8 changes: 3 additions & 5 deletions lacommunaute/pages/tests/__snapshots__/test_homepage.ambr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@
</div>
<div class="s-header__col s-header__col--burger col col-lg-auto d-flex align-items-center justify-content-end d-xl-none ps-0">
<button aria-controls="offcanvasNav" aria-label="Ouvrir le menu de navigation principale pour mobile" class="btn btn-link btn-ico pe-0" data-bs-target="#offcanvasNav" data-bs-toggle="offcanvas" type="button">
<i aria-hidden="true" class="ri-menu-line" id="open"></i>
<span>Menu</span>
<i aria-hidden="true" class="ri-menu-line" id="open"></i>
<span>Menu</span>
</button>
</div>
</div>
Expand Down Expand Up @@ -217,7 +217,6 @@
</div>
</div>
</section>

<div aria-label="Navigation principale pour mobile" class="offcanvas" id="offcanvasNav">
<div class="offcanvas-header">
<h4 class="h5 mb-0 btn-ico align-items-center" id="offcanvasApplyFiltersLabel">
Expand Down Expand Up @@ -273,14 +272,13 @@
</nav>
</div>
</div>

</header>
'''
# ---
# name: test_page_title_header_footer[homepage_title]
'''
<title>
Accueil - La communauté de l'inclusion
Accueil- La communauté de l'inclusion
</title>
'''
# ---
2 changes: 1 addition & 1 deletion lacommunaute/templates/layouts/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{% block head %}
<meta charset="utf-8">
<title>
{% block title %} - {{ MACHINA_FORUM_NAME|default:"Forum" }}{% endblock %}
{% block title %}- {{ MACHINA_FORUM_NAME|default:"Forum" }}{% endblock %}
</title>
<meta name="created" content="{% now "jS M Y h:i" %}">
<meta name="description" content="{% block meta_description %}{% endblock meta_description %}">
Expand Down
45 changes: 28 additions & 17 deletions lacommunaute/templates/partials/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
{% url 'search:index' as search_url %}
{% url 'surveys:dsp_create' as dsp_url %}
{% url 'event:current' as event_url %}

<header role="banner" id="header">
<section class="s-header">
<div class="s-header__container container">
Expand Down Expand Up @@ -41,9 +40,14 @@
</li>
{% if user.is_authenticated %}
<li class="dropdown">
<button type="button" class="btn btn-outline-primary btn-ico btn-block bg-white dropdown-toggle my-3" data-bs-toggle="dropdown" aria-haspopup="true" aria-controls="dashboardUserDropdown" aria-expanded="false">
<button type="button"
class="btn btn-outline-primary btn-ico btn-block bg-white dropdown-toggle my-3"
data-bs-toggle="dropdown"
aria-haspopup="true"
aria-controls="dashboardUserDropdown"
aria-expanded="false">
<i class="ri-account-circle-line" aria-hidden="true"></i>
<span class="d-none d-sm-inline-block ms-0 ms-sm-2">Mon espace</span>
<span class="d-none d-sm-inline-block ms-0 ms-sm-2">Mon espace</span>
</button>
<div class="dropdown-menu" id="dashboardUserDropdown">
<ul class="list-unstyled">
Expand Down Expand Up @@ -117,8 +121,8 @@
</div>
<div class="s-header__col s-header__col--burger col col-lg-auto d-flex align-items-center justify-content-end d-xl-none ps-0">
<button type="button" class="btn btn-link btn-ico pe-0" data-bs-toggle="offcanvas" data-bs-target="#offcanvasNav" aria-controls="offcanvasNav" aria-label="Ouvrir le menu de navigation principale pour mobile">
<i class="ri-menu-line" id="open" aria-hidden="true"></i>
<span>Menu</span>
<i class="ri-menu-line" id="open" aria-hidden="true"></i>
<span>Menu</span>
</button>
</div>
</div>
Expand All @@ -138,10 +142,10 @@
</li>
<li>
<a href="{{ documentation_url }}"
class="{% if request.path == documentation_url %}is-active {% endif %}matomo-event"
data-matomo-category="engagement"
data-matomo-action="view"
data-matomo-option="documentation_header">{% trans "Documents" %}</a>
class="{% if request.path == documentation_url %}is-active {% endif %}matomo-event"
data-matomo-category="engagement"
data-matomo-action="view"
data-matomo-option="documentation_header">{% trans "Documents" %}</a>
</li>
<li>
<a href="{{ event_url }}" class="{% if request.path == event_url %}is-active {% endif %}matomo-event" data-matomo-category="engagement" data-matomo-action="view" data-matomo-option="events">{% trans "Events" %}</a>
Expand All @@ -157,7 +161,6 @@
</div>
</div>
</section>

<div class="offcanvas" id="offcanvasNav" aria-label="Navigation principale pour mobile">
<div class="offcanvas-header">
<h4 class="h5 mb-0 btn-ico align-items-center" id="offcanvasApplyFiltersLabel">
Expand Down Expand Up @@ -185,14 +188,18 @@ <h4 class="h5 mb-0 btn-ico align-items-center" id="offcanvasApplyFiltersLabel">
<a href="{{ home_url }}" class="nav-link{% if request.path == home_url %} active{% endif %}">Accueil</a>
</li>
<li class="nav-item">
<a href="{{ publicforum_url }}" class="nav-link{% if request.path == publicforum_url %} active{% endif %} matomo-event" data-matomo-category="engagement" data-matomo-action="view" data-matomo-option="topics">{% trans "Discussion area" %}</a>
<a href="{{ publicforum_url }}"
class="nav-link{% if request.path == publicforum_url %} active{% endif %} matomo-event"
data-matomo-category="engagement"
data-matomo-action="view"
data-matomo-option="topics">{% trans "Discussion area" %}</a>
</li>
<li class="nav-item">
<a href="{{ documentation_url }}"
class="nav-link{% if request.path == documentation_url %} active{% endif %} matomo-event"
data-matomo-category="engagement"
data-matomo-action="view"
data-matomo-option="documentation_header">{% trans "Documents" %}</a>
class="nav-link{% if request.path == documentation_url %} active{% endif %} matomo-event"
data-matomo-category="engagement"
data-matomo-action="view"
data-matomo-option="documentation_header">{% trans "Documents" %}</a>
</li>
<li>
<a href="{{ event_url }}" class="nav-link{% if request.path == event_url %} active{% endif %} matomo-event" data-matomo-category="engagement" data-matomo-action="view" data-matomo-option="events">{% trans "Events" %}</a>
Expand All @@ -209,7 +216,12 @@ <h4 class="h5 mb-0 btn-ico align-items-center" id="offcanvasApplyFiltersLabel">
<nav role="navigation" aria-label="Menu de navigation principale pour mobile">
{% if user.is_authenticated %}
<div class="dropdown-center">
<button type="button" class="btn btn-outline-primary btn-ico btn-block bg-white dropdown-toggle my-3" data-bs-toggle="dropdown" aria-haspopup="true" aria-controls="dashboardUserDropdown" aria-expanded="false">
<button type="button"
class="btn btn-outline-primary btn-ico btn-block bg-white dropdown-toggle my-3"
data-bs-toggle="dropdown"
aria-haspopup="true"
aria-controls="dashboardUserDropdown"
aria-expanded="false">
<i class="ri-account-circle-line" aria-hidden="true"></i>
<span class="d-none d-sm-inline-block ms-0 ms-sm-2">Mon espace</span>
</button>
Expand Down Expand Up @@ -283,5 +295,4 @@ <h4 class="h5 mb-0 btn-ico align-items-center" id="offcanvasApplyFiltersLabel">
</nav>
</div>
</div>

</header>

0 comments on commit ce49e7b

Please sign in to comment.