From: Michael Tremer Date: Tue, 19 May 2020 16:17:34 +0000 (+0000) Subject: wiki: Add tree X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86368c12976cf5010241eb6b7f9752725c712e24;p=ipfire.org.git wiki: Add tree This lists all pages on the wiki Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index c88e0cfe..63c51e1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -323,6 +323,7 @@ templates_wiki_DATA = \ src/templates/wiki/recent-changes.html \ src/templates/wiki/revisions.html \ src/templates/wiki/search-results.html \ + src/templates/wiki/tree.html \ src/templates/wiki/watchlist.html templates_wikidir = $(templatesdir)/wiki diff --git a/src/backend/wiki.py b/src/backend/wiki.py index 2fb898d7..d2212ec9 100644 --- a/src/backend/wiki.py +++ b/src/backend/wiki.py @@ -23,6 +23,14 @@ class Wiki(misc.Object): if res: return Page(self.backend, res.id, data=res) + def __iter__(self): + return self._get_pages( + "SELECT wiki.* FROM wiki_current current \ + LEFT JOIN wiki ON current.id = wiki.id \ + WHERE current.deleted IS FALSE \ + ORDER BY page", + ) + def make_path(self, page, path): # Nothing to do for absolute links if path.startswith("/"): diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index 2b781ed3..772a14d5 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -46,7 +46,7 @@ $font-weight-bold: 700; // Typo $font-size-base: 1.125rem; $lead-font-size: 1.5rem; -$small-font-size: 87.5%; +$small-font-size: 85%; $line-height-base: 1.5; diff --git a/src/templates/base.html b/src/templates/base.html index 3c3ca4d1..bee5bb0d 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -353,12 +353,16 @@
diff --git a/src/templates/wiki/tree.html b/src/templates/wiki/tree.html new file mode 100644 index 00000000..a2d1bb20 --- /dev/null +++ b/src/templates/wiki/tree.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} + +{% block title %}{{ _("Tree") }}{% end block %} + +{% block main %} +
+
+
+
+

{{ _("Tree") }}

+
+
+
+
+ +
+
+ {% for page in pages %} + {% if page.check_acl(current_user) %} +
+

+ {% for p, title in backend.wiki.make_breadcrumbs(page.page) %} + {{ title }} / + {% end %} + + {{ page.title or _("- No Title -") }} +

+ + + {{ page.page }} ‐ + {{ _("Last edited %s") % locale.format_date(page.timestamp, shorter=True) }} + +
+ {% end %} + {% end %} +
+
+{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index eec28f2d..f94d06cd 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -320,6 +320,7 @@ class Application(tornado.web.Application): # Handlers (r"/recent\-changes", wiki.RecentChangesHandler), (r"/search", wiki.SearchHandler), + (r"/tree", wiki.TreeHandler), (r"/watchlist", wiki.WatchlistHandler), # Media diff --git a/src/web/wiki.py b/src/web/wiki.py index ca0f1b35..f417e22a 100644 --- a/src/web/wiki.py +++ b/src/web/wiki.py @@ -358,6 +358,11 @@ class RecentChangesHandler(auth.CacheMixin, base.BaseHandler): self.render("wiki/recent-changes.html", recent_changes=recent_changes) +class TreeHandler(auth.CacheMixin, base.BaseHandler): + def get(self): + self.render("wiki/tree.html", pages=self.backend.wiki) + + class WatchlistHandler(auth.CacheMixin, base.BaseHandler): @tornado.web.authenticated def get(self):