16 files changed, 14 insertions, 178 deletions
diff --git a/pydis_site/templates/wiki/delete.html b/pydis_site/templates/wiki/delete.html
index 1be82fa9..a7f837fe 100644
--- a/pydis_site/templates/wiki/delete.html
+++ b/pydis_site/templates/wiki/delete.html
@@ -8,7 +8,7 @@
   <h1 class="title is-1">Delete "{{ article.current_revision.title }}"</h1>
 
   {% if cannot_delete_root %}
-    <div class="message is-warning">
+    <article class="message is-warning">
       <div class="message-body">
         <p>
           You cannot delete the root article.
@@ -21,10 +21,10 @@
           <span>Go back</span>
         </a>
       </div>
-    </div>
+    </article>
   {% else %}
     {% if cannot_delete_children %}
-      <div class="message is-warning">
+      <article class="message is-warning">
         <div class="message-body">
           <p>
             You do not have permission to delete articles that have children.
@@ -37,7 +37,7 @@
             <span>Go back</span>
           </a>
         </div>
-      </div>
+      </article>
     {% endif %}
 
     {% if delete_children %}
diff --git a/pydis_site/templates/wiki/deleted.html b/pydis_site/templates/wiki/deleted.html
index a767ddbf..75705cbb 100644
--- a/pydis_site/templates/wiki/deleted.html
+++ b/pydis_site/templates/wiki/deleted.html
@@ -5,7 +5,7 @@
 {% block wiki_pagetitle %}Article deleted{% endblock %}
 
 {% block wiki_contents %}
-  <div class="message is-warning">
+  <article class="message is-warning">
     <div class="message-header">
       <p>Article deleted</p>
     </div>
@@ -14,7 +14,7 @@
         The article you were looking for has been deleted.
       </p>
     </div>
-  </div>
+  </article>
 
   {% if not article.current_revision.locked or article|can_delete:user %}
 
diff --git a/pydis_site/templates/wiki/error.html b/pydis_site/templates/wiki/error.html
index 04e6948a..c6778b7e 100644
--- a/pydis_site/templates/wiki/error.html
+++ b/pydis_site/templates/wiki/error.html
@@ -12,7 +12,7 @@
   {% if error_type == "ancestors_missing" %}
     <h1 class="title">Not Found</h1>
 
-    <div class="message is-primary">
+    <article class="message is-primary">
       <div class="message-body">
         <p>
           We were unable to find that page. If you think this was in error, please let us know!
@@ -24,11 +24,11 @@
           <span>Back to homepage</span>
         </a>
       </div>
-    </div>
+    </article>
   {% else %}
     <h1 class="title">Error</h1>
 
-    <div class="message is-danger">
+    <article class="message is-danger">
       <div class="message-body">
         <p>
           {% if not error_msg %}
@@ -47,6 +47,6 @@
           </a>
         {% endif %}
       </div>
-    </div>
+    </article>
   {% endif %}
 {% endblock %}
