Display improvements

2 files changed, 5 insertions, 3 deletions

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 = "<p>Preview will appear here.</p>"
 
         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: