Merge pull request #93 from noesya/refactor/menu

Refactor/menu

layouts/partials/GetMenu

 {{ $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 }}
 
+{{ if reflect.IsSlice $menu }}
+  {{/*  LEGACY  */}}
+  {{ $menu = (dict
+    "items" $menu
+  ) }}
+{{ end }}
+
 {{ return $menu }}
\ No newline at end of file

layouts/partials/commons/menu.html

@@ -2,7 +2,8 @@
 {{ $items := .items }}
 {{ $context := .context }}
 {{ if $kind }}
-  {{ $items = partial "GetMenu" $kind }}
+  {{ $menu := partial "GetMenu" $kind }}
+  {{ $items = $menu.items }}
 {{ end }}
 {{- $level := .level -}}
 {{- $stop := .stop -}}

layouts/partials/footer/legals.html

-<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" }}

layouts/partials/footer/social.html

-<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 }}
+

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"