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 f43434f46170adf25653fab491d105fe7425cc9b..651887a80b42f14ddb4985c74d64cf088621fb0a 100644 (file)
--- 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 5fd678d6d9c8aca9b51b17f8cdddeeb42e1d69fb..de491fb5ae42ab12064b4b7265c4ffddfea515a7 100644 (file)
--- 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 06d05ec833a0cf85f578a9a47b8ead1f84345a1e..350905d5376cd0576b5b70fbdfc7723ac2652b44 100644 (file)
--- 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 %}