From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 13 Nov 2018 00:18:06 +0000 (+0000)
Subject: wiki: Make navbar independent from page
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=675738038018869534cdfdfa9a98f7eff97d4a53;p=ipfire.org.git

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 de491fb5..19516de8 100644
--- 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 a3d4e65b..90da993c 100644
--- 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)