From 0a2d2d51cde2d70ab9f366008539fbd97059850d Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sun, 14 Apr 2019 18:59:30 +0100
Subject: More styling - breadcrumbs and messages

---
 .../templates/wiki/includes/article_menu.html      |  9 ++--
 .../templates/wiki/includes/breadcrumbs.html       | 59 +++++++++++-----------
 pydis_site/templates/wiki/includes/messages.html   | 10 ++--
 3 files changed, 41 insertions(+), 37 deletions(-)

(limited to 'pydis_site/templates/wiki/includes')

diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index 1d9d2a12..db62d28d 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -4,10 +4,6 @@
   <nav class="navbar is-light" role="navigation" aria-label="wiki navigation">
     <div class="container">
       <div class="navbar-brand">
-        {% block wiki_breadcrumbs %}
-          {% include "wiki/includes/breadcrumbs.html" %}
-        {% endblock %}
-
         <a role="button" class="navbar-burger" data-target="wiki-menu" aria-label="menu" aria-expanded="false">
           <span aria-hidden="true"></span>
           <span aria-hidden="true"></span>
@@ -16,6 +12,11 @@
       </div>
 
       <div class="navbar-menu" id="wiki-menu">
+        <div class="navbar-start">
+          {% block wiki_breadcrumbs %}
+            {% include "wiki/includes/breadcrumbs.html" %}
+          {% endblock %}
+        </div>
         <div class="navbar-end">
           {% if not user.is_anonymous %}
             <a class="navbar-item{% if selected == "settings" %} is-active{% endif %}"
diff --git a/pydis_site/templates/wiki/includes/breadcrumbs.html b/pydis_site/templates/wiki/includes/breadcrumbs.html
index 16060236..5894da07 100644
--- a/pydis_site/templates/wiki/includes/breadcrumbs.html
+++ b/pydis_site/templates/wiki/includes/breadcrumbs.html
@@ -1,22 +1,5 @@
 {% load i18n %}
-{% if urlpath %}
-
-  <div class="navbar-item">
-    <nav class="breadcrumb" aria-label="breadcrumbs">
-      {% for ancestor in urlpath.cached_ancestors %}
-        <li>
-          <a href="{% url 'wiki:get' path=ancestor.path %}">{{ ancestor.article.current_revision.title|truncatechars:25 }}</a>
-        </li>
-      {% endfor %}
-
-      <li class="active">
-        <a href="{% url 'wiki:get' path=article.path %}">{{ article.current_revision.title|truncatechars:25 }}</a>
-      </li>
-    </nav>
-  </div>
-
-  <hr class="navbar-divider">
-
+{% if urlpath and article %}
   <div class="navbar-item has-dropdown is-hoverable">
     <a class="navbar-link">Sub-Articles</a>
 
@@ -43,19 +26,37 @@
     </div>
   </div>
 
-  <div class="navbar-item has-dropdown is-hoverable">
-    <a class="navbar-link">Create Article</a>
+  {% if request.user.is_authenticated %}
+    <div class="navbar-item has-dropdown is-hoverable">
+      <a class="navbar-link">Create Article</a>
 
-    <div class="navbar-dropdown">
-      {% if urlpath.parent %}
-        <a class="navbar-item" href="{% url 'wiki:create' path=urlpath.parent.path %}">
-          At current level
-        </a>
-      {% endif %}
+      <div class="navbar-dropdown">
+        {% if urlpath.parent %}
+          <a class="navbar-item" href="{% url 'wiki:create' path=urlpath.parent.path %}">
+            At current level
+          </a>
+        {% endif %}
 
-      <a class="navbar-item" href="{% url 'wiki:create' path=urlpath.path %}">
-        Below current level
-      </a>
+        <a class="navbar-item" href="{% url 'wiki:create' path=urlpath.path %}">
+          Below current level
+        </a>
+      </div>
     </div>
+  {% endif %}
+
+  <hr class="navbar-divider">
+
+  <div class="navbar-item">
+    <nav class="breadcrumb" aria-label="breadcrumbs">
+      {% for ancestor in urlpath.cached_ancestors %}
+        <li>
+          <a href="{% url 'wiki:get' path=ancestor.path %}">{{ ancestor.article.current_revision.title|truncatechars:25 }}</a>
+        </li>
+      {% endfor %}
+
+      <li class="active">
+        <a href="{% url 'wiki:get' path=article.path %}">{{ article.current_revision.title|truncatechars:25 }}</a>
+      </li>
+    </nav>
   </div>
 {% endif %}
diff --git a/pydis_site/templates/wiki/includes/messages.html b/pydis_site/templates/wiki/includes/messages.html
index f8362829..cdf58d87 100644
--- a/pydis_site/templates/wiki/includes/messages.html
+++ b/pydis_site/templates/wiki/includes/messages.html
@@ -1,9 +1,11 @@
 {% if messages %}
   <!-- Messages for this instance -->
   {% for message in messages %}
-    <div class="{{ message.css_class }}">
-      <a class="close" data-dismiss="alert" href="#">&times;</a>
-      {{ message }}
-    </div>
+    <article class="message {{ message.css_class }}">
+      <div class="message-body">
+        {{ message }}
+      </div>
+    </article>
+
   {% endfor %}
 {% endif %}
-- 
cgit v1.2.3