From 35760693b42b76aa2da01c953446a9d814e477ce Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 13:09:10 +0100
Subject: Fix preview/nav visibility

---
 pydis_site/templates/wiki/edit.html                  | 13 +++++++------
 pydis_site/templates/wiki/includes/article_menu.html |  2 +-
 pydis_site/templates/wiki/preview_inline.html        |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'pydis_site')

diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index 1e1caaf7..8bc05ffb 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -15,9 +15,9 @@
     </p>
   {% endif %}
 
-  <div class="row">
+  <div class="columns">
 
-    <div class="col-lg-8">
+    <div class="column is-8">
       <form method="POST" class="form-horizontal" id="article_edit_form">
         {% with edit_form as form %}
           {% include "wiki/includes/editor.html" %}
@@ -64,7 +64,7 @@
       </form>
     </div>
 
-    <div class="col-lg-4" id="wiki-edit-sidebar">
+    <div class="column is-4" id="wiki-edit-sidebar">
       {% include "wiki/includes/editor_sidebar.html" %}
     </div>
 
@@ -72,11 +72,12 @@
 
   <div style="clear: both"></div>
 
-  {% include "wiki/includes/modals.html" %}
-
   <div class="modal" id="previewModal">
     <div class="modal-background"></div>
-    <div class="modal-card" style="height: 50%;">
+    <div class="modal-card" style="height: 80%; width: 80%;">
+      <div class="modal-card-head">
+        <p class="modal-card-title">Article Preview</p>
+      </div>
       <div class="modal-card-body" style="padding: 0; overflow: hidden;">
         <iframe name="previewWindow" frameborder="0" style="width: 100%; height: 100%;"></iframe>
       </div>
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index c6cb6bf0..cbaf024c 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -1,6 +1,6 @@
 {% load i18n wiki_tags %}
 
-{% if not user.is_anonymous %}
+{% if article|can_write:user %}
   {% with selected_tab as selected %}
     <nav class="navbar is-light" role="navigation" aria-label="wiki navigation">
       <div class="container">
diff --git a/pydis_site/templates/wiki/preview_inline.html b/pydis_site/templates/wiki/preview_inline.html
index bfe81a0c..829fee4c 100644
--- a/pydis_site/templates/wiki/preview_inline.html
+++ b/pydis_site/templates/wiki/preview_inline.html
@@ -3,6 +3,7 @@
 
 {% block site_navbar %}{% endblock %}
 {% block site_footer %}{% endblock %}
+{% block wiki_breadcrumbs %}{% endblock %}
 
 {% block wiki_body %}
   {% if revision %}
-- 
cgit v1.2.3