From 38263ac3d84045ce0b5c5cb83e3cd3860d425396 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Wed, 15 Feb 2023 15:15:14 +0100
Subject: [PATCH] cleanup menus
---
layouts/partials/GetMenu | 6 +++---
layouts/partials/footer/legals.html | 22 ++++++++++------------
layouts/partials/footer/social.html | 21 ++++++++++-----------
layouts/partials/header/header.html | 1 -
4 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/layouts/partials/GetMenu b/layouts/partials/GetMenu
index f743ee70..3f4b24fa 100644
--- a/layouts/partials/GetMenu
+++ b/layouts/partials/GetMenu
@@ -1,12 +1,12 @@
{{ $kind := . }}
{{ $menus := index site.Data.menus (printf "%s" site.Language) }}
{{ $menu := "" }}
-// Try to get menus from the data/menus/<lang> directory
+{{/* Try to get menus from the data/menus/<lang> directory */}}
{{ if (and $menus (isset $menus $kind)) }}
- // Menu found in data/menus/<lang>
+ {{/* Menu found in data/menus/<lang> */}}
{{ $menu = index $menus $kind }}
{{ else }}
- // Fallback to menu in the data/menus directory
+ {{/* Fallback to menu in the data/menus directory */}}
{{ $menu = index site.Data.menus $kind }}
{{ end }}
diff --git a/layouts/partials/footer/legals.html b/layouts/partials/footer/legals.html
index 6f01a6c3..9faf4ad7 100644
--- a/layouts/partials/footer/legals.html
+++ b/layouts/partials/footer/legals.html
@@ -1,12 +1,10 @@
-<div class="footer-legal">
- {{ $menu := partial "GetMenu" "legal" }}
- {{ if $menu }}
- {{ partial "commons/menu.html"
- (dict
- "kind" "legal"
- "level" 1
- "class" "nav-legal"
- )}}
- {{ end }}
- {{ partial "footer/credit.html" }}
-</div>
\ No newline at end of file
+{{ $menu := partial "GetMenu" "legal" }}
+{{ if $menu }}
+ {{ partial "commons/menu.html"
+ (dict
+ "kind" "legal"
+ "level" 1
+ "class" "nav-legal"
+ )}}
+{{ end }}
+{{ partial "footer/credit.html" }}
diff --git a/layouts/partials/footer/social.html b/layouts/partials/footer/social.html
index 0a977cef..4b7cb175 100644
--- a/layouts/partials/footer/social.html
+++ b/layouts/partials/footer/social.html
@@ -1,11 +1,10 @@
-<div class="footer-social">
- {{ $menu := partial "GetMenu" "social" }}
- {{ if $menu }}
- {{ partial "commons/menu.html"
- (dict
- "kind" "social"
- "level" 1
- "class" "nav-social"
- )}}
- {{ end }}
-</div>
+{{ $menu := partial "GetMenu" "social" }}
+{{ if $menu }}
+ {{ partial "commons/menu.html"
+ (dict
+ "kind" "social"
+ "level" 1
+ "class" "nav-social"
+ )}}
+{{ end }}
+
diff --git a/layouts/partials/header/header.html b/layouts/partials/header/header.html
index cb886f37..f0ab7dce 100644
--- a/layouts/partials/header/header.html
+++ b/layouts/partials/header/header.html
@@ -3,7 +3,6 @@
<nav aria-label="{{ i18n "commons.menu.main" }}">
<div class="container">
{{ partial "header/logo.html" }}
- {{ $menu := partial "GetMenu" "primary" }}
{{ partial "header/button.html" }}
<div class="menu" id="navigation">
{{ partial "commons/menu.html"
--
GitLab