From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Nov 2018 23:31:13 +0000 (+0000)
Subject: wiki: Move navigation bar to base template
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6032646493e4ad279d9c2d6e1a1b08162009c6c7;p=ipfire.org.git

wiki: Move navigation bar to base template

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

diff --git a/src/templates/wiki/base.html b/src/templates/wiki/base.html
index dd35246f..5fd678d6 100644
--- a/src/templates/wiki/base.html
+++ b/src/templates/wiki/base.html
@@ -7,6 +7,10 @@
 		</div>
 
 		<div class="col-12 col-lg-9">
+			{% if not request.path == "/" %}
+				{% module WikiNavbar(page) %}
+			{% end %}
+
 			{% block main %}{% end block %}
 		</div>
 	</div>
diff --git a/src/templates/wiki/page.html b/src/templates/wiki/page.html
index b63740d8..88e49dea 100644
--- a/src/templates/wiki/page.html
+++ b/src/templates/wiki/page.html
@@ -11,10 +11,6 @@
 {% end block %}
 
 {% block main %}
-	{% if not request.path == "/" %}
-		{% module WikiNavbar(page) %}
-	{% end %}
-
 	<div class="card mb-3">
 		<div class="card-body wiki-content">
 			{% raw page.html %}
diff --git a/src/templates/wiki/revisions.html b/src/templates/wiki/revisions.html
index 524813db..8c460552 100644
--- a/src/templates/wiki/revisions.html
+++ b/src/templates/wiki/revisions.html
@@ -3,10 +3,6 @@
 {% block title %}{{ _("Revisions of %s") % page.title }}{% end block %}
 
 {% block main %}
-	{% if not request.path == "/" %}
-		{% module WikiNavbar(page) %}
-	{% end %}
-
 	<div class="card mb-3">
 		<div class="card-body">
             <h4 class="card-title">{{ _("Revisions of %s") % page.title }}</h4>