From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Nov 2018 23:50:30 +0000 (+0000)
Subject: wiki: Hide breadcrumbs on lower levels
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1bf7d4853f2a8ed15cd8ec57fb0db7d9e849202;p=ipfire.org.git

wiki: Hide breadcrumbs on lower levels

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index f43434f4..651887a8 100644
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -62,7 +62,7 @@ class Wiki(misc.Object):
 		parts = list(e for e in url.split("/") if e)
 
 		ret = []
-		for part in ("/".join(parts[:i] for i in range(1, len(parts))):
+		for part in ("/".join(parts[:i]) for i in range(1, len(parts))):
 			ret.append(("/%s" % part, self.get_page_title(part, os.path.basename(part))))
 
 		return ret
diff --git a/src/templates/wiki/base.html b/src/templates/wiki/base.html
index 5fd678d6..de491fb5 100644
--- a/src/templates/wiki/base.html
+++ b/src/templates/wiki/base.html
@@ -7,9 +7,7 @@
 		</div>
 
 		<div class="col-12 col-lg-9">
-			{% if not request.path == "/" %}
-				{% module WikiNavbar(page) %}
-			{% end %}
+			{% module WikiNavbar(page) %}
 
 			{% block main %}{% end block %}
 		</div>
diff --git a/src/templates/wiki/modules/navbar.html b/src/templates/wiki/modules/navbar.html
index 06d05ec8..350905d5 100644
--- a/src/templates/wiki/modules/navbar.html
+++ b/src/templates/wiki/modules/navbar.html
@@ -1,15 +1,17 @@
-<ol class="breadcrumb">
-	{% for page, title in breadcrumbs %}
-		<li class="breadcrumb-item">
-			<a href="{{ page }}">{{ title }}</a>
-		</li>
-	{% end %}
+{% if len(breadcrumbs) >= 1 %}
+	<ol class="breadcrumb">
+		{% for page, title in breadcrumbs %}
+			<li class="breadcrumb-item">
+				<a href="{{ page }}">{{ title }}</a>
+			</li>
+		{% end %}
 
-	<li class="breadcrumb-item {% if not suffix %}active{% end %}">
-		{{ page_title }}
-	</li>
+		<li class="breadcrumb-item {% if not suffix %}active{% end %}">
+			{{ page_title }}
+		</li>
 
-	{% if suffix %}
-		<li class="breadcrumb-item active">{{ suffix }}</li>
-	{% end %}
-</ol>
+		{% if suffix %}
+			<li class="breadcrumb-item active">{{ suffix }}</li>
+		{% end %}
+	</ol>
+{% end %}