From 87d371f4687040452665bfe48a79687a0af80aa1 Mon Sep 17 00:00:00 2001
From: Max Bosche <max@enten.space>
Date: Thu, 11 Apr 2019 10:45:43 +0200
Subject: [PATCH] solves #149

---
 layouts/partials/nav.html | 53 +++++++++++++--------------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index c266ac4..6cb0532 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -41,46 +41,29 @@
             {{ end }}
 
             {{ with .Site.GetPage "/home" }}
-            {{ range sort (.Resources.ByType "page") "Params.weight" }}
+            {{ $pages := .Resources.ByType "page" }}
+
+            {{ with .Site.GetPage "/blog" }}
+                {{ $pages = $pages | append . }}
+            {{ end }}
+
+            {{ with .Site.GetPage "/projects" }}
+                {{ $pages = $pages | append . }}
+            {{ end }}
+
+            {{ range sort $pages "Params.weight" }}
             {{ if ne .Name "contact.md" }}
+            {{ if eq .File.Dir "projects/" }}
+                <!-- Now for some cool projects -->
+                <a class="navbar-item" href="{{ printf "/#%s" ( .Title | urlize) | relLangURL }}">{{ .Title }}</a>
+            {{ else if eq .File.Dir "blog/" }}
+                <!-- Let`s show some blog posts -->
+                <a class="navbar-item" href="{{ printf "/#%s" ( .Title | urlize) | relLangURL }}">{{ .Title }}</a>
+            {{ else }}
             <a class="navbar-item" href="{{ if $isHome }}#{{ .File.TranslationBaseName }}{{ else }}{{ printf "/#%s" (.File.TranslationBaseName | urlize) | relLangURL }}{{ end }}">{{ .Title }}</a>
             {{ end }}
             {{ end }}
             {{ end }}
-
-            {{ $pageIsInProjects := eq .Page.Section "projects"}}
-            {{ if not (and $pageIsInProjects (eq .Page.Kind "section")) }}
-            {{ with .Site.GetPage "/projects" }}
-            {{ $totalProjects := (len .Pages) }}
-            {{ if $isHome }}
-            <a class="navbar-item" href="{{ printf "#%s" (.Title | urlize) }}">{{ .Title }}</a>
-            {{ else }}
-            <a class="navbar-item" href="{{ .Permalink }}">
-                {{ if $pageIsInProjects }}
-                {{ i18n "nav_backToSection" . }}
-                {{ else }}
-                {{ .Title }}
-                {{ end }}
-            </a>
-            {{ end }}
-            {{ end }}
-            {{ end }}
-
-            {{ $pageIsInBlog := eq .Page.Section "blog"}}
-            {{ if not (and $pageIsInBlog (eq .Page.Kind "section")) }}
-            {{ with .Site.GetPage "/blog" }}
-            {{ if $isHome }}
-            <a class="navbar-item" href="{{ printf "#%s" (.Title | urlize) }}">{{ .Title }}</a>
-            {{ else }}
-            <a class="navbar-item" href="{{ .Permalink }}">
-                {{ if $pageIsInBlog }}
-                {{ i18n "nav_backToSection" . }}
-                {{ else }}
-                {{ .Title | singularize}}
-                {{ end }}
-            </a>
-            {{ end }}
-            {{ end }}
             {{ end }}
 
             {{ with .Site.GetPage "/home" }}