wiki: Show sidebar

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

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index e2a8e45ed7db6cebd62c08afd4dd88f83128a485..42507e97066d6baa82f1005f4ff90421d5cec655 100644 (file)
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -165,3 +165,16 @@ class Page(misc.Object):
 
        def get_latest_revision(self):
                return self.backend.wiki.get_page(self.page)
+
+       # Sidebar
+
+       @lazy_property
+       def sidebar(self):
+               parts = self.page.split("/")
+
+               while parts:
+                       sidebar = self.backend.wiki.get_page(os.path.join(*parts, "sidebar"))
+                       if sidebar:
+                               return sidebar
+
+                       parts.pop()

diff --git a/src/templates/wiki/page.html b/src/templates/wiki/page.html
index 4fe9574ef5c1c248bec49880a2c690181a877a40..64760d7ffe9d6cfab21e7d6a24e54ac62c013843 100644 (file)
--- a/src/templates/wiki/page.html
+++ b/src/templates/wiki/page.html
@@ -2,6 +2,12 @@
 
 {% block title %}{{ page.title }}{% end block %}
 
+{% block sidebar %}
+       {% if page.sidebar %}
+               {% raw page.sidebar.html %}
+       {% end %}
+{% end block %}
+
 {% block main %}
        {% module WikiNavbar(page) %}