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 dd35246f3131fbc81e39e122398a96964903d0b6..5fd678d6d9c8aca9b51b17f8cdddeeb42e1d69fb 100644 (file)
--- 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 b63740d819f9c591e77e566b08785232a224da99..88e49dea111ace9da17af33819602f5379b5f8fa 100644 (file)
--- 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 524813dbb597c32e6b471d5382dd2d209577b6a1..8c460552d0cae5cf8661d4448d696ee46ad3511e 100644 (file)
--- 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>