diff --git a/pydis_site/templates/wiki/forms/markitup-admin.html b/pydis_site/templates/wiki/forms/markitup-admin.html
deleted file mode 100644
index d35bedb5..00000000
--- a/pydis_site/templates/wiki/forms/markitup-admin.html
+++ /dev/null
@@ -1 +0,0 @@
-<textarea name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>{% if widget.value %}{{ widget.value }}{% endif %}</textarea>
diff --git a/pydis_site/templates/wiki/forms/markitup.html b/pydis_site/templates/wiki/forms/markitup.html
deleted file mode 100644
index 87337e67..00000000
--- a/pydis_site/templates/wiki/forms/markitup.html
+++ /dev/null
@@ -1 +0,0 @@
-<div><textarea name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>{% if widget.value %}{{ widget.value }}{% endif %}</textarea></div>
diff --git a/pydis_site/templates/wiki/forms/select.html b/pydis_site/templates/wiki/forms/select.html
deleted file mode 100644
index 95bb06ed..00000000
--- a/pydis_site/templates/wiki/forms/select.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div{% include "django/forms/widgets/attrs.html" %}>
-  <button class="btn btn-group-label{{ disabled }}" type="button">{{ label }}</button>
-  <button class="btn btn-default dropdown-toggle{{ disabled }}" type="button" data-toggle="dropdown">
-        <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu">{% for group_name, group_choices, group_index in widget.optgroups %}
-      {% if group_name %}<li class="divider" label="{{ group_name }}"></li>{% endif %}
-      {% for option in group_choices %}
-      {% include option.template_name with widget=option %}
-      {% endfor %}
-      {% endfor %}
-    </ul>
-    <input type="hidden" name="{{ widget.name }}" value="" class="btn-group-value" />
-</div>
-<noscript>{{ noscript }}</noscript>
diff --git a/pydis_site/templates/wiki/forms/select_option.html b/pydis_site/templates/wiki/forms/select_option.html
deleted file mode 100644
index 30ff9787..00000000
--- a/pydis_site/templates/wiki/forms/select_option.html
+++ /dev/null
@@ -1 +0,0 @@
-<li><a href="javascript:void(0)" data-value="{{ widget.value|stringformat:'s' }}"{% include "django/forms/widgets/attrs.html" %}>{{ widget.label }}</a></li>
diff --git a/pydis_site/templates/wiki/forms/text.html b/pydis_site/templates/wiki/forms/text.html
deleted file mode 100644
index 23246aa8..00000000
--- a/pydis_site/templates/wiki/forms/text.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="input-group"><span class="input-group-addon">{{ prepend }}</span>{% include "django/forms/widgets/input.html" %}</div>
diff --git a/pydis_site/templates/wiki/includes/modals.html b/pydis_site/templates/wiki/includes/modals.html
deleted file mode 100644
index b86d4f65..00000000
--- a/pydis_site/templates/wiki/includes/modals.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% load sekizai_tags static %}
-{% addtoblock "js" %}
-<script type="text/javascript" src="{% static "wiki/js/jquery-ui-1.12.1.custom/jquery-ui.min.js" %}"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-  $(".modal-content").on("resizestart", function(event, ui) {
-    $(ui.element).find(".modal-body, iframe").each(function() {
-      elem = $(this);
-      elem.data("resizeoriginalheight", elem.height());
-    });
-  });
-
-  $(".modal-content").on("resize", function(event, ui) {
-      ui.element.parents('.modal-dialog').css("margin-left", -ui.size.width/2);
-      ui.element.parents('.modal-dialog').css("margin-top", -ui.size.height/2);
-      ui.element.parents('.modal-dialog').css("top", "50%");
-      ui.element.parents('.modal-dialog').css("left", "50%");
-
-      $(ui.element).find(".modal-body,iframe").each(function() {
-        elem = $(this);
-        $(this).css("min-height", elem.data("resizeoriginalheight") + ui.size.height - ui.originalSize.height);
-      });
-  });
-
-  $(".modal-content").resizable();
-});
-</script>
-{% endaddtoblock %}
-{% addtoblock "css" %}
-<link rel="stylesheet" href="{% static "wiki/js/jquery-ui-1.12.1.custom/jquery-ui.min.css" %}" type="text/css" />
-{% endaddtoblock %}
diff --git a/pydis_site/templates/wiki/includes/move_tree.html b/pydis_site/templates/wiki/includes/move_tree.html
deleted file mode 100644
index af7e422b..00000000
--- a/pydis_site/templates/wiki/includes/move_tree.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% load wiki_tags %}
-
-<li class="{% if current_path.path|starts_with:urlpath.path %}disabled{% endif%} {% if current_path.children.count %}dropdown-submenu{% endif %}">
-  <a tabindex="-1" href="#"
-    {% if not current_path.path|starts_with:urlpath.path %}
-        onclick="select_path('{{current_path.pk}}', '{{current_path.path|escapejs}}');" {% endif %}>
-    {{current_path.article}}
-  </a>
-  {% if current_path.children.count %}
-    <ul class="dropdown-menu">
-      {% for current_path in current_path.get_ordered_children %}
-        {% with template_name="wiki/includes/move_tree.html" %}{% include template_name %}{% endwith %}
-      {% endfor %}
-    </ul>
-  {% endif %}
-</li>
diff --git a/pydis_site/templates/wiki/move.html b/pydis_site/templates/wiki/move.html
index f2c83485..0d5cec31 100644
--- a/pydis_site/templates/wiki/move.html
+++ b/pydis_site/templates/wiki/move.html
@@ -5,7 +5,7 @@
 
 {% block wiki_contents_tab %}
 
-  <div class="message is-warning">
+  <article class="message is-warning">
     <div class="message-body">
       {% if urlpath.get_descendants %}
         {% blocktrans count cnt=urlpath.get_descendants.count trimmed %}
@@ -28,7 +28,7 @@
         are temporary - so it's better to update the links directly.
       </p>
     </div>
-  </div>
+  </article>
 
 <form method="POST" class="form-horizontal" id="article_move_form">
   {% wiki_form form %}
diff --git a/pydis_site/templates/wiki/permission_denied.html b/pydis_site/templates/wiki/permission_denied.html
index 3314a79d..58394c8f 100644
--- a/pydis_site/templates/wiki/permission_denied.html
+++ b/pydis_site/templates/wiki/permission_denied.html
@@ -4,7 +4,7 @@
 {% block wiki_pagetitle %}Permission Denied{% endblock %}
 
 {% block wiki_contents %}
