- {% raw page.html %} +

+ {% raw page.html %} +

+ -

- - {{ _("Edit Page") }} - {% if not current_user %}‐ {{ _("Yes, you can edit!") }}{% end %} - -

+ + + + + + + {{ _("Edit Page") }} + {% if not current_user %}‐ {{ _("Yes, you can edit!") }}{% end %} + + + +

- {% if current_user %} - {% if page.is_watched_by(current_user) %} - - {% else %} - - {% end %} • - {% end %} +

+ {% if current_user %} + {% if page.is_watched_by(current_user) %} + + + + {% else %} + + + + {% end %} + {% end %} - - {{ _("Older Revisions") }} - + + {{ _("Older Revisions") }} + - • +

+ {{ locale.format_date(page.timestamp) }} +

- {{ locale.format_date(page.timestamp) }} - - {% if page.author %} - • - - - {{ page.author }} - - {% end %} -

+ {% if page.author %} + + {{ page.author }} + + {% end %} +

{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 633d923e..5e95bc93 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -70,6 +70,9 @@ class Application(tornado.web.Application): "BootMenuHeader" : boot.MenuHeaderModule, "BootMenuSeparator" : boot.MenuSeparatorModule, + # Docs + "DocsHeader" : docs.HeaderModule, + # People "Agent" : people.AgentModule, "CDR" : people.CDRModule, @@ -91,7 +94,6 @@ class Application(tornado.web.Application): # Wiki "WikiDiff" : wiki.WikiDiffModule, - "WikiNavbar" : wiki.WikiNavbarModule, "WikiList" : wiki.WikiListModule, # Misc diff --git a/src/web/docs.py b/src/web/docs.py index 0e87bb6c..4f20b5d9 100644 --- a/src/web/docs.py +++ b/src/web/docs.py @@ -4,6 +4,7 @@ import difflib import tornado.web from . import base +from . import ui_modules class PageHandler(base.BaseHandler): @property @@ -85,4 +86,29 @@ class PageHandler(base.BaseHandler): latest_revision = page.get_latest_revision() # Render page - self.render("wiki/page.html", page=page, latest_revision=latest_revision) + self.render("docs/page.html", page=page, latest_revision=latest_revision) + + +class HeaderModule(ui_modules.UIModule): + @property + def page(self): + """ + Returns the path of the page (without any actions) + """ + path = self.request.path.removeprefix("/docs") + + return "/".join((p for p in path.split("/") if not p.startswith("_"))) + + def render(self, suffix=None): + _ = self.locale.translate + + breadcrumbs = self.backend.wiki.make_breadcrumbs(self.page) + title = self.backend.wiki.get_page_title(self.page) + + if self.request.path.endswith("/_edit"): + suffix = _("Edit") + elif self.request.path.endswith("/_files"): + suffix = _("Files") + + return self.render_string("docs/modules/header.html", + breadcrumbs=breadcrumbs, page=self.page, page_title=title, suffix=suffix) diff --git a/src/web/wiki.py b/src/web/wiki.py index 42876fc2..674ebba0 100644 --- a/src/web/wiki.py +++ b/src/web/wiki.py @@ -391,40 +391,3 @@ class WikiListModule(ui_modules.UIModule): return self.render_string("wiki/modules/list.html", link_revision=link_revision, pages=pages, show_breadcrumbs=show_breadcrumbs, show_author=show_author, show_changes=show_changes) - - -class WikiNavbarModule(ui_modules.UIModule): - @property - def path(self): - """ - Returns the path of the page (without any actions) - """ - path = self.request.path.split("/") - - if path and path[-1].startswith("_"): - path.pop() - - return "/".join(path) - - def render(self, suffix=None): - _ = self.locale.translate - - # Make the path - page = self.request.path.split("/") - - # Drop the action bit - if page and page[-1].startswith("_"): - page.pop() - - page = "/".join(page) - - breadcrumbs = self.backend.wiki.make_breadcrumbs(page) - title = self.backend.wiki.get_page_title(page) - - if self.request.path.endswith("/_edit"): - suffix = _("Edit") - elif self.request.path.endswith("/_files"): - suffix = _("Files") - - return self.render_string("wiki/modules/navbar.html", - breadcrumbs=breadcrumbs, page=page, page_title=title, suffix=suffix)

{{ page_title or _("IPFire Docs") }}