]> git.ipfire.org Git - ipfire.org.git/commitdiff
wiki: Show a sidebar on file detail view
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Dec 2018 18:21:47 +0000 (18:21 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Dec 2018 18:21:47 +0000 (18:21 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/templates/wiki/files/detail.html
src/web/wiki.py

index 6ed3870fba45b7a498cb8041ee80553e298456df..fea6448c36a6cc0cd407dd2e209d4137d20ff1e9 100644 (file)
@@ -1,4 +1,4 @@
-{% extends "../base.html" %}
+{% extends "../page.html" %}
 
 {% block title %}{{ file.filename }}{% end block %}
 
index d92e4f0811c237889b00c2fb49ba07bc0f2fd62d..2a1dd45be28bd8bfef576c9db9567737882fde8f 100644 (file)
@@ -116,7 +116,12 @@ class FileHandler(base.BaseHandler):
 
                # Render detail page
                if self.action == "detail":
-                       self.render("wiki/files/detail.html", file=file)
+                       for breadcrumb, title in self.backend.wiki.make_breadcrumbs(path):
+                               page = self.backend.wiki.get_page(breadcrumb)
+                               if page:
+                                       break
+
+                       self.render("wiki/files/detail.html", page=page, file=file)
                        return
 
                size = self.get_argument_int("s", None)