-  <div class="message is-danger">
+  <article class="message is-danger">
     <div class="message-header">
       <p>Permission Denied</p>
     </div>
@@ -32,5 +32,5 @@
         </a>
       {% endif %}
     </div>
-  </div>
+  </article>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/plugins/notifications/menubaritem.html b/pydis_site/templates/wiki/plugins/notifications/menubaritem.html
deleted file mode 100644
index 6f1b6000..00000000
--- a/pydis_site/templates/wiki/plugins/notifications/menubaritem.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% load i18n sekizai_tags static %}
-
-  <li class="divider notification-before-list"></li>
-  <li class="notifications-empty"><a href="#"><em>{% trans "No notifications" %}</em></a></li>
-  <li class="divider"></li>
-  <li>
-    <a href="#" onclick="notify_mark_read()">
-      <i class="fa fa-check-square-o"></i>
-      {% trans "Clear notifications list" %}
-    </a>
-  </li>
-  <li>
-    <a href="{% url 'wiki:notification_settings' %}">
-      <i class="fa fa-wrench"></i>
-      {% trans "Notification settings" %}
-    </a>
-  </li>
-{% addtoblock "js" %}
-<script type="text/javascript">
-  URL_NOTIFY_GET_NEW = "{% url "nyt:json_get" %}";
-  URL_NOTIFY_MARK_READ = "{% url "nyt:json_mark_read_base" %}";
-  URL_NOTIFY_GOTO = "{% url "nyt:goto_base" %}";
-</script>
-{% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{% static "wiki/plugins/notifications/js/ui.js" %}"></script>{% endaddtoblock %}
diff --git a/pydis_site/templates/wiki/plugins/notifications/settings.html b/pydis_site/templates/wiki/plugins/notifications/settings.html
deleted file mode 100644
index 51b0245e..00000000
--- a/pydis_site/templates/wiki/plugins/notifications/settings.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% extends "wiki/base.html" %}
-{% load wiki_tags i18n humanize %}
-
-
-{% block wiki_pagetitle %}{% trans "Notifications" %}: {{ article.current_revision.title }}{% endblock %}
-
-{% block wiki_contents %}
-
-<h1>{% trans "Your notification settings" %}</h1>
-<p class="lead">
-  {% trans "Manage how often you receive notifications" %}
-</p>
-
-<form method="POST" class="form-horizontal">
-  {% include "wiki/includes/formerrors.html" with form=formset.management_form %}
-  {% csrf_token %}
-  {{ formset.management_form }}
-  {% for form in formset %}
-    <fieldset>
-      <legend>{% trans "Settings for" %} {{ form.instance.articlesubscriptions.count }} {% trans "articles" %}</legend>
-      {% include "wiki/includes/formerrors.html" with form=form %}
-      {% for field in form %}
-        {% include "wiki/includes/formfield.html" %}
-      {% endfor %}
-    </fieldset>
-  {% empty %}
-  <em>{% trans "You are not subscribed to any notifications yet." %}</em>
-  {% endfor %}
-  {% if formset.forms %}
-  <div class="form-group form-actions">
-    <div class="col-lg-2"></div>
-    <div class="col-lg-10">
-      <button type="submit" class="btn btn-primary">
-        <span class="fa fa-check"></span>
-        {% trans "Save changes" %}
-      </button>
-    </div>
-  </div>
-  {% endif %}
-</form>
-
-<div class="row">
-</div>
-{% endblock %}
diff --git a/pydis_site/templates/wiki/plugins/templatetags/article_list.html b/pydis_site/templates/wiki/plugins/templatetags/article_list.html
deleted file mode 100644
index 842ac3cb..00000000
--- a/pydis_site/templates/wiki/plugins/templatetags/article_list.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% load wiki_macro_tags %}
-
-
-<li>
-  <a href="{% url 'wiki:get' path=parent.path article_id=parent.article.id %}">
-    {{ parent.article.current_revision.title }}
-    {% if not parent.article.other_read %}<i class="fa fa-lock"></i>{% endif %}
-  </a>
-{% if parent.article.other_read %}
-  {% with parent.children.active.default_order as children %}
-  {% if parent.level < depth and children.count %}
-    <ul>
-        {% for child in children %}
-            {% article_list child depth %}
-        {% endfor %}
-    </ul>
-  {% endif %}
-  {% endwith %}
-{% endif %}
-</li>
diff --git a/pydis_site/templates/wiki/view.html b/pydis_site/templates/wiki/view.html
deleted file mode 100644
index 2becdaae..00000000
--- a/pydis_site/templates/wiki/view.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "wiki/article.html" %}
-{% load wiki_tags i18n sekizai_tags %}
-
-
-{% block wiki_contents_tab %}
-
-  {% wiki_render article %}
-
-{% endblock %}