wiki: Make navbar independent from page

This allows to show navigation on pages that don't exist, yet

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

diff --git a/src/templates/wiki/base.html b/src/templates/wiki/base.html
index de491fb5ae42ab12064b4b7265c4ffddfea515a7..19516de8b48acaf6d92c4a7ca7b6f193b2807217 100644 (file)
--- a/src/templates/wiki/base.html
+++ b/src/templates/wiki/base.html
@@ -7,7 +7,7 @@
                </div>
 
                <div class="col-12 col-lg-9">
-                       {% module WikiNavbar(page) %}
+                       {% module WikiNavbar() %}
 
                        {% block main %}{% end block %}
                </div>

diff --git a/src/web/wiki.py b/src/web/wiki.py
index a3d4e65bd67f7d211641fd41121680ed3c4b7e6d..90da993c030af123d9e068caa3614b9d8b3f5ce3 100644 (file)
--- a/src/web/wiki.py
+++ b/src/web/wiki.py
@@ -101,8 +101,10 @@ class WikiListModule(ui_modules.UIModule):
 
 
 class WikiNavbarModule(ui_modules.UIModule):
-       def render(self, page, suffix=None):
-               breadcrumbs = self.backend.wiki.make_breadcrumbs(page.url)
+       def render(self, suffix=None):
+               breadcrumbs = self.backend.wiki.make_breadcrumbs(self.request.path)
+
+               title = self.backend.wiki.get_page_title(self.request.path)
 
                return self.render_string("wiki/modules/navbar.html",
-                       breadcrumbs=breadcrumbs, page_title=page.title, suffix=suffix)
+                       breadcrumbs=breadcrumbs, page_title=title, suffix=suffix)