From c4e683fff11c3c1bd33c95c1f741eb0c76fd99b2 Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Sat, 7 Apr 2018 15:02:35 +0100 Subject: Considerable progress on the wiki --- pysite/views/wiki/page.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pysite/views/wiki/page.py') diff --git a/pysite/views/wiki/page.py b/pysite/views/wiki/page.py index 01c8fa8a..66afd283 100644 --- a/pysite/views/wiki/page.py +++ b/pysite/views/wiki/page.py @@ -1,5 +1,6 @@ # coding=utf-8 from flask import redirect, url_for +from werkzeug.exceptions import NotFound from pysite.base_route import RouteView from pysite.constants import ALL_STAFF_ROLES @@ -20,7 +21,7 @@ class PageView(RouteView, DBMixin): if self.is_staff(): return redirect(url_for("wiki.edit", page=page)) - return self.render("wiki/page_missing.html", page=page) + raise NotFound() return self.render("wiki/page_view.html", page=page, data=obj) def is_staff(self): -- cgit v1.2.3 From 004d9e30eb02457af7db72a144628d3292af6431 Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Sat, 7 Apr 2018 15:33:20 +0100 Subject: Display improvements --- pysite/views/wiki/edit.py | 4 +++- pysite/views/wiki/page.py | 4 ++-- templates/wiki/base.html | 15 +++++++++++++++ templates/wiki/index.html | 9 --------- templates/wiki/page_edit.html | 16 ++++++++++------ templates/wiki/page_view.html | 6 +++--- 6 files changed, 33 insertions(+), 21 deletions(-) delete mode 100644 templates/wiki/index.html (limited to 'pysite/views/wiki/page.py') diff --git a/pysite/views/wiki/edit.py b/pysite/views/wiki/edit.py index 4a87044c..089da58d 100644 --- a/pysite/views/wiki/edit.py +++ b/pysite/views/wiki/edit.py @@ -20,14 +20,16 @@ class EditView(RouteView, DBMixin): def get(self, page): rst = "" title = "" + preview = "

Preview will appear here.

" obj = self.db.get(self.table_name, page) if obj: rst = obj["rst"] title = obj["title"] + preview = obj["html"] - return self.render("wiki/page_edit.html", page=page, rst=rst, title=title) + return self.render("wiki/page_edit.html", page=page, rst=rst, title=title, preview=preview) @require_roles(*ALL_STAFF_ROLES) @csrf diff --git a/pysite/views/wiki/page.py b/pysite/views/wiki/page.py index 66afd283..aa26a725 100644 --- a/pysite/views/wiki/page.py +++ b/pysite/views/wiki/page.py @@ -19,10 +19,10 @@ class PageView(RouteView, DBMixin): if obj is None: if self.is_staff(): - return redirect(url_for("wiki.edit", page=page)) + return redirect(url_for("wiki.edit", page=page, can_edit=False)) raise NotFound() - return self.render("wiki/page_view.html", page=page, data=obj) + return self.render("wiki/page_view.html", page=page, data=obj, can_edit=self.is_staff()) def is_staff(self): if not self.logged_in: diff --git a/templates/wiki/base.html b/templates/wiki/base.html index 32d58341..dd3c1dff 100644 --- a/templates/wiki/base.html +++ b/templates/wiki/base.html @@ -26,6 +26,21 @@
    + {% if can_edit and current_page == "page" %} +
  • + +  Edit Page + +
  • +
  • + {% elif current_page == "edit" %} +
  • + +  View Page + +
  • +
  • + {% endif %}
  • Placeholder
  • Parent diff --git a/templates/wiki/index.html b/templates/wiki/index.html deleted file mode 100644 index 27e94d61..00000000 --- a/templates/wiki/index.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "wiki/base.html" %} -{% block title %}Wiki | Home{% endblock %} -{% block og_title %}Wiki | Home{% endblock %} -{% block og_description %}Landing page for the wiki{% endblock %} -{% block content %} -

    - Placeholder text. -

    -{% endblock %} \ No newline at end of file diff --git a/templates/wiki/page_edit.html b/templates/wiki/page_edit.html index 37aadc13..7610be34 100644 --- a/templates/wiki/page_edit.html +++ b/templates/wiki/page_edit.html @@ -1,6 +1,6 @@ {% extends "wiki/base.html" %} -{% block title %}Wiki | Home{% endblock %} -{% block og_title %}Wiki | Home{% endblock %} +{% block title %}Wiki | Edit: {{ page }}{% endblock %} +{% block og_title %}Wiki | Edit: {{ page }}{% endblock %} {% block og_description %}Landing page for the wiki{% endblock %} {% block extra_head %} @@ -17,17 +17,17 @@
-
{{ rst }}
+
{{ rst }}
-

Preview

+

Preview

-
-

Preview will appear here.

+
+ {{ preview | safe }}