Merge pull request 'Hierarchical navigation menu' (#4) from hier-nav-menu into main

Reviewed-on: Deuxfleurs/man.deuxfleurs.fr#4
This commit is contained in:
Alex 2022-06-01 17:04:10 +02:00
commit e69ee6ab7c
2 changed files with 77 additions and 40 deletions

61
templates/_nav.html Normal file
View file

@ -0,0 +1,61 @@
{% macro navsection(hierarchy, level, current) %}
{% set sec = hierarchy | nth(n=level) %}
{% set sec = get_section(path=sec) %}
{% set maxlevel = hierarchy | length %}
{% if sec.subsections %}
{% for s in sec.subsections %}
{% set p = get_section(path=s) %}
<div class="toc-item">
{% if p.subsections or p.pages %}
{% if p.path == current.path %}
<a class="subtext" href="{{ p.permalink | safe}}"><b>{{ p.title }}</b></a>
{% elif hierarchy is containing(s) %}
<a class="subtext" href="{{ p.permalink | safe}}">⯆ {{ p.title }}</a>
{% else %}
<a class="subtext" href="{{ p.permalink | safe}}">⯈ {{ p.title }}</a>
{% endif %}
{% if hierarchy is containing(s) or current.path == p.path %}
{% if level + 1 < maxlevel %}
{{ nav::navsection(hierarchy=hierarchy,level=level + 1,current=current) }}
{% endif %}
{% endif %}
{% else %}
{% if p.path == current.path %}
<a class="subtext" href="{{p.permalink | safe}}"><b>{{ p.title }}</b></a>
{% else %}
<a class="subtext" href="{{p.permalink | safe}}">{{ p.title }}</a>
{% endif %}
{% endif %}
</div>
{% endfor %}
{% endif %}
{% if sec.pages %}
{% for p in sec.pages %}
<div class="toc-item">
{% if p.path == current.path %}
<a class="subtext" href="{{p.permalink | safe}}"><b>{{ p.title }}</b></a>
{% else %}
<a class="subtext" href="{{p.permalink | safe}}">{{ p.title }}</a>
{% endif %}
</div>
{% endfor %}
{% endif %}
{% endmacro navsection %}
{% macro navmenu(current) %}
{% if current.ancestors %}
{% set hierarchy = current.ancestors | slice(start=1) | concat(with=current.relative_path) %}
{% else %}
{% set hierarchy = [current.relative_path] %}
{% endif %}
{% set root_path = hierarchy | nth(n=0) %}
{% set root = get_section(path=root_path) %}
<div class="toc-item toc-section">
<a class="subtext" href="{{root.permalink | safe}}">{{ root.title }}</a>
</div>
{{ nav::navsection(hierarchy=hierarchy,level=0,current=current) }}
{% endmacro %}

View file

@ -1,4 +1,5 @@
{% import "_macros.html" as macros %} {% import "_macros.html" as macros %}
{% import "_nav.html" as nav %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -7,7 +8,7 @@
<title>{% block title %}{{ config.title }}{% endblock title %}</title> <title>{% block title %}{{ config.title }}{% endblock title %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
{% block favicon %} {% block favicon %}
<link rel="icon" type="image/png" href="/favicon.ico"> <link rel="icon" type="image/png" href="/favicon.ico">
{% endblock favicon %} {% endblock favicon %}
{% include "_variables.html" %} {% include "_variables.html" %}
<link rel="stylesheet" href="/normalize.css"> <link rel="stylesheet" href="/normalize.css">
@ -24,46 +25,21 @@
{% endblock header %} {% endblock header %}
<main> <main>
{% block toc %} {% block toc %}
{% if page.ancestors %}
{% set section = get_section(path=page.ancestors | last) %}
{% endif %}
{% if section.ancestors %}
{% set parent = get_section(path=section.ancestors | last) %}
{% endif %}
<div class="toc"> <div class="toc">
<div class="toc-sticky"> <div class="toc-sticky">
<div class="toc-item toc-section"> {% if page %}
<a class="subtext" href="{{section.permalink | safe}}">{{ section.title }}</a> {{ nav::navmenu(current=page) }}
</div> {% else %}
{% if section.subsections %} {{ nav::navmenu(current=section) }}
{% for s in section.subsections %} {% endif %}
{% set p = get_section(path=s) %} </div>
<div class="toc-item">
<a class="subtext" href="{{ p.permalink | safe}}">{{ p.title }}</a>
</div>
{% endfor %}
{% endif %}
{% if section.pages %}
{% for p in section.pages %}
<div class="toc-item">
<a class="subtext" href="{{p.permalink | safe}}">{{ p.title }}</a>
</div>
{% endfor %}
{% endif %}
{% if parent %}
<div class="toc-item">
<a class="subtext" href="{{parent.permalink | safe}}">← Retour</a>
</div>
{% endif %}
</div>
</div> </div>
{% endblock toc %} {% endblock toc %}
<div class="content text"> <div class="content text">
{% block content %} {% block content %}
<div id="features" class="heading-text">{{ section.title }} </div> <div id="features" class="heading-text">{{ section.title }} </div>
{{ section.content | safe }} {{ section.content | safe }}
{% endblock content %} {% endblock content %}
</div> </div>
@ -75,10 +51,10 @@
{% block footer %} {% block footer %}
<footer> <footer>
<small class="subtext"> <small class="subtext">
Édité et hébergé par <a href="https://deuxfleurs.fr">Deuxfleurs</a>, Édité et hébergé par <a href="https://deuxfleurs.fr">Deuxfleurs</a>,
généré par <a href="https://www.getzola.org">Zola</a>, généré par <a href="https://www.getzola.org">Zola</a>,
thème dérivé de <a href="https://github.com/huhu/juice">Juice</a>, thème dérivé de <a href="https://github.com/huhu/juice">Juice</a>,
servi par <a href="https://garagehq.deuxfleurs.fr/">Garage</a>. servi par <a href="https://garagehq.deuxfleurs.fr/">Garage</a>.
</small> </small>
</footer> </footer>
{% endblock footer %} {% endblock footer %}