From 9b042c3be5e52da3d6231d7fd551b6eede429b3a Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 8 Apr 2019 11:47:36 +0100
Subject: Add django-wiki, and downgrade to Django 2.1

Downgrade required by django-wiki for now
---
 Pipfile      |   3 +-
 Pipfile.lock | 176 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 141 insertions(+), 38 deletions(-)

diff --git a/Pipfile b/Pipfile
index 932746d2..1fd34c35 100644
--- a/Pipfile
+++ b/Pipfile
@@ -16,7 +16,7 @@ coverage = "~=4.5.3"
 unittest-xml-reporting = "~=2.5.1"
 
 [packages]
-django = "~=2.2"
+django = "~=2.1"
 django-crispy-forms = "~=1.7.2"
 django-environ = "~=0.4.5"
 django-filter = "~=2.1.0"
@@ -27,6 +27,7 @@ uwsgi = "~=2.0.18"
 psycopg2-binary = "~=2.8"
 django-simple-bulma = ">=1.1.6,<2.0"
 django-crispy-bulma = ">=0.1.2,<2.0"
+wiki = "~=0.4.4"
 
 [requires]
 python_version = "3.7"
diff --git a/Pipfile.lock b/Pipfile.lock
index c574a6f1..a908b8c7 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "e7a956892e9d18b6ac8ab13fe8e139d29196e236fbb194f4cb8b37308ea91c6e"
+            "sha256": "a63ccdec81594bd69f4af503e5a62fe01a74adfd6daaaa0fb9be08b25631cb84"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -16,13 +16,27 @@
         ]
     },
     "default": {
+        "bleach": {
+            "hashes": [
+                "sha256:0ee95f6167129859c5dce9b1ca291ebdb5d8cd7e382ca0e237dfd0dad63f63d8",
+                "sha256:24754b9a7d530bf30ce7cbc805bc6cce785660b4a10ff3a43633728438c105ab"
+            ],
+            "version": "==2.1.4"
+        },
         "django": {
             "hashes": [
-                "sha256:7c3543e4fb070d14e10926189a7fcf42ba919263b7473dceaefce34d54e8a119",
-                "sha256:a2814bffd1f007805b19194eb0b9a331933b82bd5da1c3ba3d7b7ba16e06dc4b"
+                "sha256:0fd54e4f27bc3e0b7054a11e6b3a18fa53f2373f6b2df8a22e8eadfe018970a5",
+                "sha256:f3b28084101d516f56104856761bc247f85a2a5bbd9da39d9f6197ff461b3ee4"
             ],
             "index": "pypi",
-            "version": "==2.2"
+            "version": "==2.1.8"
+        },
+        "django-classy-tags": {
+            "hashes": [
+                "sha256:792f9161d0e22d55b4fab6fc297bab8ab072ffaa3075b227613a6d8473624db8",
+                "sha256:f6d12f5a4df3e387795a0d9ef2836af389cae9a1fbebda035dac043d4722b1f7"
+            ],
+            "version": "==0.8.0"
         },
         "django-crispy-bulma": {
             "hashes": [
@@ -64,6 +78,34 @@
             "index": "pypi",
             "version": "==3.0"
         },
+        "django-js-asset": {
+            "hashes": [
+                "sha256:8ec12017f26eec524cab436c64ae73033368a372970af4cf42d9354fcb166bdd",
+                "sha256:c163ae80d2e0b22d8fb598047cd0dcef31f81830e127cfecae278ad574167260"
+            ],
+            "version": "==1.2.2"
+        },
+        "django-mptt": {
+            "hashes": [
+                "sha256:18a41d1b56ca7c02a5b04d246e33ee2d18f6ee5459c02ed1d945f5abdef23a2e",
+                "sha256:689a04cce0981671d6061a9928c33a16b47abb0d4cd43cf7dec31ae284fdae9d"
+            ],
+            "version": "==0.9.1"
+        },
+        "django-nyt": {
+            "hashes": [
+                "sha256:02c828e483606addbaeea8c08d4c7301be6fdba5e00f03b7a984b4cbae353e21",
+                "sha256:bf65e3d7e138b3c00879b6a7420c1f4f897e6bd6a9d2f09d7cd7ac5f623d8448"
+            ],
+            "version": "==1.1.2"
+        },
+        "django-sekizai": {
+            "hashes": [
+                "sha256:39c5d16ad694aa78278ca84fdc7b9f953ebcf94e2fc95b68c875d02014303260",
+                "sha256:cbd48e7be29e8cc4108476b9420d7c391fc509a504bc20b60616b116ba6ea51e"
+            ],
+            "version": "==0.10.0"
+        },
         "django-simple-bulma": {
             "hashes": [
                 "sha256:420042e26dd4bc70b148fc721bd77a48130b62b3d91b977e56f8232a4cfac555",
@@ -87,6 +129,13 @@
             "index": "pypi",
             "version": "==0.2.1"
         },
+        "html5lib": {
+            "hashes": [
+                "sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3",
+                "sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"
+            ],
+            "version": "==1.0.1"
+        },
         "libsass": {
             "hashes": [
                 "sha256:2ae3b061a7d250fb47e5fdad1a8191600ca15dc604e76b109b6d3bf8e08fd2ed",
@@ -108,39 +157,77 @@
             ],
             "version": "==0.18.0"
         },
+        "markdown": {
+            "hashes": [
+                "sha256:9ba587db9daee7ec761cfc656272be6aabe2ed300fece21208e4aab2e457bc8f",
+                "sha256:a856869c7ff079ad84a3e19cd87a64998350c2b94e9e08e44270faef33400f81"
+            ],
+            "version": "==2.6.11"
+        },
+        "pillow": {
+            "hashes": [
+                "sha256:15c056bfa284c30a7f265a41ac4cbbc93bdbfc0dfe0613b9cb8a8581b51a9e55",
+                "sha256:1a4e06ba4f74494ea0c58c24de2bb752818e9d504474ec95b0aa94f6b0a7e479",
+                "sha256:1c3c707c76be43c9e99cb7e3d5f1bee1c8e5be8b8a2a5eeee665efbf8ddde91a",
+                "sha256:1fd0b290203e3b0882d9605d807b03c0f47e3440f97824586c173eca0aadd99d",
+                "sha256:24114e4a6e1870c5a24b1da8f60d0ba77a0b4027907860188ea82bd3508c80eb",
+                "sha256:258d886a49b6b058cd7abb0ab4b2b85ce78669a857398e83e8b8e28b317b5abb",
+                "sha256:33c79b6dd6bc7f65079ab9ca5bebffb5f5d1141c689c9c6a7855776d1b09b7e8",
+                "sha256:367385fc797b2c31564c427430c7a8630db1a00bd040555dfc1d5c52e39fcd72",
+                "sha256:3c1884ff078fb8bf5f63d7d86921838b82ed4a7d0c027add773c2f38b3168754",
+                "sha256:44e5240e8f4f8861d748f2a58b3f04daadab5e22bfec896bf5434745f788f33f",
+                "sha256:46aa988e15f3ea72dddd81afe3839437b755fffddb5e173886f11460be909dce",
+                "sha256:74d90d499c9c736d52dd6d9b7221af5665b9c04f1767e35f5dd8694324bd4601",
+                "sha256:809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5",
+                "sha256:85d1ef2cdafd5507c4221d201aaf62fc9276f8b0f71bd3933363e62a33abc734",
+                "sha256:8c3889c7681af77ecfa4431cd42a2885d093ecb811e81fbe5e203abc07e0995b",
+                "sha256:9218d81b9fca98d2c47d35d688a0cea0c42fd473159dfd5612dcb0483c63e40b",
+                "sha256:9aa4f3827992288edd37c9df345783a69ef58bd20cc02e64b36e44bcd157bbf1",
+                "sha256:9d80f44137a70b6f84c750d11019a3419f409c944526a95219bea0ac31f4dd91",
+                "sha256:b7ebd36128a2fe93991293f997e44be9286503c7530ace6a55b938b20be288d8",
+                "sha256:c4c78e2c71c257c136cdd43869fd3d5e34fc2162dc22e4a5406b0ebe86958239",
+                "sha256:c6a842537f887be1fe115d8abb5daa9bc8cc124e455ff995830cc785624a97af",
+                "sha256:cf0a2e040fdf5a6d95f4c286c6ef1df6b36c218b528c8a9158ec2452a804b9b8",
+                "sha256:cfd28aad6fc61f7a5d4ee556a997dc6e5555d9381d1390c00ecaf984d57e4232",
+                "sha256:dca5660e25932771460d4688ccbb515677caaf8595f3f3240ec16c117deff89a",
+                "sha256:de7aedc85918c2f887886442e50f52c1b93545606317956d65f342bd81cb4fc3",
+                "sha256:e6c0bbf8e277b74196e3140c35f9a1ae3eafd818f7f2d3a15819c49135d6c062"
+            ],
+            "version": "==6.0.0"
+        },
         "psycopg2-binary": {
             "hashes": [
-                "sha256:0c8cb1b93e25eaf1dfedbcb4cee4ce3860035ce216b71590bda5f8dc99128526",
-                "sha256:1c2eeb074d2be404f22a14c4c71eeaa1a855c940abedf6f726158348e9c83dd6",
-                "sha256:1d879395a5d0dfe191dcfc622dce8b0a5e4fb76d089c903f18a4913e5fbc79c7",
-                "sha256:20d47c61bc9d6a431039f6ceb3b9a34a952a1562cf718054f64c524526fb8ed8",
-                "sha256:39fc9323f065361b99fca7758ac723d7e66bbc7e6ec9c90e398857af0ef61404",
-                "sha256:3c5b7579f3075f19b0b54495d28105049d44564d67b817eef2fa561b2bcf532b",
-                "sha256:3f811db92e30ea2412dfba8e64b18102017646969b5f436138d7b2b38a0e8966",
-                "sha256:41d60c8610a70b6666641b662379ef3b847ad2acd38303d4c8e34efd0f782403",
-                "sha256:45979c708536a3132398863579280657c6bc77e9b9be8b05ba0dae9013b5a0a8",
-                "sha256:4aaa54574b52b85223d3d950b2fc77bd672e6fbb324bb99f834eacbedc4545f7",
-                "sha256:50647aa5f7171153a5f7fa667f99f55468b9b663b997927e4d2e83955b21aa9f",
-                "sha256:528175ab1f12131bb5ea0df64fc524a4c6c51c197dc68d2a9e646029890d4d0f",
-                "sha256:5cbb49cc1c3c4c69ba09a7e18452bd44371b6adad0c9636f117a7554660af529",
-                "sha256:6e2f69635b548147e9b9298f5b67155d212f742683e51d78d24ceec4a3f5464d",
-                "sha256:7994d43431f1b9eba5daa1bdb8f626482cf01e379c00967092c6ebb3e4d3235f",
-                "sha256:86ec556a75f7e0124581100f2c4c8f9c8d67fc6254af4ce500633a77a4ca3207",
-                "sha256:9c32635fca3c250f5a3d2e424819419cd4a0f277c1a383b20fdd95e799d1da7c",
-                "sha256:9e19396065fdbbbc7c0b288a4e70694e1e63593388020fdb86076b12c315bda5",
-                "sha256:a9e7606233fa6c559491758cb319fab6cec25d931cdb5db670c434dde44ab56b",
-                "sha256:c914312ad7c923ac154821fbd591e8482ab03cdb190e14b05e30bf856f69e98c",
-                "sha256:d354ebb06f851f5f2cbc675bbb1369f71091aec6a894986d68341cbca59e7e56",
-                "sha256:d35a25989112c07a994070f1b3c711b19a14209c7608802eced3bcbf07c375bb",
-                "sha256:d71c128151c2d93fab36d7273b6a6696a63e0aa03ba3f7b1b0abb862c2344765",
-                "sha256:d77e4cbecc30f3a8406873c83075c5dae9dcd2ba1c0ffb088edd29372d3df84c",
-                "sha256:dd0b68d212d0992e2a906c6c34a1ef3f82b3dba74ff99744c77f390ffecb0cca",
-                "sha256:f0f97d3e0ab12456733687fc99d05e4de67f12d48a57c3baf1f5a1c6cd76c876",
-                "sha256:f7b72646a5a50aed8535d8cd2d7e915238f389c181d20143f67c2c6527ca5d0e",
-                "sha256:fd06663aa38b2b7b1f71017329545e17f2a583b127de4eeaabdc4cb16cf3a942"
+                "sha256:163d3ee445a0b4c0109877da9e46271aacf4e5e3d60ae7368669555c30f13e7c",
+                "sha256:1af0bfe7b0c13a0e613a27311fd4f9c5d024e8fc0f4b3d284e7df02a58a11fc0",
+                "sha256:2169c3a1bf52d5b30cc98625b5919a964c571a32e8646be20be6c7e3e82079de",
+                "sha256:218f079fa48e2ef812dc3d3ce6ec2f67ac56427ba4b038d5d6331f2cceb489c2",
+                "sha256:26a958930687e94c4c6c73c171e4d4783b82ae4e16aa3424e6bcd4529bceedf0",
+                "sha256:2c7c195aef3acdbc853942bc674844031a732890d2fee88a324298ed376b6c2b",
+                "sha256:2ecdbfed7004669472bfa27c8d51012c717c241c7154ae17e4c8f93024043525",
+                "sha256:345fc31b71a90ada1b51826537917b19a1af685a91c0f066787069c184d7d00f",
+                "sha256:378a06649503f548be5f1e9eec2e94cc1d6138250b82a08dcc6151bca8cec107",
+                "sha256:3f300bf2930e501dde09605de85cb2b84c2638e2c954be02a3c86f28176d3525",
+                "sha256:6c2f66c653ce8bbd7e789d0f7f92c3f9fea881b55226f0ae5ee550cce9e3cf0e",
+                "sha256:6fccbac2633831b877a8fbf865f7082d34895e82a015795a9f80f99a2efe2576",
+                "sha256:7a166f8ccb6888358d3e67795b057540ea7caa71ab9e089b0cb0097f01088965",
+                "sha256:8f6b84f887ec6fef6c1796779f8ec2603dc7e9ef52bc9269de719d4bcbdaebbb",
+                "sha256:92cf3ceb7bb90cf35b8bd993c640b15d4832ba0e142a3b9da5006ef217da595d",
+                "sha256:a20dfdf73f56da674926a3811929cff9fd23b9af90be9a6c36ac246a3486eef3",
+                "sha256:a84415df4689251556c961e4fe3b25d30e32f00faa8064ce0909458dbe0d67b2",
+                "sha256:ab1aa1cd50df3860f624c9713ee9e690eefd4e049d3a4d86577bab6e741e9616",
+                "sha256:abc9dcf85e75a8687f2a6d560c0c1a2593e8e34ba6f9ad6721f8212c5de179a2",
+                "sha256:c10454710a81a2f4b1ff4d1c83ac2cec63e0e55845a56324991514af5b1299d0",
+                "sha256:c38f80719e4dfae7a6311a4f091f07f4fb2fb5d602352015d5639f63f8fabb68",
+                "sha256:d75cf00605630b2cfefa5c62373c605dcda1cc0d607902847dbb8e8e9b67c1ce",
+                "sha256:dce15cb6ef604c9e38fdaa848f58f83153ade9f4aa5e4cf5812aa27163561750",
+                "sha256:e7e0db4311bb76bf3f6e0380f71912cfa6d0be7cc635e3772476050b0dabdabd",
+                "sha256:eac59cae78dfe3fbf7ece25c170d7a152f88df7643381aa5e7344c2028a8d8d4",
+                "sha256:ead7b3e1567bd14cacd44279c5e42cd19f54b9feed39180220253f4fbe3abd56",
+                "sha256:ed772a5e8e7e5dd6bede960a86940c17cf653c7f158dafa5d52e919b676f10ba",
+                "sha256:f2d73131acb94afa45de8b6b8a4bfb21bbe3736633d6478e53247f19dd8c299c"
             ],
             "index": "pypi",
-            "version": "==2.8"
+            "version": "==2.8.1"
         },
         "pytz": {
             "hashes": [
@@ -156,12 +243,12 @@
             ],
             "version": "==1.12.0"
         },
-        "sqlparse": {
+        "sorl-thumbnail": {
             "hashes": [
-                "sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177",
-                "sha256:7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873"
+                "sha256:8dfe5fda91a5047d1d35a0b9effe7b000764a01d648e15ca076f44e9c34b6dbd",
+                "sha256:d9e3f018d19293824803e4ffead96b19dfcd44fa7987cea392f50436817bef34"
             ],
-            "version": "==0.3.0"
+            "version": "==12.5.0"
         },
         "uwsgi": {
             "hashes": [
@@ -169,6 +256,21 @@
             ],
             "index": "pypi",
             "version": "==2.0.18"
+        },
+        "webencodings": {
+            "hashes": [
+                "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
+                "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
+            ],
+            "version": "==0.5.1"
+        },
+        "wiki": {
+            "hashes": [
+                "sha256:8a3130c50aa6e92a579968d154ce7e66dda85d0b10358d479066ed957f6f4dfc",
+                "sha256:df9c73d4185433d9f375c1646b7c08e099e86172faf93d6afc16389db075440a"
+            ],
+            "index": "pypi",
+            "version": "==0.4.4"
         }
     },
     "develop": {
-- 
cgit v1.2.3


From 3d868521f60b1b8d5d1106e4b8cd089a018328e3 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 8 Apr 2019 12:48:53 +0100
Subject: First attempt at getting the wiki up

---
 pydis_site/apps/wiki/__init__.py            |  0
 pydis_site/apps/wiki/admin.py               |  3 ---
 pydis_site/apps/wiki/apps.py                |  5 -----
 pydis_site/apps/wiki/migrations/__init__.py |  0
 pydis_site/apps/wiki/models.py              |  3 ---
 pydis_site/apps/wiki/tests.py               |  3 ---
 pydis_site/apps/wiki/views.py               |  3 ---
 pydis_site/apps/wiki_container/__init__.py  |  0
 pydis_site/apps/wiki_container/apps.py      |  6 ++++++
 pydis_site/apps/wiki_container/urls.py      |  6 ++++++
 pydis_site/hosts.py                         |  1 +
 pydis_site/settings.py                      | 26 +++++++++++++++++++++++---
 pydis_site/sites.py                         |  5 +++++
 13 files changed, 41 insertions(+), 20 deletions(-)
 delete mode 100644 pydis_site/apps/wiki/__init__.py
 delete mode 100644 pydis_site/apps/wiki/admin.py
 delete mode 100644 pydis_site/apps/wiki/apps.py
 delete mode 100644 pydis_site/apps/wiki/migrations/__init__.py
 delete mode 100644 pydis_site/apps/wiki/models.py
 delete mode 100644 pydis_site/apps/wiki/tests.py
 delete mode 100644 pydis_site/apps/wiki/views.py
 create mode 100644 pydis_site/apps/wiki_container/__init__.py
 create mode 100644 pydis_site/apps/wiki_container/apps.py
 create mode 100644 pydis_site/apps/wiki_container/urls.py
 create mode 100644 pydis_site/sites.py

diff --git a/pydis_site/apps/wiki/__init__.py b/pydis_site/apps/wiki/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pydis_site/apps/wiki/admin.py b/pydis_site/apps/wiki/admin.py
deleted file mode 100644
index 4185d360..00000000
--- a/pydis_site/apps/wiki/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# from django.contrib import admin
-
-# Register your models here.
diff --git a/pydis_site/apps/wiki/apps.py b/pydis_site/apps/wiki/apps.py
deleted file mode 100644
index fce4708e..00000000
--- a/pydis_site/apps/wiki/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class WikiConfig(AppConfig):
-    name = 'wiki'
diff --git a/pydis_site/apps/wiki/migrations/__init__.py b/pydis_site/apps/wiki/migrations/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pydis_site/apps/wiki/models.py b/pydis_site/apps/wiki/models.py
deleted file mode 100644
index 0b4331b3..00000000
--- a/pydis_site/apps/wiki/models.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# from django.db import models
-
-# Create your models here.
diff --git a/pydis_site/apps/wiki/tests.py b/pydis_site/apps/wiki/tests.py
deleted file mode 100644
index a79ca8be..00000000
--- a/pydis_site/apps/wiki/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# from django.test import TestCase
-
-# Create your tests here.
diff --git a/pydis_site/apps/wiki/views.py b/pydis_site/apps/wiki/views.py
deleted file mode 100644
index fd0e0449..00000000
--- a/pydis_site/apps/wiki/views.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# from django.shortcuts import render
-
-# Create your views here.
diff --git a/pydis_site/apps/wiki_container/__init__.py b/pydis_site/apps/wiki_container/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pydis_site/apps/wiki_container/apps.py b/pydis_site/apps/wiki_container/apps.py
new file mode 100644
index 00000000..874ae8e4
--- /dev/null
+++ b/pydis_site/apps/wiki_container/apps.py
@@ -0,0 +1,6 @@
+from wiki.apps import WikiConfig
+
+
+class WikiContainerConfig(WikiConfig):
+    name = 'wiki_container'
+    default_site = 'pydis_site.sites.PyDisWikiSite'
diff --git a/pydis_site/apps/wiki_container/urls.py b/pydis_site/apps/wiki_container/urls.py
new file mode 100644
index 00000000..1537fe8c
--- /dev/null
+++ b/pydis_site/apps/wiki_container/urls.py
@@ -0,0 +1,6 @@
+from django.urls import path, include
+
+urlpatterns = [
+    path('notifications/', include('django_nyt.urls')),
+    path('', include('wiki.urls'))
+]
diff --git a/pydis_site/hosts.py b/pydis_site/hosts.py
index 34acfd09..fc43d0eb 100644
--- a/pydis_site/hosts.py
+++ b/pydis_site/hosts.py
@@ -4,6 +4,7 @@ from django_hosts import host, patterns
 host_patterns = patterns(
     '',
     # host(r"subdomain pattern", "URLs module", "host entry name")
+    host(r'wiki', 'pydis_site.apps.wiki_container.urls', name="wiki"),
     host(r'admin', 'pydis_site.apps.admin.urls', name="admin"),
     host(r'api', 'pydis_site.apps.api.urls', name='api'),
     host(r'.*', 'pydis_site.apps.home.urls', name=settings.DEFAULT_HOST)
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index e8355918..2212da21 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -64,22 +64,34 @@ else:
 INSTALLED_APPS = [
     'pydis_site.apps.api',
     'pydis_site.apps.home',
-    'pydis_site.apps.wiki',
+    'pydis_site.apps.wiki_container',
 
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
+    'django.contrib.humanize.apps.HumanizeConfig',
     'django.contrib.sessions',
     'django.contrib.messages',
+    'django.contrib.sites.apps.SitesConfig',
     'django.contrib.staticfiles',
 
     'crispy_forms',
+    'django_crispy_bulma',
     'django_hosts',
     'django_filters',
-    'django_crispy_bulma',
+    'django_nyt.apps.DjangoNytConfig',
     'django_simple_bulma',
+    'mptt',
     'rest_framework',
-    'rest_framework.authtoken'
+    'rest_framework.authtoken',
+    'sekizai',
+    'sorl.thumbnail',
+
+    'wiki.apps.WikiConfig',
+    'wiki.plugins.attachments.apps.AttachmentsConfig',
+    'wiki.plugins.notifications.apps.NotificationsConfig',
+    'wiki.plugins.images.apps.ImagesConfig',
+    'wiki.plugins.macros.apps.MacrosConfig',
 ]
 
 MIDDLEWARE = [
@@ -112,6 +124,8 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+
+                "sekizai.context_processors.sekizai",
             ],
         },
     },
@@ -257,3 +271,9 @@ BULMA_SETTINGS = {
         "link": "$primary",
     }
 }
+
+# Required for the wiki
+SITE_ID = 1
+
+WIKI_ACCOUNT_HANDLING = False
+WIKI_ACCOUNT_SIGNUP_ALLOWED = False
diff --git a/pydis_site/sites.py b/pydis_site/sites.py
new file mode 100644
index 00000000..b3370049
--- /dev/null
+++ b/pydis_site/sites.py
@@ -0,0 +1,5 @@
+from wiki.sites import WikiSite
+
+
+class PyDisWikiSite(WikiSite):
+    pass
-- 
cgit v1.2.3


From 4dc58e6e14702989f7419d6bfc4ca589898f2e56 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 8 Apr 2019 14:05:50 +0100
Subject: Remove wiki host, use /wiki - Also some wiki config

I've included the monokai pygments theme, but we can change it later
---
 .dockerignore                              |  2 -
 Pipfile                                    |  1 +
 Pipfile.lock                               | 10 ++++-
 pydis_site/apps/home/urls.py               |  7 +--
 pydis_site/apps/wiki_container/__init__.py |  0
 pydis_site/apps/wiki_container/apps.py     |  6 ---
 pydis_site/apps/wiki_container/urls.py     |  6 ---
 pydis_site/hosts.py                        |  3 +-
 pydis_site/settings.py                     | 29 ++++++++++++-
 pydis_site/static/css/pygments.css         | 70 ++++++++++++++++++++++++++++++
 10 files changed, 113 insertions(+), 21 deletions(-)
 delete mode 100644 pydis_site/apps/wiki_container/__init__.py
 delete mode 100644 pydis_site/apps/wiki_container/apps.py
 delete mode 100644 pydis_site/apps/wiki_container/urls.py
 create mode 100644 pydis_site/static/css/pygments.css

diff --git a/.dockerignore b/.dockerignore
index ca6ba308..4ad7c8a7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -31,5 +31,3 @@ README.md
 scripts
 Vagrantfile
 venv
-pydis_site/apps/wiki/tests
-pydis_site/apps/wiki/tests.py
diff --git a/Pipfile b/Pipfile
index 1fd34c35..c6f210ab 100644
--- a/Pipfile
+++ b/Pipfile
@@ -28,6 +28,7 @@ psycopg2-binary = "~=2.8"
 django-simple-bulma = ">=1.1.6,<2.0"
 django-crispy-bulma = ">=0.1.2,<2.0"
 wiki = "~=0.4.4"
+pygments = "~=2.3.1"
 
 [requires]
 python_version = "3.7"
diff --git a/Pipfile.lock b/Pipfile.lock
index a908b8c7..777dbd38 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "a63ccdec81594bd69f4af503e5a62fe01a74adfd6daaaa0fb9be08b25631cb84"
+            "sha256": "d6bbf11476ca021d14ef03475ef6154b148d75a3ceada522194a56e80a27ccf1"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -229,6 +229,14 @@
             "index": "pypi",
             "version": "==2.8.1"
         },
+        "pygments": {
+            "hashes": [
+                "sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a",
+                "sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d"
+            ],
+            "index": "pypi",
+            "version": "==2.3.1"
+        },
         "pytz": {
             "hashes": [
                 "sha256:32b0891edff07e28efe91284ed9c31e123d84bea3fd98e1f72be2508f43ef8d9",
diff --git a/pydis_site/apps/home/urls.py b/pydis_site/apps/home/urls.py
index a01e019e..ede0531e 100644
--- a/pydis_site/apps/home/urls.py
+++ b/pydis_site/apps/home/urls.py
@@ -1,10 +1,11 @@
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, include
 from django.views.generic import TemplateView
 
 
 app_name = 'home'
 urlpatterns = [
-    path('', TemplateView.as_view(template_name='home/index.html'), name='index'),
-    path('admin/', admin.site.urls)
+    path('admin/', admin.site.urls),
+    path('wiki/', include('wiki.urls')),
+    path('/', TemplateView.as_view(template_name='home/index.html'), name='index'),
 ]
diff --git a/pydis_site/apps/wiki_container/__init__.py b/pydis_site/apps/wiki_container/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pydis_site/apps/wiki_container/apps.py b/pydis_site/apps/wiki_container/apps.py
deleted file mode 100644
index 874ae8e4..00000000
--- a/pydis_site/apps/wiki_container/apps.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from wiki.apps import WikiConfig
-
-
-class WikiContainerConfig(WikiConfig):
-    name = 'wiki_container'
-    default_site = 'pydis_site.sites.PyDisWikiSite'
diff --git a/pydis_site/apps/wiki_container/urls.py b/pydis_site/apps/wiki_container/urls.py
deleted file mode 100644
index 1537fe8c..00000000
--- a/pydis_site/apps/wiki_container/urls.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.urls import path, include
-
-urlpatterns = [
-    path('notifications/', include('django_nyt.urls')),
-    path('', include('wiki.urls'))
-]
diff --git a/pydis_site/hosts.py b/pydis_site/hosts.py
index fc43d0eb..25220ee0 100644
--- a/pydis_site/hosts.py
+++ b/pydis_site/hosts.py
@@ -3,8 +3,7 @@ from django_hosts import host, patterns
 
 host_patterns = patterns(
     '',
-    # host(r"subdomain pattern", "URLs module", "host entry name")
-    host(r'wiki', 'pydis_site.apps.wiki_container.urls', name="wiki"),
+    # host(r"subdomain pattern", "URLs module", "host entry name"),
     host(r'admin', 'pydis_site.apps.admin.urls', name="admin"),
     host(r'api', 'pydis_site.apps.api.urls', name='api'),
     host(r'.*', 'pydis_site.apps.home.urls', name=settings.DEFAULT_HOST)
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 2212da21..e55b3132 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -64,7 +64,6 @@ else:
 INSTALLED_APPS = [
     'pydis_site.apps.api',
     'pydis_site.apps.home',
-    'pydis_site.apps.wiki_container',
 
     'django.contrib.admin',
     'django.contrib.auth',
@@ -277,3 +276,31 @@ SITE_ID = 1
 
 WIKI_ACCOUNT_HANDLING = False
 WIKI_ACCOUNT_SIGNUP_ALLOWED = False
+
+WIKI_ANONYMOUS = True
+WIKI_ANONYMOUS_CREATE = DEBUG
+WIKI_ANONYMOUS_UPLOAD = DEBUG
+WIKI_ANONYMOUS_WRITE = DEBUG
+
+WIKI_MARKDOWN_KWARGS = {
+    "extension_configs": {
+        "wiki.plugins.macros.mdx.toc": {
+            "title": "Contents"
+        }
+    }, "extensions": [
+        "markdown.extensions.abbr",
+        "markdown.extensions.attr_list",
+        "markdown.extensions.extra",
+        "markdown.extensions.fenced_code",
+        "markdown.extensions.footnotes",
+        "markdown.extensions.nl2br",
+        "markdown.extensions.sane_lists",
+
+        "wiki.core.markdown.mdx.codehilite",
+        "wiki.core.markdown.mdx.previewlinks",
+        "wiki.core.markdown.mdx.responsivetable",
+        "wiki.plugins.macros.mdx.macro",
+        "wiki.plugins.macros.mdx.toc",
+        "wiki.plugins.macros.mdx.wikilinks",
+    ]
+}
diff --git a/pydis_site/static/css/pygments.css b/pydis_site/static/css/pygments.css
new file mode 100644
index 00000000..d2e9fc72
--- /dev/null
+++ b/pydis_site/static/css/pygments.css
@@ -0,0 +1,70 @@
+.codehilite .hll { background-color: #49483e }
+.codehilite  { background: #272822; color: #f8f8f2 }
+.codehilite .c { color: #75715e } /* Comment */
+.codehilite .err { color: #960050; background-color: #1e0010 } /* Error */
+.codehilite .k { color: #66d9ef } /* Keyword */
+.codehilite .l { color: #ae81ff } /* Literal */
+.codehilite .n { color: #f8f8f2 } /* Name */
+.codehilite .o { color: #f92672 } /* Operator */
+.codehilite .p { color: #f8f8f2 } /* Punctuation */
+.codehilite .ch { color: #75715e } /* Comment.Hashbang */
+.codehilite .cm { color: #75715e } /* Comment.Multiline */
+.codehilite .cp { color: #75715e } /* Comment.Preproc */
+.codehilite .cpf { color: #75715e } /* Comment.PreprocFile */
+.codehilite .c1 { color: #75715e } /* Comment.Single */
+.codehilite .cs { color: #75715e } /* Comment.Special */
+.codehilite .gd { color: #f92672 } /* Generic.Deleted */
+.codehilite .ge { font-style: italic } /* Generic.Emph */
+.codehilite .gi { color: #a6e22e } /* Generic.Inserted */
+.codehilite .gs { font-weight: bold } /* Generic.Strong */
+.codehilite .gu { color: #75715e } /* Generic.Subheading */
+.codehilite .kc { color: #66d9ef } /* Keyword.Constant */
+.codehilite .kd { color: #66d9ef } /* Keyword.Declaration */
+.codehilite .kn { color: #f92672 } /* Keyword.Namespace */
+.codehilite .kp { color: #66d9ef } /* Keyword.Pseudo */
+.codehilite .kr { color: #66d9ef } /* Keyword.Reserved */
+.codehilite .kt { color: #66d9ef } /* Keyword.Type */
+.codehilite .ld { color: #e6db74 } /* Literal.Date */
+.codehilite .m { color: #ae81ff } /* Literal.Number */
+.codehilite .s { color: #e6db74 } /* Literal.String */
+.codehilite .na { color: #a6e22e } /* Name.Attribute */
+.codehilite .nb { color: #f8f8f2 } /* Name.Builtin */
+.codehilite .nc { color: #a6e22e } /* Name.Class */
+.codehilite .no { color: #66d9ef } /* Name.Constant */
+.codehilite .nd { color: #a6e22e } /* Name.Decorator */
+.codehilite .ni { color: #f8f8f2 } /* Name.Entity */
+.codehilite .ne { color: #a6e22e } /* Name.Exception */
+.codehilite .nf { color: #a6e22e } /* Name.Function */
+.codehilite .nl { color: #f8f8f2 } /* Name.Label */
+.codehilite .nn { color: #f8f8f2 } /* Name.Namespace */
+.codehilite .nx { color: #a6e22e } /* Name.Other */
+.codehilite .py { color: #f8f8f2 } /* Name.Property */
+.codehilite .nt { color: #f92672 } /* Name.Tag */
+.codehilite .nv { color: #f8f8f2 } /* Name.Variable */
+.codehilite .ow { color: #f92672 } /* Operator.Word */
+.codehilite .w { color: #f8f8f2 } /* Text.Whitespace */
+.codehilite .mb { color: #ae81ff } /* Literal.Number.Bin */
+.codehilite .mf { color: #ae81ff } /* Literal.Number.Float */
+.codehilite .mh { color: #ae81ff } /* Literal.Number.Hex */
+.codehilite .mi { color: #ae81ff } /* Literal.Number.Integer */
+.codehilite .mo { color: #ae81ff } /* Literal.Number.Oct */
+.codehilite .sa { color: #e6db74 } /* Literal.String.Affix */
+.codehilite .sb { color: #e6db74 } /* Literal.String.Backtick */
+.codehilite .sc { color: #e6db74 } /* Literal.String.Char */
+.codehilite .dl { color: #e6db74 } /* Literal.String.Delimiter */
+.codehilite .sd { color: #e6db74 } /* Literal.String.Doc */
+.codehilite .s2 { color: #e6db74 } /* Literal.String.Double */
+.codehilite .se { color: #ae81ff } /* Literal.String.Escape */
+.codehilite .sh { color: #e6db74 } /* Literal.String.Heredoc */
+.codehilite .si { color: #e6db74 } /* Literal.String.Interpol */
+.codehilite .sx { color: #e6db74 } /* Literal.String.Other */
+.codehilite .sr { color: #e6db74 } /* Literal.String.Regex */
+.codehilite .s1 { color: #e6db74 } /* Literal.String.Single */
+.codehilite .ss { color: #e6db74 } /* Literal.String.Symbol */
+.codehilite .bp { color: #f8f8f2 } /* Name.Builtin.Pseudo */
+.codehilite .fm { color: #a6e22e } /* Name.Function.Magic */
+.codehilite .vc { color: #f8f8f2 } /* Name.Variable.Class */
+.codehilite .vg { color: #f8f8f2 } /* Name.Variable.Global */
+.codehilite .vi { color: #f8f8f2 } /* Name.Variable.Instance */
+.codehilite .vm { color: #f8f8f2 } /* Name.Variable.Magic */
+.codehilite .il { color: #ae81ff } /* Literal.Number.Integer.Long */
-- 
cgit v1.2.3


From 027475779bfa7db50a1c1ff9935bcb546b33f961 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 8 Apr 2019 14:06:11 +0100
Subject: Add base templates for django-wiki, as provided

---
 .../templates/wiki/accounts/account_settings.html  |  14 ++
 pydis_site/templates/wiki/accounts/login.html      |  38 ++++
 pydis_site/templates/wiki/accounts/signup.html     |  27 +++
 pydis_site/templates/wiki/article.html             |  40 ++++
 pydis_site/templates/wiki/base.html                |   3 +
 pydis_site/templates/wiki/base_site.html           | 164 +++++++++++++++++
 pydis_site/templates/wiki/create.html              |  50 +++++
 pydis_site/templates/wiki/create_root.html         |  40 ++++
 pydis_site/templates/wiki/delete.html              |  67 +++++++
 pydis_site/templates/wiki/deleted.html             |  56 ++++++
 pydis_site/templates/wiki/deleted_list.html        |  33 ++++
 pydis_site/templates/wiki/dir.html                 |  82 +++++++++
 pydis_site/templates/wiki/edit.html                | 139 ++++++++++++++
 pydis_site/templates/wiki/error.html               |  45 +++++
 .../templates/wiki/forms/markitup-admin.html       |   1 +
 pydis_site/templates/wiki/forms/markitup.html      |   1 +
 pydis_site/templates/wiki/forms/select.html        |  15 ++
 pydis_site/templates/wiki/forms/select_option.html |   1 +
 pydis_site/templates/wiki/forms/text.html          |   1 +
 pydis_site/templates/wiki/history.html             | 202 +++++++++++++++++++++
 .../templates/wiki/includes/anonymous_blocked.html |  13 ++
 .../templates/wiki/includes/article_menu.html      |  53 ++++++
 .../templates/wiki/includes/breadcrumbs.html       |  61 +++++++
 pydis_site/templates/wiki/includes/editor.html     |  11 ++
 .../templates/wiki/includes/editor_sidebar.html    |  42 +++++
 .../templates/wiki/includes/editormedia.html       |  15 ++
 pydis_site/templates/wiki/includes/form.html       |  17 ++
 pydis_site/templates/wiki/includes/formerrors.html |   8 +
 pydis_site/templates/wiki/includes/formfield.html  |  25 +++
 pydis_site/templates/wiki/includes/messages.html   |   9 +
 pydis_site/templates/wiki/includes/modals.html     |  31 ++++
 pydis_site/templates/wiki/includes/move_tree.html  |  16 ++
 pydis_site/templates/wiki/includes/pagination.html |  24 +++
 pydis_site/templates/wiki/includes/render.html     |  26 +++
 .../templates/wiki/includes/revision_info.html     |  25 +++
 .../templates/wiki/includes/searchresult.html      |  22 +++
 pydis_site/templates/wiki/move.html                |  66 +++++++
 pydis_site/templates/wiki/permission_denied.html   |  32 ++++
 pydis_site/templates/wiki/preview_inline.html      |  55 ++++++
 pydis_site/templates/wiki/root_missing.html        |  37 ++++
 pydis_site/templates/wiki/search.html              |  53 ++++++
 pydis_site/templates/wiki/settings.html            |  24 +++
 pydis_site/templates/wiki/source.html              |  17 ++
 pydis_site/templates/wiki/view.html                |   9 +
 44 files changed, 1710 insertions(+)
 create mode 100644 pydis_site/templates/wiki/accounts/account_settings.html
 create mode 100644 pydis_site/templates/wiki/accounts/login.html
 create mode 100644 pydis_site/templates/wiki/accounts/signup.html
 create mode 100644 pydis_site/templates/wiki/article.html
 create mode 100644 pydis_site/templates/wiki/base.html
 create mode 100644 pydis_site/templates/wiki/base_site.html
 create mode 100644 pydis_site/templates/wiki/create.html
 create mode 100644 pydis_site/templates/wiki/create_root.html
 create mode 100644 pydis_site/templates/wiki/delete.html
 create mode 100644 pydis_site/templates/wiki/deleted.html
 create mode 100644 pydis_site/templates/wiki/deleted_list.html
 create mode 100644 pydis_site/templates/wiki/dir.html
 create mode 100644 pydis_site/templates/wiki/edit.html
 create mode 100644 pydis_site/templates/wiki/error.html
 create mode 100644 pydis_site/templates/wiki/forms/markitup-admin.html
 create mode 100644 pydis_site/templates/wiki/forms/markitup.html
 create mode 100644 pydis_site/templates/wiki/forms/select.html
 create mode 100644 pydis_site/templates/wiki/forms/select_option.html
 create mode 100644 pydis_site/templates/wiki/forms/text.html
 create mode 100644 pydis_site/templates/wiki/history.html
 create mode 100644 pydis_site/templates/wiki/includes/anonymous_blocked.html
 create mode 100644 pydis_site/templates/wiki/includes/article_menu.html
 create mode 100644 pydis_site/templates/wiki/includes/breadcrumbs.html
 create mode 100644 pydis_site/templates/wiki/includes/editor.html
 create mode 100644 pydis_site/templates/wiki/includes/editor_sidebar.html
 create mode 100644 pydis_site/templates/wiki/includes/editormedia.html
 create mode 100644 pydis_site/templates/wiki/includes/form.html
 create mode 100644 pydis_site/templates/wiki/includes/formerrors.html
 create mode 100644 pydis_site/templates/wiki/includes/formfield.html
 create mode 100644 pydis_site/templates/wiki/includes/messages.html
 create mode 100644 pydis_site/templates/wiki/includes/modals.html
 create mode 100644 pydis_site/templates/wiki/includes/move_tree.html
 create mode 100644 pydis_site/templates/wiki/includes/pagination.html
 create mode 100644 pydis_site/templates/wiki/includes/render.html
 create mode 100644 pydis_site/templates/wiki/includes/revision_info.html
 create mode 100644 pydis_site/templates/wiki/includes/searchresult.html
 create mode 100644 pydis_site/templates/wiki/move.html
 create mode 100644 pydis_site/templates/wiki/permission_denied.html
 create mode 100644 pydis_site/templates/wiki/preview_inline.html
 create mode 100644 pydis_site/templates/wiki/root_missing.html
 create mode 100644 pydis_site/templates/wiki/search.html
 create mode 100644 pydis_site/templates/wiki/settings.html
 create mode 100644 pydis_site/templates/wiki/source.html
 create mode 100644 pydis_site/templates/wiki/view.html

diff --git a/pydis_site/templates/wiki/accounts/account_settings.html b/pydis_site/templates/wiki/accounts/account_settings.html
new file mode 100644
index 00000000..ecff4376
--- /dev/null
+++ b/pydis_site/templates/wiki/accounts/account_settings.html
@@ -0,0 +1,14 @@
+{% extends "wiki/base.html" %}
+{% load i18n wiki_tags sekizai_tags %}
+
+{% block wiki_pagetitle %}{% trans "Account Settings" %}{% endblock %}
+
+{% block wiki_contents %}
+<h1 class="page-header">{% trans "Account Settings" %}</h1>
+<form class="form-horizontal" action="" method="post">{% csrf_token %}
+    {% wiki_form form %}
+    <button type="submit" name="save_changes" class="btn btn-primary btn-lg">
+      {% trans "Update" %}
+    </button>
+</form>
+{% endblock %}
diff --git a/pydis_site/templates/wiki/accounts/login.html b/pydis_site/templates/wiki/accounts/login.html
new file mode 100644
index 00000000..082d47bd
--- /dev/null
+++ b/pydis_site/templates/wiki/accounts/login.html
@@ -0,0 +1,38 @@
+{% extends "wiki/base.html" %}
+{% load i18n wiki_tags sekizai_tags %}
+
+{% block wiki_pagetitle %}{% trans "Log in" %}{% endblock %}
+
+{% block wiki_contents %}
+<div class="row">
+  <div class="col-lg-3"></div>
+  <div class="col-lg-6">
+    <h1 class="page-header">{% trans "Please log in" %}</h1>
+    <form method="POST" class="form-horizontal">
+    {% wiki_form form %}
+    <div class="form-group form-actions">
+      <div class="col-lg-2"></div>
+      <div class="col-lg-10">
+        <button type="submit" name="save_changes" class="btn btn-primary btn-lg">
+          <span class="fa fa-lock"></span>
+          {% trans "Log me in..." %}
+        </button>
+      </div>
+    </div>
+    </form>
+
+    <p>
+      {% trans "Don't have an account?" %} <a href="{% url 'wiki:signup' %}">{% trans "Sign up" %} &raquo;</a>
+    </p>
+
+  </div>
+  <div class="col-lg-3"></div>
+</div>
+
+{% addtoblock "js" %}
+<script type="text/javascript">
+  $('#id_username').focus();
+</script>
+{% endaddtoblock %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/accounts/signup.html b/pydis_site/templates/wiki/accounts/signup.html
new file mode 100644
index 00000000..6db65d3d
--- /dev/null
+++ b/pydis_site/templates/wiki/accounts/signup.html
@@ -0,0 +1,27 @@
+{% extends "wiki/base.html" %}
+{% load i18n wiki_tags sekizai_tags %}
+{% block wiki_pagetitle %}{% trans "Sign up" %}{% endblock %}
+
+{% block wiki_contents %}
+<h1 class="page-header">{% trans "Sign up" %}</h1>
+<form method="POST" class="form-horizontal">
+{% wiki_form form %}
+<div class="form-group form-actions">
+  <div class="col-lg-2"></div>
+  <div class="col-lg-10">
+    <button type="submit" name="save_changes" class="btn btn-primary btn-lg">
+      <span class="fa fa-plus"></span>
+      {% trans "Sign me up..." %}
+    </button>
+  </div>
+</div>
+</form>
+{% addtoblock "js" %}
+<script type="text/javascript">
+  function {{ honeypot_jsfunction }}() {
+    $('.{{ honeypot_class }}').parent().parent().hide();
+  }
+  $(document).ready({{ honeypot_jsfunction }});
+</script>
+{% endaddtoblock %}
+{% endblock %}
diff --git a/pydis_site/templates/wiki/article.html b/pydis_site/templates/wiki/article.html
new file mode 100644
index 00000000..65877068
--- /dev/null
+++ b/pydis_site/templates/wiki/article.html
@@ -0,0 +1,40 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n sekizai_tags %}
+
+
+{% block wiki_pagetitle %}{{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_breadcrumbs %}
+{% include "wiki/includes/breadcrumbs.html" %}
+{% endblock %}
+
+{% block wiki_contents %}
+
+  <div id="article-container">
+    <ul class="nav nav-pills" id="article-menu">
+      <li class="pull-left" id="article-title-li">
+        <h1 id="article-title">
+          {{ article.current_revision.title }}
+          <small style="font-size: 14px;">
+            {% if urlpath.parent %}
+            <a href="{% url 'wiki:get' path=urlpath.path %}"><span class="fa fa-bookmark"></span> {{ urlpath.slug }}</a>
+            {% endif %}
+            {% if article.current_revision.locked %}
+              <span class="fa fa-lock"></span> {% trans "locked" %}
+            {% endif %}
+          </small>
+        </h1>
+      </li>
+      {% include "wiki/includes/article_menu.html" %}
+    </ul>
+    <div>
+      {% block wiki_contents_tab %}
+      {% endblock %}
+    </div>
+  </div>
+
+{% endblock %}
+
+{% block wiki_footer_prepend %}
+  <p style="margin-bottom: 10px;"><em>{% trans "This article was last modified:" %} {{ article.current_revision.modified }}</em></p>
+{% endblock %}
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
new file mode 100644
index 00000000..5260bfcd
--- /dev/null
+++ b/pydis_site/templates/wiki/base.html
@@ -0,0 +1,3 @@
+{% extends "wiki/base_site.html" %}
+
+{# Intentionally empty, to allow easy customization with no copy-paste #}
diff --git a/pydis_site/templates/wiki/base_site.html b/pydis_site/templates/wiki/base_site.html
new file mode 100644
index 00000000..d025e53c
--- /dev/null
+++ b/pydis_site/templates/wiki/base_site.html
@@ -0,0 +1,164 @@
+{% load sekizai_tags i18n wiki_tags static %}<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>{% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %} - django-\/\/  i K |{% endblock %}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="description" content="">
+    <meta name="author" content="www.django-wiki.org">
+
+    <!-- Le styles -->
+    <link href="{% static "wiki/bootstrap/css/wiki-bootstrap.min.css" %}" rel="stylesheet">
+
+    {% render_block "css" %}
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+  </head>
+
+  <body>
+
+    {% block wiki_body %}
+
+    {% block wiki_navbar %}
+    <div class="navbar navbar-fixed-top navbar-inverse">
+      <div class="container">
+        <div class="navbar-header">
+          <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          {% block wiki_header_branding %}
+          <a class="navbar-brand" href="{% url 'wiki:root' %}">django-\/\/ i K |</a>
+          {% endblock %}
+        </div>
+        <div class="navbar-collapse collapse">
+          <form class="navbar-form navbar-right" id="wiki-search-form" method="GET" action="{% spaceless %}
+              {% if article or urlpath %}
+                {% url 'wiki:search' article_id=article.id path=urlpath.path %}
+              {% else %}
+                {% url 'wiki:search' %}
+              {% endif %}
+            {% endspaceless %}"
+          >
+            <div class="input-group">
+              <input type="search" class="form-control search-query" name="q" placeholder="{% spaceless %}
+                {% if article or urlpath %}
+                   {% trans "Search from current article..." %}
+                {% else %}
+                  {% trans "Search whole wiki..." %}
+                {% endif %}
+              {% endspaceless %}" />
+              <span class="input-group-btn">
+                <button class="btn btn-default" type="submit">
+                  <span class="fa fa-search"></span>
+                </button>
+              </span>
+            </div><!-- /input-group -->
+          </form>
+          <div class="navbar-right">
+            {% if user.is_authenticated %}
+            <ul class="nav navbar-nav">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                  <span class="badge notification-cnt">0</span>
+                  {{ user }}
+                  <b class="caret"></b>
+                </a>
+                <ul class="dropdown-menu">
+                  {% if "ACCOUNT_HANDLING"|wiki_settings %}
+                  <li>
+                    <a href="{% url 'wiki:profile_update' %}">
+                      <i class="fa fa-gear"></i>
+                      {% trans "Account Settings" %}
+                    </a>
+                  </li>
+                  {% endif %}
+                  <li>
+                    <a href="{{ "LOGOUT_URL"|wiki_settings }}">
+                      <i class="fa fa-power-off"></i>
+                      {% trans "Log out" %}
+                    </a>
+                  </li>
+                  {% if user.is_superuser %}
+                  <li>
+                    <a href="{% url 'wiki:deleted_list' %}">
+                      <i class="fa fa-trash-o"></i>
+                      {% trans "Deleted articles" %}
+                    </a>
+                  </li>
+                  {% endif %}
+                  {% if "wiki.plugins.notifications"|plugin_enabled %}
+                    {% include "wiki/plugins/notifications/menubaritem.html" %}
+                  {% endif %}
+                  {% if "wiki.plugins.globalhistory"|plugin_enabled %}
+                    {% include "wiki/plugins/globalhistory/menubaritem.html" %}
+                  {% endif %}
+                </ul>
+              </li>
+            </ul>
+            {% else %}
+            <ul class="nav navbar-nav">
+              <li>
+                <a href="{% login_url as wiki_login_url %}{{ wiki_login_url }}">{% trans "Log in" %}</a>
+              </li>
+              {% if "ACCOUNT_HANDLING"|wiki_settings %}
+              <li>
+                <a href="{% url 'wiki:signup' %}">{% trans "Sign up" %}</a>
+              </li>
+              {% endif %}
+            </ul>
+            {% endif %}
+          </div>
+          {% block wiki_header_navlinks %}
+          <ul class="nav navbar-nav">
+            <li class="active"><a href="/">{% trans "Home" %}</a></li>
+            <li><a href="https://github.com/django-wiki/django-wiki" target="_blank">{% trans "About" %}</a></li>
+          </ul>
+          {% endblock %}
+        </div>
+      </div>
+    </div>
+    {% endblock %}
+
+    <div class="container" style="margin-top: 60px;">
+
+      {% wiki_messages %}
+
+      <!-- Reserved for breadcrumbs -->
+      {% block wiki_breadcrumbs %}{% endblock %}
+
+      <!-- Main page contents go here -->
+      {% block wiki_contents %}{% endblock %}
+
+      <footer id="wiki-footer">
+        <hr />
+        {% block wiki_footer_logo %}
+        <a href="https://github.com/django-wiki/django-wiki" class="pull-right"><img src="{% static "wiki/img/github_icon.png" %}" /></a>
+        {% endblock %}
+        {% block wiki_footer_prepend %}
+        {% endblock %}
+        <p>{% blocktrans %}Powered by <a href="http://www.django-wiki.org">django-wiki</a>, an open source application under the <a href="http://www.gnu.org/licenses/quick-guide-gplv3.html">GPLv3</a> license. Let knowledge be the cure.{% endblocktrans %}</p>
+        <div style="clear: both"></div>
+      </footer>
+      </div>
+
+    </div> <!-- /container -->
+
+    {% endblock %}
+
+    <script src="{% static "wiki/js/jquery-3.3.1.min.js" %}"></script>
+    <script src="{% static "wiki/js/core.js" %}"></script>
+    <script src="{% static "wiki/bootstrap/js/bootstrap.min.js" %}"></script>
+    <!-- Optionally enable responsive features in IE8 -->
+    <script src="{% static "wiki/js/respond.min.js" %}"></script>
+    {% render_block "js" %}
+
+  </body>
+</html>
diff --git a/pydis_site/templates/wiki/create.html b/pydis_site/templates/wiki/create.html
new file mode 100644
index 00000000..669a5ac4
--- /dev/null
+++ b/pydis_site/templates/wiki/create.html
@@ -0,0 +1,50 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n sekizai_tags static %}
+
+
+{% block wiki_pagetitle %}{% trans "Add new article" %}{% endblock %}
+
+{% block wiki_contents %}
+
+  {% addtoblock "js" %}
+  <script type="text/javascript" src="{% static "admin/js/urlify.js" %}"></script>
+  <script type="text/javascript">
+  {% if not create_form.slug.value %}
+  //<![CDATA[
+  (function($) {
+	  $(document).ready(function (){
+		  $("#id_title").keyup(function () {
+			  var e = $("#id_slug")[0];
+			  if(!e._changed) {
+			    slug = URLify(this.value, 50);
+				  e.value = slug;
+			  }
+	      });
+	  });
+  })(jQuery);
+  //]]>
+  {% endif %}
+  </script>
+  {% endaddtoblock %}
+
+  {% include "wiki/includes/editormedia.html" %}
+  <h1 class="page-header">{% trans "Add new article" %}</h1>
+
+  <form method="POST" class="form-horizontal">
+    {% wiki_form create_form %}
+    <div class="form-group form-actions">
+      <div class="col-lg-2"></div>
+      <div class="col-lg-10">
+        <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="btn btn-default">
+          <span class="fa fa-arrow-left"></span>
+          {% trans "Go back" %}
+        </a>
+        <button type="submit" name="save_changes" class="btn btn-primary">
+          <span class="fa fa-plus"></span>
+          {% trans "Create article" %}
+        </button>
+      </div>
+    </div>
+  </form>
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/create_root.html b/pydis_site/templates/wiki/create_root.html
new file mode 100644
index 00000000..73a14ae0
--- /dev/null
+++ b/pydis_site/templates/wiki/create_root.html
@@ -0,0 +1,40 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n sekizai_tags static %}
+
+{% block wiki_pagetitle %}{% trans "Create root article" %}{% endblock %}
+
+{% block wiki_contents %}
+
+  {% addtoblock "js" %}
+  {% for js in editor.Media.js %}
+  <script type="text/javascript" src="{% static js %}"></script>
+  {% endfor %}
+  {% endaddtoblock %}
+
+  {% addtoblock "css" %}
+  {% for media, srcs in editor.Media.css.items %}
+    {% for src in srcs %}
+      <link rel="stylesheet" media="{{ media }}" href="{% static src %}" />
+    {% endfor %}
+  {% endfor %}
+  {% endaddtoblock %}
+
+  <h1>{% trans "Congratulations!" %}</h1>
+  <p class="lead">
+    {% trans "You have django-wiki installed... but there are no articles. So it's time to create the first one, the root article." %}
+    {% trans "In the beginning, it will only be editable by administrators, but you can define permissions after." %}
+  </p>
+
+  <h2 class="page-header">{% trans "Root article" %}</h2>
+
+  <form method="POST" class="form-horizontal">
+    {% wiki_form form %}
+    <div class="form-group form-actions">
+      <div class="col-lg-2"></div>
+      <div class="col-lg-10">
+        <input type="submit" name="save_changes" value="{% trans "Create root" %} &raquo;" class="btn btn-primary btn-lg" />
+      </div>
+    </div>
+  </form>
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/delete.html b/pydis_site/templates/wiki/delete.html
new file mode 100644
index 00000000..afb4140d
--- /dev/null
+++ b/pydis_site/templates/wiki/delete.html
@@ -0,0 +1,67 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n sekizai_tags %}
+
+
+{% block wiki_pagetitle %}{% trans "Delete article" %}{% endblock %}
+
+{% block wiki_contents %}
+  <h1 class="page-header">{% trans "Delete" %} "{{ article.current_revision.title }}"</h1>
+
+  {% if cannot_delete_root %}
+    <p class="lead">{% trans "You cannot delete a root article." %}</p>
+    <p><a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}">{% trans "Go back" %}</a></p>
+  {% else %}
+
+    {% if cannot_delete_children %}
+
+      <p class="alert alert-danger"><strong>{% trans "You cannot delete this article because you do not have permission to delete articles with children. Try to remove the children manually one-by-one." %}</strong></p>
+
+    {% endif %}
+
+    {% if delete_children %}
+
+      <p class="lead">{% trans "You are deleting an article. This means that its children will be deleted as well. If you choose to purge, children will also be purged!" %}</p>
+
+      <h2>{% trans "Articles that will be deleted" %}</h2>
+
+      <ul>
+        {% for child in delete_children %}
+        <li><a href="{% url 'wiki:get' article_id=child.article.id %}" target="_blank">{{ child.article }}</a></li>
+        {% if delete_children_more %}
+        <li><em>{% trans "...and more!" %}</em></li>
+        {% endif %}
+        {% endfor %}
+      </ul>
+
+    {% endif %}
+
+    {% if not cannot_delete_children %}
+    <p class="lead">{% trans "You are deleting an article. Please confirm." %}</p>
+
+    <form method="POST" class="form-horizontal">
+      {% wiki_form delete_form %}
+      <div class="form-group form-actions">
+        <div class="col-lg-2"></div>
+        <div class="col-lg-10">
+          <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+            <span class="fa fa-arrow-left"></span>
+            {% trans "Go back" %}
+          </a>
+          <button type="submit" name="save_changes" class="btn btn-danger">
+            <span class="fa fa-trash-o"></span>
+            {% trans "Delete article" %}
+          </button>
+        </div>
+      </div>
+    </form>
+    {% endif %}
+
+  {% endif %}
+
+{% addtoblock "js" %}
+<script type="text/javascript">
+  $('#id_revision').val('{{ article.current_revision.id }}');
+</script>
+{% endaddtoblock %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/deleted.html b/pydis_site/templates/wiki/deleted.html
new file mode 100644
index 00000000..55ce2b46
--- /dev/null
+++ b/pydis_site/templates/wiki/deleted.html
@@ -0,0 +1,56 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n sekizai_tags %}
+
+
+{% block wiki_pagetitle %}{% trans "Article deleted" %}{% endblock %}
+
+{% block wiki_contents %}
+  <style type="text/css">
+    label[for=id_confirm] {
+      float: left;
+      margin-right: 10px;
+    }
+  </style>
+  <h1 class="page-header">{% trans "Article deleted" %}</h1>
+
+  <p class="lead">
+  {% trans "The article you were looking for has been deleted." %}
+  </p>
+
+  <div class="row">
+
+  {% if not article.current_revision.locked or article|can_delete:user %}
+    <div class="col-lg-6">
+      <div class="well">
+        <h2>{% trans "Restore" %}</h2>
+        <p>{% trans "You may restore this article and its children by clicking restore." %}</p>
+        <p>
+          <a href="?restore=1" class="btn btn-default">
+            <span class="fa fa-repeat"></span>
+            {% trans "Restore" %}
+          </a>
+        </p>
+      </div>
+    </div>
+  {% endif %}
+
+  {% if article|can_moderate:user %}
+    <div class="col-lg-6">
+      <div class="well">
+        <h2>{% trans "Purge deletion" %}</h2>
+        <p>{% trans "You may remove this article and any children permanently and free their slugs by clicking the below button. This action cannot be undone." %}</p>
+        <form method="POST" class="form form-inline">
+          {% csrf_token %}
+          {% wiki_form purge_form %}
+            <button class="btn btn-default">
+              <span class="fa fa-remove"></span>
+              {% trans "Purge" %}
+            </button>
+        </form>
+      </div>
+    </div>
+  {% endif %}
+
+  </div>
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/deleted_list.html b/pydis_site/templates/wiki/deleted_list.html
new file mode 100644
index 00000000..d0d72824
--- /dev/null
+++ b/pydis_site/templates/wiki/deleted_list.html
@@ -0,0 +1,33 @@
+{% extends "wiki/base.html" %}
+{% load i18n wiki_tags sekizai_tags %}
+
+{% block wiki_pagetitle %}{% trans "Admin Panel" %}{% endblock %}
+
+{% block wiki_contents %}
+
+<h1 class="page-header">{% trans "Deleted Articles" %}</h1>
+{% if deleted_articles %}
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <th>{% trans "Page Title" %}</th>
+        <th>{% trans "Date Deleted" %}</th>
+        <th>{% trans "Restore Article" %}</th>
+      </tr>
+    </thead>
+    <tbody>
+    {% for article in deleted_articles %}
+      <tr>
+        <td><a href="{{article.get_absolute_url}}">{{ article }}</a></td>
+        <td> {{article.modified}} </td>
+        <td><a href="{% url 'wiki:deleted' article_id=article.id %}?restore=1" class="btn btn-default"><span class="fa fa-repeat"></span>
+            {% trans "Restore" %}</a></td>
+      </tr>
+    {% endfor %}
+    </tbody>
+  </table>
+{% else %}
+  <b> {% trans "No deleted articles to display" %} </b>
+{% endif %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/dir.html b/pydis_site/templates/wiki/dir.html
new file mode 100644
index 00000000..86b04c85
--- /dev/null
+++ b/pydis_site/templates/wiki/dir.html
@@ -0,0 +1,82 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n humanize %}
+
+
+{% block wiki_pagetitle %}{% trans "Listing articles in" %} {{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_contents_tab %}
+
+{% url 'wiki:dir' urlpath.path as self_url %}
+
+<form class="form-search directory-toolbar">
+<div class="well well-small">
+  <div class="btn-group pull-left">
+    {% if urlpath.parent %}
+    <a href="{% url 'wiki:dir' path=urlpath.parent.path %}" class="btn btn-default">
+      <span class="fa fa-arrow-up"></span>
+      {% trans "Up one level" %}
+    </a>
+    {% endif %}
+    <a href="{% url 'wiki:create' path=urlpath.path %}" class="btn btn-default">
+      <span class="fa fa-plus"></span>
+      {% trans "Add article" %}
+    </a>
+  </div>
+  <div class="pull-right">
+    {{ filter_form.query }}
+  </div>
+  {% if filter_query %}
+    <div class="pull-right filter-clear">
+      <a href="{{ self_url }}">({% trans "clear" %})</a>
+    </div>
+  {% endif %}
+
+  <div class="clearfix"></div>
+</div>
+</form>
+
+<p>
+  {% with paginator.object_list.count as cnt %}
+    {% blocktrans with urlpath.path as path and cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb trimmed %}
+      Browsing <strong><a href="{{ self_url }}">/{{ path }}</a></strong>. There {{ articles_plur_verb }} <strong>{{ cnt }} {{ articles_plur }}</strong> in this level.
+    {% endblocktrans %}
+  {% endwith %}
+</p>
+
+<table class="table table-striped">
+  <tr>
+    <th>{% trans "Title" %}</th>
+    <th>{% trans "Slug" %}</th>
+    <th>{% trans "Last modified" %}</th>
+  </tr>
+  {% for urlpath in directory %}
+    <tr>
+      <td>
+        <a href="{% url 'wiki:get' path=urlpath.path %}"> {{ urlpath.article.current_revision.title }} </a>
+        <a href="{% url 'wiki:dir' path=urlpath.path %}" class="list-children"> › </a>
+        {% if urlpath.article.current_revision.deleted %}
+          <span class="fa fa-trash"></span>
+        {% endif %}
+        {% if urlpath.article.current_revision.locked %}
+          <span class="fa fa-lock"></span>
+        {% endif %}
+      </td>
+      <td>
+        {{ urlpath.slug }}
+      </td>
+      <td>
+        {{ urlpath.article.current_revision.created|naturaltime }}
+      </td>
+    </tr>
+    {% empty%}
+    <tr>
+      <td colspan="100">
+        <em>{% trans "There are no articles in this level" %}</em>
+      </td>
+    </tr>
+  {% endfor %}
+</table>
+
+{% include "wiki/includes/pagination.html" %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
new file mode 100644
index 00000000..aa9ee032
--- /dev/null
+++ b/pydis_site/templates/wiki/edit.html
@@ -0,0 +1,139 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n sekizai_tags %}
+
+
+{% block wiki_pagetitle %}{% trans "Edit" %}: {{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_contents_tab %}
+
+{% if not user.is_authenticated %}
+<p class="alert alert-warning">
+{% trans "<strong>Warning:</strong> You are not logged in. Your IP address will be logged." %}
+<a href="{% url 'wiki:login' %}?next={% url 'wiki:edit' article_id=article.id path=urlpath.path %}">{% trans "Click here to log in" %} &raquo;</a>
+</p>
+{% endif %}
+
+<div class="row">
+
+  <div class="col-lg-8">
+    <form method="POST" class="form-horizontal" id="article_edit_form">
+      {% with edit_form as form %}
+        {% include "wiki/includes/editor.html" %}
+      {% endwith %}
+
+      <div class="form-group form-actions">
+        <div class="col-lg-12">
+          <div class="col-lg-offset-2">
+            <button class="btn btn-default" type="submit" name="preview" value="1" id="id_preview"
+                    formaction="{% url 'wiki:preview' path=urlpath.path article_id=article.id %}"
+                    formtarget="previewWindow"
+                    >
+              <span class="fa fa-eye"></span>
+              {% trans "Preview" %}
+            </button>
+            <button class="btn btn-primary" type="submit" name="save" value="1" id="id_save">
+              <span class="fa fa-check"></span>
+              {% trans "Save changes" %}
+            </button>
+
+            <div class="btn-toolbar pull-right">
+              {% if user.is_authenticated and urlpath.path %}
+              <a href="{% url 'wiki:move' path=urlpath.path article_id=article.id %}" class="btn btn-warning ">
+                <span class="fa fa-random"></span>
+                {% trans "Move article" %}
+              </a>
+              {% endif %}
+              {% if article|can_delete:user %}
+              <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="btn btn-danger">
+                <span class="fa fa-trash-o"></span>
+                {% trans "Delete article" %}
+              </a>
+              {% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </form>
+  </div>
+
+  <div class="col-lg-4" id="wiki-edit-sidebar">
+    {% include "wiki/includes/editor_sidebar.html" %}
+  </div>
+
+</div>
+
+<div style="clear: both"></div>
+
+{% include "wiki/includes/modals.html" %}
+
+<div class="modal fade wiki-modal" id="previewModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-body">
+        <iframe name="previewWindow" frameborder="0"></iframe>
+      </div>
+      <div class="modal-footer">
+        <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
+          <span class="fa fa-arrow-circle-left"></span>
+          {% trans "Back to editor" %}
+        </a>
+        <a class="btn btn-lg btn-primary" id="id_preview_save_changes" href="#">
+          <span class="fa fa-check"></span>
+          {% trans "Save changes" %}
+        </a>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% addtoblock "js" %}
+<script language="javascript">
+  $(document).ready(function() {
+    $("#article_edit_form :input").change(function() {
+       $("#article_edit_form").data("changed",true);
+    });
+    if ($("#article_edit_form").find(".alert-danger").length > 0 || $("#article_edit_form").find(".has-error").length > 0 ) {
+      // Set the forms status as "changed" if there was a submission error
+      $("#article_edit_form").data("changed",true);
+    }
+    window.onbeforeunload = confirmOnPageExit;
+    var click_time = 0;
+    $("#article_edit_form").on("submit", function (ev) {
+        now = Date.now();
+        elapsed = now-click_time;
+        click_time = now;
+        if (elapsed < 3000)
+            ev.preventDefault();
+        window.onbeforeunload = null;
+        return true;
+    });
+    $("#id_preview").on("click", function () {
+        $("#previewModal").modal("show");
+        return true;
+    });
+    $("#id_preview_save_changes").on("click", function (ev) {
+        ev.preventDefault();
+        $("#id_save").trigger("click");
+    });
+  });
+
+var confirmOnPageExit = function (e) {
+  if ($("#article_edit_form").data("changed")) {
+    e = e || window.event;
+    var message = "You have unsaved changes!";
+    // For IE6-8 and Firefox prior to version 4
+    if (e) {
+        e.returnValue = message;
+    }
+    // For Chrome, Safari, IE8+ and Opera 12+
+    return message;
+  } else {
+    // If the form hasn't been changed, don't display the pop-up
+    return;
+  }
+};
+</script>
+{% endaddtoblock %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/error.html b/pydis_site/templates/wiki/error.html
new file mode 100644
index 00000000..b54c8cff
--- /dev/null
+++ b/pydis_site/templates/wiki/error.html
@@ -0,0 +1,45 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n %}
+
+
+{% block wiki_pagetitle %}{% if article %}{{ article.current_revision.title }}{% else %}{% trans "Error" %}{% endif %}{% endblock %}
+
+{% block wiki_breadcrumbs %}
+{% include "wiki/includes/breadcrumbs.html" %}
+{% endblock %}
+
+{% block wiki_contents %}
+
+{% if error_type == "ancestors_missing" %}
+
+  <h1 class="page-header">{% trans "Not found" %}</h1>
+
+  <div class="missing">
+    <p>{% trans "This article was not found, and neither was its parent article." %}</p>
+    <p>
+      <a href="{% url 'wiki:get' path='' %}" class="btn btn-default"><i class="fa fa-arrow-left"></i> {% trans "Start page" %}</a>
+    </p>
+  </div>
+
+{% else %}
+
+  <h1 class="page-header">{% trans "Error" %}</h1>
+
+  <div class="error">
+    {% if not error_msg %}
+    <p>{% trans "There was some sort of error accessing this page. Sorry!" %}</p>
+    {% else %}
+    <p>{{ error_msg }}</p>
+    {% endif %}
+  </div>
+
+  {% if article %}
+  <p>
+    <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-default"><i class="fa fa-arrow-left"></i> {% trans "Back to" %} {{ article.current_revision.title }}</a>
+  </p>
+  {% endif %}
+
+
+{% endif %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/forms/markitup-admin.html b/pydis_site/templates/wiki/forms/markitup-admin.html
new file mode 100644
index 00000000..d35bedb5
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/markitup-admin.html
@@ -0,0 +1 @@
+<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
new file mode 100644
index 00000000..87337e67
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/markitup.html
@@ -0,0 +1 @@
+<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
new file mode 100644
index 00000000..95bb06ed
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/select.html
@@ -0,0 +1,15 @@
+<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
new file mode 100644
index 00000000..30ff9787
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/select_option.html
@@ -0,0 +1 @@
+<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
new file mode 100644
index 00000000..23246aa8
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/text.html
@@ -0,0 +1 @@
+<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/history.html b/pydis_site/templates/wiki/history.html
new file mode 100644
index 00000000..d7a3a4da
--- /dev/null
+++ b/pydis_site/templates/wiki/history.html
@@ -0,0 +1,202 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n sekizai_tags static %}
+
+
+{% block wiki_pagetitle %}{% trans "History" %}: {{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_contents_tab %}
+
+{% include "wiki/includes/modals.html" %}
+
+{% addtoblock "js" %}
+<script type="text/javascript" src="{% static "wiki/js/diffview.js" %}"></script>
+<script type="text/javascript" src="{% static "wiki/js/diff.js" %}"></script>
+{% endaddtoblock %}
+{% addtoblock "css" %}
+<style type="text/css">
+  td.linenumber {
+    width: 20px;
+  }
+  tr.insert td {
+    background-color: #DFC;
+  }
+  tr.delete td {
+    background-color: #FDC;
+  }
+  tr.equal td {
+    background-color: #F2F2F2;
+  }
+
+  .diff-container td {
+    white-space: pre; font-family: monospace;
+  }
+  .diff-container td,
+  .diff-container th {
+    padding: 2px 7px;
+    border-right: 1px solid #DDD;
+  }
+  .diff-container td:last-child,
+  .diff-container th:last-child {
+    border-right: none;
+  }
+  .diff-container table {
+    border-top: 1px solid #DDD;
+  }
+</style>
+{% endaddtoblock %}
+
+<p class="lead">
+  {% trans "Click each revision to see a list of edited lines. Click the Preview button to see how the article looked at this stage. At the bottom of this page, you can change to a particular revision or merge an old revision with the current one." %}
+</p>
+
+<form method="GET">
+  <div class="tab-content" style="overflow: visible;">
+    {% for revision in revisions %}
+      <div class="panel-group" id="accordion{{ revision.revision_number }}">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            <a class="panel-toggle" style="float: left;" href="#collapse{{ revision.revision_number }}" onclick="get_diff_json('{% url 'wiki:diff' revision.id %}', $('#collapse{{ revision.revision_number }}'))">
+              {% if revision == article.current_revision %}
+                <i class="fa fa-flag"></i>
+              {% else %}
+                <i class="fa fa-plus"></i>
+              {% endif %}
+              {% include "wiki/includes/revision_info.html" with current_revision=article.current_revision %}
+              <div class="text-muted">
+                <small>
+                {% if revision.user_message %}
+                  {{ revision.user_message }}
+                {% elif revision.automatic_log %}
+                  {{ revision.automatic_log }}
+                {% else %}
+                  ({% trans "no log message" %})
+                {% endif %}
+                </small>
+              </div>
+            </a>
+            <div class="progress progress-striped active" style="display: none; width: 40px; float: left; margin-top: 7px; margin-bottom: -7px;">
+              <div class="bar" style="width: 100%;"></div>
+            </div>
+            <div class="pull-right" style="vertical-align: middle; margin: 8px 8px;">
+              {% if revision == article.current_revision %}
+              <a href="#" class="btn btn-default disabled">
+                <span class="fa fa-lock fa-fw"></span>
+                {% trans "Preview this revision" %}
+              </a>
+              {% else %}
+              <button type="submit" class="btn btn-default" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.r.value='{{ revision.id }}'; this.form.action='{% url 'wiki:preview_revision' article.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}')">
+                <span class="fa fa-eye fa-fw"></span>
+                {% trans "Preview this revision" %}
+              </button>
+              {% endif %}
+
+              {% if article|can_write:user and not article.current_revision.locked %}
+              <input type="radio"{% if revision == article.current_revision %} disabled="true"{% endif %} style="margin: 0 10px;" value="{{ revision.id }}" name="revision_id" switch-button-href="{% url 'wiki:change_revision' path=urlpath.path revision_id=revision.id %}" merge-button-href="{% url 'wiki:merge_revision_preview' article_id=article.id revision_id=revision.id %}" merge-button-commit-href="{% url 'wiki:merge_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}" />
+              {% endif %}
+
+            </div>
+            <div style="clear: both"></div>
+          </div>
+          <div id="collapse{{ revision.revision_number }}" class="panel-collapse collapse">
+            <div class="panel-body diff-container" style="padding: 0;">
+              <dl class="dl-horizontal">
+                <dt>{% trans "Auto log:" %}</dt>
+                <dd>{{ revision.automatic_log|default:"-"|linebreaksbr }}</dd>
+              </dl>
+              <table class="table table-condensed" style="margin: 0; border-collapse: collapse;">
+                <thead>
+                  <tr>
+                    <th class="linenumber">{% if revision.previous_revision %}#{{revision.previous_revision.revision_number}}{% endif %}</th>
+                    <th class="linenumber">#{{revision.revision_number}}</th>
+                    <th>{% trans "Change" %}</th>
+                  </tr>
+                </thead>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    {% endfor %}
+
+    {% include "wiki/includes/pagination.html" %}
+
+    {% if revisions.count > 1 and article|can_write:user and not article.current_revision.locked %}
+
+    <div class="form-group form-actions">
+      <div class="pull-right">
+        <button type="submit" name="preview" value="1" class="btn btn-default" onclick="$('#mergeModal').modal('show'); this.form.target='mergeWindow'; this.form.action=$('input[type=radio]:checked').attr('merge-button-href'); $('.merge-revision-commit').attr('href', $('input[type=radio]:checked').attr('merge-button-commit-href'))">
+          <span class="fa fa-random"></span>
+          {% trans "Merge selected with current..." %}
+        </button>
+        <button type="submit" name="save" value="1" class="btn btn-primary" onclick="this.form.target='_self'; this.form.action=$('input[type=radio]:checked').attr('switch-button-href')">
+          <span class="fa fa-flag"></span>
+          {% trans "Switch to selected version" %}
+        </button>
+      </div>
+      <div style="clear:both"></div>
+    </div>
+
+    {% endif %}
+
+  </div>
+  <input type="hidden" name="r" value="" />
+  <div class="modal fade wiki-modal" id="previewModal">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-body">
+          <iframe name="previewWindow" frameborder="0"></iframe>
+        </div>
+        <div class="modal-footer">
+          <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
+            <span class="fa fa-arrow-circle-left"></span>
+            {% trans "Back to history view" %}
+          </a>
+          {% if article|can_write:user %}
+          <a href="#" class="btn btn-lg btn-primary switch-to-revision">
+            <span class="fa fa-flag"></span>
+            {% trans "Switch to this version" %}
+          </a>
+          {% else %}
+            <a href="#" class="btn btn-lg btn-primary disabled">
+              <span class="fa fa-lock"></span>
+              {% trans "Switch to this version" %}
+            </a>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="modal fade wiki-modal" id="mergeModal">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h1>{% trans "Merge with current" %}</h1>
+          <p class="lead"><span class="fa fa-info-circle"></span> {% trans "When you merge a revision with the current, all data will be retained from both versions and merged at its approximate location from each revision." %} <strong>{% trans "After this, it's important to do a manual review." %}</strong></p>
+        </div>
+        <div class="modal-body">
+          <iframe name="mergeWindow" frameborder="0" style="min-height: 0;"></iframe>
+        </div>
+        <div class="modal-footer">
+          <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
+            <span class="fa fa-arrow-circle-left"></span>
+            {% trans "Back to history view" %}
+          </a>
+          {% if article|can_write:user %}
+          <a href="#" class="btn btn-lg btn-primary merge-revision-commit">
+            <span class="fa fa-file"></span>
+            {% trans "Create new merged version" %}
+          </a>
+          {% else %}
+            <a href="#" class="btn btn-lg btn-primary disabled">
+              <span class="fa fa-lock"></span>
+              {% trans "Create new merged version" %}
+            </a>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+</form>
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/includes/anonymous_blocked.html b/pydis_site/templates/wiki/includes/anonymous_blocked.html
new file mode 100644
index 00000000..5e1d3dac
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/anonymous_blocked.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+
+<em>
+{% url 'wiki:signup' as signup_url %}
+{% url 'wiki:login' as login_url %}
+{% if login_url and signup_url %}
+  {% blocktrans trimmed %}
+  You need to <a href="{{ login_url }}">log in</a> or <a href="{{ signup_url }}">sign up</a> to use this function.
+  {% endblocktrans %}
+{% else %}
+  {% trans "You need to log in or sign up to use this function." %}
+{% endif %}
+</em>
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
new file mode 100644
index 00000000..9a83327b
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -0,0 +1,53 @@
+{% load i18n wiki_tags %}
+
+{% with selected_tab as selected %}
+
+<li class="pull-right{% if selected == "settings" %} active{% endif %}">
+  {% if not user.is_anonymous %}
+  <a href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}">
+    <span class="fa fa-wrench"></span>
+    <span class="hidden-xs">{% trans "Settings" %}</span>
+  </a>
+  {% endif %}
+</li>
+
+{% for plugin in article_tabs %}
+  <li class="pull-right{% if selected == plugin.slug %} active{% endif %}">
+    <a href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}">
+      <span class="{{ plugin.article_tab.1 }}"></span>
+      <span class="hidden-xs">{{ plugin.article_tab.0 }}</span>
+    </a>
+  </li>
+{% endfor %}
+
+<li class="pull-right{% if selected == "history" %} active{% endif %}">
+  <a href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}">
+    <span class="fa fa-clock-o"></span>
+    <span class="hidden-xs">{% trans "Changes" %}</span>
+  </a>
+</li>
+
+{% if article|can_write:user and not article.current_revision.locked %}
+<li class="pull-right{% if selected == "edit" %} active{% endif %}">
+  <a href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}">
+    <span class="fa fa-edit"></span>
+    <span class="hidden-xs">{% trans "Edit" %}</span>
+  </a>
+</li>
+{% else %}
+<li class="pull-right{% if selected == "source" %} active{% endif %}">
+  <a href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}">
+    <span class="fa fa-lock"></span>
+    <span class="hidden-xs">{% trans "View Source" %}</span>
+  </a>
+</li>
+{% endif %}
+
+<li class="pull-right{% if selected == "view" %} active{% endif %}">
+  <a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}">
+    <span class="fa fa-home"></span>
+    <span class="hidden-xs">{% trans "View" %}</span>
+  </a>
+</li>
+
+{% endwith %}
diff --git a/pydis_site/templates/wiki/includes/breadcrumbs.html b/pydis_site/templates/wiki/includes/breadcrumbs.html
new file mode 100644
index 00000000..b7a8aeae
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/breadcrumbs.html
@@ -0,0 +1,61 @@
+{% load i18n %}
+{% if urlpath %}
+<div id="article-breadcrumbs">
+
+<ul class="breadcrumb pull-left">
+  {% 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">{{ article.current_revision.title|truncatechars:25 }}</li>
+</ul>
+<div class="pull-left" style="margin-left: 10px;">
+  <div class="btn-group">
+    <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#" style="padding: 7px;" title="{% trans "Sub-articles for" %} {{ article.current_revision.title }}">
+      <span class="fa fa-sitemap"></span>
+      <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      {% for child in children_slice %}
+        <li>
+          <a href="{% url 'wiki:get' path=child.path %}">
+            {{ child.article.current_revision.title }}
+          </a>
+        </li>
+        {% empty %}
+        <li><a href="#"><em>{% trans "No sub-articles" %}</em></a></li>
+      {% endfor %}
+      {% if children_slice_more %}
+      <li><a href="#"><em>{% trans "...and more" %}</em></a></li>
+      {% endif %}
+      <li class="divider"></li>
+      <li>
+        <a href="{% url 'wiki:dir' path=urlpath.path %}">{% trans "Browse articles in this level" %} &raquo;</a>
+      </li>
+    </ul>
+  </div>
+</div>
+<div class="pull-left" style="margin-left: 10px;">
+  <div class="btn-group">
+    <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#" style="padding: 7px;" title="{% trans "Sub-articles for" %} {{ article.current_revision.title }}">
+      <span class="fa fa-file"></span>
+      <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <li>
+        {% if urlpath.parent %}
+        <a href="{% url 'wiki:create' path=urlpath.parent.path %}" style="padding: 7px;">
+          <span class="fa fa-arrow-right"></span>
+          {% blocktrans with article.current_revision.title as title %}New article next to {{ title }}{% endblocktrans %}
+        </a>
+        {% endif %}
+        <a href="{% url 'wiki:create' path=urlpath.path %}" style="padding: 7px;">
+          <span class="fa fa-arrow-down"></span>
+          {% blocktrans with article.current_revision.title as title %}New article below {{ title }}{% endblocktrans %}
+        </a>
+      </li>
+    </ul>
+  </div>
+</div>
+<div style="clear: both"></div>
+</div>
+{% endif %}
diff --git a/pydis_site/templates/wiki/includes/editor.html b/pydis_site/templates/wiki/includes/editor.html
new file mode 100644
index 00000000..6686d8dd
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/editor.html
@@ -0,0 +1,11 @@
+{% load wiki_tags i18n sekizai_tags %}
+{% include "wiki/includes/editormedia.html" %}
+
+{% wiki_form form %}
+{% addtoblock "js" %}
+<script language="javascript">
+  $(document).ready(function() {
+    $("#id_revision").val('{{ article.current_revision.id }}');
+  });
+</script>
+{% endaddtoblock %}
diff --git a/pydis_site/templates/wiki/includes/editor_sidebar.html b/pydis_site/templates/wiki/includes/editor_sidebar.html
new file mode 100644
index 00000000..480dc239
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/editor_sidebar.html
@@ -0,0 +1,42 @@
+{% load i18n sekizai_tags %}
+{% addtoblock "js" %}
+<script type="text/javascript">
+  $(document).ready( function() {
+    $('.sidebar-form').each(function () {
+      $(this).submit( function() {
+        this.unsaved_article_title.value = $('#id_title').val();
+        this.unsaved_article_content.value = $('#id_content').val();
+      });
+    });
+  });
+</script>
+{% endaddtoblock %}
+
+<div class="panel-group" id="accordion_{{ plugin.slug }}">
+
+{% for plugin, plugin_form in sidebar %}
+
+  <div class="panel panel-default">
+
+    <div class="panel-heading">
+      <a class="panel-toggle" href="#collapse_{{ plugin.slug }}" data-toggle="collapse">
+        <h3 class="panel-title"><span class="fa fa-fw {{ plugin.sidebar.icon_class }}"></span> {{ plugin.sidebar.headline }}</h3>
+      </a>
+    </div>
+
+    <div id="collapse_{{ plugin.slug }}" class="panel-collapse collapse{% if plugin_form.errors %} in{% endif %}">
+      <div class="panel-body form-vertical">
+        {% if plugin.sidebar.template %}
+          {% with plugin_form as form and plugin as plugin %}
+            <form method="POST" class="form-horizontal sidebar-form" action="?f={{ plugin_form.form_id }}" enctype="multipart/form-data">
+              {% csrf_token %}
+              {% include plugin.sidebar.template %}
+            </form>
+          {% endwith %}
+        {% endif %}
+      </div>
+    </div>
+
+  </div>
+{% endfor %}
+</div>
diff --git a/pydis_site/templates/wiki/includes/editormedia.html b/pydis_site/templates/wiki/includes/editormedia.html
new file mode 100644
index 00000000..307a3078
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/editormedia.html
@@ -0,0 +1,15 @@
+{% load sekizai_tags static %}
+{% addtoblock "js" %}
+<script type="text/javascript" src="{% static "wiki/js/editor.js" %}"></script>
+{% for js in editor.Media.js %}
+<script type="text/javascript" src="{% static js %}"></script>
+{% endfor %}
+{% endaddtoblock %}
+
+{% addtoblock "css" %}
+{% for media, srcs in editor.Media.css.items %}
+  {% for src in srcs %}
+    <link rel="stylesheet" media="{{ media }}" href="{% static src %}" />
+  {% endfor %}
+{% endfor %}
+{% endaddtoblock %}
diff --git a/pydis_site/templates/wiki/includes/form.html b/pydis_site/templates/wiki/includes/form.html
new file mode 100644
index 00000000..3e1abb67
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/form.html
@@ -0,0 +1,17 @@
+{% csrf_token %}{% load sekizai_tags %}
+
+{% include "wiki/includes/formerrors.html" %}
+
+{% addtoblock "js" %}
+{{ form.media.js }}
+{% endaddtoblock %}
+
+{% addtoblock "css" %}
+{{ form.media.css }}
+{% endaddtoblock %}
+
+{% for field in form %}
+
+  {% include "wiki/includes/formfield.html" %}
+
+{% endfor %}
diff --git a/pydis_site/templates/wiki/includes/formerrors.html b/pydis_site/templates/wiki/includes/formerrors.html
new file mode 100644
index 00000000..72d3c539
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/formerrors.html
@@ -0,0 +1,8 @@
+{% if form.non_field_errors %}
+  {% if form_error_title %}<h4 class="alert-heading">{{ form_error_title }}</h4>{% endif %}
+  {% for error_message in form.non_field_errors %}
+    <div class="alert alert-block alert-danger">
+      {{ error_message }}
+    </div>
+  {% endfor %}
+{% endif %}
diff --git a/pydis_site/templates/wiki/includes/formfield.html b/pydis_site/templates/wiki/includes/formfield.html
new file mode 100644
index 00000000..db6725a9
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/formfield.html
@@ -0,0 +1,25 @@
+{% if field.is_hidden %}
+  {{ field }}
+{% else %}
+
+<div id="div_{{ field.auto_id }}" class="form-group{% if field.errors %} has-error{% endif %}">
+  <div class="wiki-label col-xs-3 col-lg-2">
+  {% if field.label %}
+    <label for="{{ field.id_for_label }}" class="control-label {% if field.field.required %}requiredField{% endif %}">
+    {{ field.label|safe }}
+    </label>
+  {% endif %}
+  </div>
+  <div class="wiki-control col-xs-9 col-lg-10">
+    {{ field }} {% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+    {% if field.errors %}
+      {% for error in field.errors %}
+        <div id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="help-block"><strong>{{ error }}</strong></div>
+      {% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+      <p id="hint_{{ field.auto_id }}" class="help-block">{{ field.help_text|safe }}</p>
+    {% endif %}
+  </div>
+</div>
+{% endif %}
diff --git a/pydis_site/templates/wiki/includes/messages.html b/pydis_site/templates/wiki/includes/messages.html
new file mode 100644
index 00000000..f8362829
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/messages.html
@@ -0,0 +1,9 @@
+{% 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>
+  {% endfor %}
+{% endif %}
diff --git a/pydis_site/templates/wiki/includes/modals.html b/pydis_site/templates/wiki/includes/modals.html
new file mode 100644
index 00000000..b86d4f65
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/modals.html
@@ -0,0 +1,31 @@
+{% 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
new file mode 100644
index 00000000..af7e422b
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/move_tree.html
@@ -0,0 +1,16 @@
+{% 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/includes/pagination.html b/pydis_site/templates/wiki/includes/pagination.html
new file mode 100644
index 00000000..6e7ec608
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/pagination.html
@@ -0,0 +1,24 @@
+{% load i18n %}
+{% if is_paginated %}
+<ul class="pagination">
+    {% if page_obj.has_previous %}
+        <li><a class="prev btn btn-info" href="?{% if search_query %}q={{ search_query  }}&{% endif %}page={{ page_obj.previous_page_number }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">&laquo;</a></li>
+    {% else %}
+        <li class="disabled"><span>&laquo;</span></li>
+    {% endif %}
+
+    {% for pc in paginator.page_range %}
+        {% if pc == 0 %}
+            <li class="disabled"><span>...</span></li>
+        {% else %}
+            <li class="{% if pc == page_obj.number %} active{% endif %}"><a href="?{% if search_query %}q={{ search_query  }}&{% endif %}page={{ pc }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">{{ pc }}</a></li>
+        {% endif %}
+    {% endfor %}
+
+    {% if page_obj.has_next %}
+        <li><a class="next btn btn-info" href="?{% if search_query %}q={{ search_query  }}&{% endif %}page={{ page_obj.next_page_number }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">&raquo;</a></li>
+    {% else %}
+        <li class="disabled"><span>&raquo;</span></li>
+    {% endif %}
+</ul>
+{% endif %}
diff --git a/pydis_site/templates/wiki/includes/render.html b/pydis_site/templates/wiki/includes/render.html
new file mode 100644
index 00000000..28ab76c9
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/render.html
@@ -0,0 +1,26 @@
+{% load wiki_tags i18n cache sekizai_tags static %}
+
+{% addtoblock "js" %}
+  <script type="text/javascript" src="{% static "wiki/js/article.js" %}"></script>
+{% endaddtoblock %}
+
+<div class="wiki-article">
+  {{ content|default:"" }}
+</div>
+
+{% for plugin in plugins %}
+  {% if plugin.RenderMedia.css %}
+    {% addtoblock "css" %}
+      {% for media, url in plugin.RenderMedia.css.items %}
+        <link rel="stylesheet" href="{% static url %}" />
+      {% endfor %}
+    {% endaddtoblock %}
+  {% endif %}
+  {% if plugin.RenderMedia.js %}
+    {% addtoblock "js" %}
+      {% for url in plugin.RenderMedia.js %}
+        <script type="text/javascript" src="{% static url %}"></script>
+      {% endfor %}
+    {% endaddtoblock %}
+  {% endif %}
+{% endfor %}
diff --git a/pydis_site/templates/wiki/includes/revision_info.html b/pydis_site/templates/wiki/includes/revision_info.html
new file mode 100644
index 00000000..95b01baf
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/revision_info.html
@@ -0,0 +1,25 @@
+{% comment %}
+
+  This reusable code is shared between different templates and different inheritors of
+  BaseRevision.
+
+{% endcomment %}
+
+
+{% load wiki_tags i18n %}
+{% if not hidedate %}{{ revision.created }}{% endif %} {% if not hidenumber %}(#{{ revision.revision_number }}) {% trans "by" %}{% endif %} {% if revision.user %}{{ revision.user }}{% else %}{% if article|can_moderate:user %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %}
+{% if revision == current_revision %}
+  <strong>*</strong>
+{% endif %}
+{% if revision.deleted %}
+<span class="badge badge-important">{% trans "deleted" %}</span>
+{% endif %}
+{% if revision.previous_revision.deleted and not revision.deleted %}
+<span class="badge badge-success">{% trans "restored" %}</span>
+{% endif %}
+{% if revision.locked %}
+<span class="badge">{% trans "locked" %}</span>
+{% endif %}
+{% if revision.previous_revision.locked and not revision.locked %}
+<span class="badge">{% trans "unlocked" %}</span>
+{% endif %}
diff --git a/pydis_site/templates/wiki/includes/searchresult.html b/pydis_site/templates/wiki/includes/searchresult.html
new file mode 100644
index 00000000..f6dd7a09
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/searchresult.html
@@ -0,0 +1,22 @@
+{% load wiki_tags i18n humanize %}
+
+
+<tr>
+  <td>
+    {% for urlpath in article.urlpath_set.all %}
+      <a href="{% url 'wiki:get' path=urlpath.path %}">{{ article.current_revision.title }}<br /><small class="muted">/{{ urlpath.path }}</small></a>
+    {% empty %}
+      <a href="{% url 'wiki:get' article_id=article.id %}">{{ article.current_revision.title }}</a>
+    {% endfor %}
+    {% if article.current_revision.deleted %}
+      <span class="fa fa-trash"></span>
+    {% endif %}
+    {% if article.current_revision.locked %}
+      <span class="fa fa-lock"></span>
+    {% endif %}
+    <p class="muted"><small>{{ article.render|get_content_snippet:search_query }}</small></p>
+  </td>
+  <td style="white-space: nowrap">
+    {{ article.current_revision.created|naturaltime }}
+  </td>
+</tr>
diff --git a/pydis_site/templates/wiki/move.html b/pydis_site/templates/wiki/move.html
new file mode 100644
index 00000000..d93a3675
--- /dev/null
+++ b/pydis_site/templates/wiki/move.html
@@ -0,0 +1,66 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n sekizai_tags %}
+
+{% block wiki_pagetitle %}{% trans "Move" %}: {{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_contents_tab %}
+
+<div class="row">
+  <div class="col-lg-10">
+    <form method="POST" class="form-horizontal" id="article_move_form">
+      {% wiki_form form %}
+
+      <div class="btn-group" id="dest_selector">
+        <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
+          <span class="dest_selector_title"></span>
+          <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+            {% with current_path=root_path %}{% include "wiki/includes/move_tree.html" %}{% endwith %}
+        </ul>
+      </div>
+      <p class="col-lg-offset-2">
+        {% blocktrans count cnt=urlpath.get_descendants.count trimmed %}
+          {{ cnt }} nested article will also be moved.<br>
+          Be careful, links to this article and {{ cnt }} article nested
+          in this hierarchy will not be updated.
+          {% plural %}
+          {{ cnt }} nested articles will also be moved.<br>
+          Be careful, links to this article and {{ cnt }} articles nested
+          in this hierarchy will not be updated.
+        {% endblocktrans %}
+      </p>
+      <div class="form-group form-actions">
+        <div class="col-lg-12 col-lg-offset-2">
+          <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+            <span class="fa fa-arrow-left"></span>
+            {% trans "Go back" %}
+          </a>
+          <button class="btn btn-large btn-primary" type="submit" name="move" id="id_move">
+            <span class="fa fa-random"></span>
+            {% trans "Move article" %}
+          </button>
+        </div>
+      </div>
+    </form>
+  </div>
+</div>
+
+{% addtoblock "js" %}
+
+  <script type="text/javascript">
+    $('#id_destination').after($('#dest_selector').remove());
+    $('#id_destination').attr('type', 'hidden');
+    $('#id_slug').val('{{ urlpath.slug }}');
+    select_path('{{urlpath.parent.pk}}', '{{urlpath.parent}}');
+
+    function select_path(path, title) {
+      $('#id_destination').val(path);
+      if (title == "(root)") title = "";
+      $('#dest_selector .dest_selector_title').html(title ? title : "&nbsp;&nbsp;/&nbsp;&nbsp;");
+    }
+  </script>
+
+{% endaddtoblock %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/permission_denied.html b/pydis_site/templates/wiki/permission_denied.html
new file mode 100644
index 00000000..06afbbda
--- /dev/null
+++ b/pydis_site/templates/wiki/permission_denied.html
@@ -0,0 +1,32 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n %}
+
+
+{% block wiki_pagetitle %}Permission Denied{% endblock %}
+
+{% block wiki_contents %}
+  <h1 class="page-header">{% trans "Permission Denied" %}</h1>
+  <p class="alert denied alert-danger">
+    <i class="fa fa-minus-circle"></i>
+    {% trans "Sorry, you don't have permission to access this page." %}
+  </p>
+  {% if article.current_revision.locked %}
+  <p class="alert alert-warning">
+    <i class="fa fa-lock"></i>
+    {% trans "This article is locked for editing." %}
+  </p>
+  {% endif %}
+
+  <p>
+  {% if not read_denied %}
+    <a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}" class="btn btn-default">
+      {% trans "Back to article" %}
+    </a>
+  {% elif urlpath.parent %}
+    <a href="{% url 'wiki:get' path=urlpath.parent.path %}" class="btn btn-default">
+      {% trans "Back to article" %}
+    </a>
+  {% endif %}
+  </p>
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/preview_inline.html b/pydis_site/templates/wiki/preview_inline.html
new file mode 100644
index 00000000..77232753
--- /dev/null
+++ b/pydis_site/templates/wiki/preview_inline.html
@@ -0,0 +1,55 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n sekizai_tags static %}
+
+{% block wiki_body %}
+
+  {% if revision %}
+    <div class="alert alert-info">
+      <strong>{% trans "Previewing revision" %}:</strong>
+      {% include "wiki/includes/revision_info.html" %}
+    </div>
+  {% endif %}
+
+  {% if merge %}
+    <div class="alert alert-info">
+      <strong>{% trans "Previewing merge between" %}:</strong>
+      {% include "wiki/includes/revision_info.html" with revision=merge1 %}
+      <strong>{% trans "and" %}</strong>
+      {% include "wiki/includes/revision_info.html" with revision=merge2 %}
+    </div>
+    {% if merge1.deleted %}
+    <div class="alert alert-danger">
+      <strong>{% trans "You cannot merge with a deleted revision" %}</strong>
+    </div>
+    {% endif %}
+  {% endif %}
+
+  <h1 class="page-header">{{ title }}</h1>
+
+  {% if revision and revision.deleted %}
+    <div class="warning">
+      <strong>{% trans "This revision has been deleted." %}</strong>
+      <p>{% trans "Restoring to this revision will mark the article as deleted." %}</p>
+    </div>
+  {% else %}
+
+    {% wiki_render article content %}
+    {% for plugin in plugins %}
+      {% if plugin.RenderMedia.css %}
+        {% addtoblock "css" %}
+          {% for media, url in plugin.RenderMedia.css.items %}
+            <link rel="stylesheet" href="{% static url %}" />
+          {% endfor %}
+        {% endaddtoblock %}
+      {% endif %}
+      {% if plugin.RenderMedia.js %}
+        {% addtoblock "js" %}
+          {% for url in plugin.RenderMedia.js %}
+            <script type="text/javascript" src="{% static url %}"></script>
+          {% endfor %}
+        {% endaddtoblock %}
+      {% endif %}
+    {% endfor %}
+  {% endif %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/root_missing.html b/pydis_site/templates/wiki/root_missing.html
new file mode 100644
index 00000000..0fb610ad
--- /dev/null
+++ b/pydis_site/templates/wiki/root_missing.html
@@ -0,0 +1,37 @@
+{% extends "wiki/create_root.html" %}
+{% load i18n wiki_tags %}
+
+{% block wiki_contents %}
+
+<div class="row">
+  <div class="col-lg-2"></div>
+  <div class="col-lg-8">
+
+    <h1>{% trans "Congratulations!" %}</h1>
+    <p class="lead">
+      {% trans "You have django-wiki installed and it seems to be working. But there are no articles yet." %}
+    </p>
+
+    {% if not user.is_superuser %}
+      <p class="lead">
+        {% trans "Not to worry! You simply have to login with a superuser account and create the first article in the root of the URL hierarchy." %}
+      </p>
+      {% login_url as wiki_login_url %}
+      {% if wiki_login_url %}
+        <a href="{{ wiki_login_url }}" class="btn btn-primary btn-lg">{% trans "Click here to login" %}</a>
+      {% endif %}
+
+    {% else %}
+
+      <p class="lead">
+        {% trans "But since you're logged in as a superuser, we should really get started..." %}
+      </p>
+      <a href="{% url 'wiki:root_create' %}" class="btn btn-primary btn-lg">{% trans "Yes, I'll go and create the first article" %}</a>
+      <a href="http://django-wiki.readthedocs.org/" class="btn btn-default">{% trans "No thanks, I'd rather read the documentation" %}</a>
+
+      {% endif %}
+  </div>
+  <div class="col-lg-2"></div>
+</div>
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/search.html b/pydis_site/templates/wiki/search.html
new file mode 100644
index 00000000..080cf40d
--- /dev/null
+++ b/pydis_site/templates/wiki/search.html
@@ -0,0 +1,53 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n humanize %}
+
+
+{% block wiki_pagetitle %}{% trans "Search results for:" %} {{ search_query }}{% endblock %}
+
+{% block wiki_contents %}
+
+<h1 class="page-header">{% trans "Search results for:" %} {{ search_query }}</h1>
+
+<form class="form-search directory-toolbar">
+<p class="lead">
+  <div class="pull-right">
+    {% if urlpath %}
+      {% trans "Searching in" %} {{ urlpath.article }}
+    {% else %}
+      {% trans "Searching whole wiki" %}
+    {% endif %}
+    <div class="input-group">
+      <input type="search" class="form-control search-query" name="q" value="{{ search_query }}" />
+      <span class="input-group-btn">
+        <button class="btn btn-default" type="submit">
+          <span class="fa fa-search"></span>
+        </button>
+      </span>
+    </div>
+  </div>
+  <p>{% blocktrans with paginator.object_list.count as cnt %}Your search returned <strong>{{ cnt }}</strong> results.{% endblocktrans %}</p>
+  <div class="clearfix"></div>
+</p>
+</form>
+
+<table class="table table-striped">
+  <tr>
+    <th style="width: 75%">{% trans "Title" %}</th>
+    <th>{% trans "Last modified" %}</th>
+  </tr>
+  {% for article in articles %}
+    {% block wiki_search_loop %}
+    {% include "wiki/includes/searchresult.html" %}
+    {% endblock %}
+    {% empty%}
+    <tr>
+      <td colspan="100">
+        <em>{% trans "There are no articles in this level" %}</em>
+      </td>
+    </tr>
+  {% endfor %}
+</table>
+
+{% include "wiki/includes/pagination.html" %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/settings.html b/pydis_site/templates/wiki/settings.html
new file mode 100644
index 00000000..6d6c0f49
--- /dev/null
+++ b/pydis_site/templates/wiki/settings.html
@@ -0,0 +1,24 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n %}
+
+
+{% block wiki_pagetitle %}{% trans "Settings" %}: {{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_contents_tab %}
+
+  {% for form in forms %}
+  <form method="POST" class="form-horizontal settings-form" action="?f={{form.action}}">
+    <h3 class="page-header">{{ form.settings_form_headline }}</h3>
+    {% wiki_form form %}
+    <div class="form-group form-actions">
+      <div class="col-lg-10 col-lg-2-offset">
+        <button type="submit" name="save" value="1" class="btn btn-primary">
+          <span class="fa fa-check"></span>
+          {% trans "Save changes" %}
+        </button>
+      </div>
+    </div>
+  </form>
+  {% endfor %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/source.html b/pydis_site/templates/wiki/source.html
new file mode 100644
index 00000000..0c610208
--- /dev/null
+++ b/pydis_site/templates/wiki/source.html
@@ -0,0 +1,17 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n humanize %}
+
+
+{% block wiki_pagetitle %}{% trans "Source of" %} {{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_contents_tab %}
+
+{% if article.current_revision.locked %}
+<p class="lead">{% trans "This article is currently locked for editing." %}</p>
+{% endif %}
+
+<pre class="pre-scrollable">
+  {{ article.current_revision.content }}
+</pre>
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/view.html b/pydis_site/templates/wiki/view.html
new file mode 100644
index 00000000..2becdaae
--- /dev/null
+++ b/pydis_site/templates/wiki/view.html
@@ -0,0 +1,9 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n sekizai_tags %}
+
+
+{% block wiki_contents_tab %}
+
+  {% wiki_render article %}
+
+{% endblock %}
-- 
cgit v1.2.3


From 911f37e04c33c3b42c95da195b53f933c9c367f6 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 8 Apr 2019 15:45:14 +0100
Subject: Pushing before work is over

---
 pydis_site/apps/home/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pydis_site/apps/home/urls.py b/pydis_site/apps/home/urls.py
index ede0531e..4ed95651 100644
--- a/pydis_site/apps/home/urls.py
+++ b/pydis_site/apps/home/urls.py
@@ -7,5 +7,5 @@ app_name = 'home'
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('wiki/', include('wiki.urls')),
-    path('/', TemplateView.as_view(template_name='home/index.html'), name='index'),
+    path('', TemplateView.as_view(template_name='home/index.html'), name='index'),
 ]
-- 
cgit v1.2.3


From a880a3441100b387e1171c79cbeff36d3aa8d445 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 10 Apr 2019 23:17:08 +0100
Subject: Some initial work on updating the wiki templates for Bulma

---
 pydis_site/settings.py                      |  1 +
 pydis_site/templates/wiki/base.html         | 31 +++++++++++++-
 pydis_site/templates/wiki/base_site.html    | 14 +++++--
 pydis_site/templates/wiki/create_root.html  | 18 +-------
 pydis_site/templates/wiki/root_missing.html | 64 +++++++++++++++--------------
 5 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index e55b3132..6c9af3aa 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -272,6 +272,7 @@ BULMA_SETTINGS = {
 }
 
 # Required for the wiki
+LOGIN_URL = "/admin/login"  # TODO: Update this when the real login system is in place
 SITE_ID = 1
 
 WIKI_ACCOUNT_HANDLING = False
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index 5260bfcd..95b0186d 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -1,3 +1,30 @@
-{% extends "wiki/base_site.html" %}
+{% extends "base/base.html" %}
+{% load sekizai_tags i18n wiki_tags static %}
 
-{# Intentionally empty, to allow easy customization with no copy-paste #}
+{% block title %}
+  Wiki | {% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %}{% endblock %}
+{% endblock %}
+
+{% block content %}
+  {% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="far" use_logo=True %}
+
+  {% block wiki_body %}
+    {% block wiki_navbar %}
+
+    {% endblock %}
+
+    <section class="section">
+      <div class="container">
+        {% wiki_messages %}
+
+        {% block wiki_breadcrumbs %}{% endblock %}
+
+        <div class="content">
+          {% block wiki_contents %}{% endblock %}
+        </div>
+      </div>
+    </section>
+  {% endblock %}
+
+  {% include "base/footer.html" %}
+{% endblock %}
diff --git a/pydis_site/templates/wiki/base_site.html b/pydis_site/templates/wiki/base_site.html
index d025e53c..afa2b41d 100644
--- a/pydis_site/templates/wiki/base_site.html
+++ b/pydis_site/templates/wiki/base_site.html
@@ -1,8 +1,16 @@
-{% load sekizai_tags i18n wiki_tags static %}<!DOCTYPE html>
+{% extends "base/base.html" %}
+{% load sekizai_tags i18n wiki_tags static %}
+
+{# This template is no longer used - we can remove it later when the rest are done #}
+
+{% block title %}
+  {% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %} - django-\/\/  i K |{% endblock %}
+{% endblock %}
+
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>{% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %} - django-\/\/  i K |{% endblock %}</title>
+    <title>Wiki | {% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %}{% endblock %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="description" content="">
@@ -149,8 +157,6 @@
       </footer>
       </div>
 
-    </div> <!-- /container -->
-
     {% endblock %}
 
     <script src="{% static "wiki/js/jquery-3.3.1.min.js" %}"></script>
diff --git a/pydis_site/templates/wiki/create_root.html b/pydis_site/templates/wiki/create_root.html
index 73a14ae0..52f5ffb6 100644
--- a/pydis_site/templates/wiki/create_root.html
+++ b/pydis_site/templates/wiki/create_root.html
@@ -4,23 +4,9 @@
 {% block wiki_pagetitle %}{% trans "Create root article" %}{% endblock %}
 
 {% block wiki_contents %}
+  <h1 class="title">{% trans "Congratulations!" %}</h1>
 
-  {% addtoblock "js" %}
-  {% for js in editor.Media.js %}
-  <script type="text/javascript" src="{% static js %}"></script>
-  {% endfor %}
-  {% endaddtoblock %}
-
-  {% addtoblock "css" %}
-  {% for media, srcs in editor.Media.css.items %}
-    {% for src in srcs %}
-      <link rel="stylesheet" media="{{ media }}" href="{% static src %}" />
-    {% endfor %}
-  {% endfor %}
-  {% endaddtoblock %}
-
-  <h1>{% trans "Congratulations!" %}</h1>
-  <p class="lead">
+  <p>
     {% trans "You have django-wiki installed... but there are no articles. So it's time to create the first one, the root article." %}
     {% trans "In the beginning, it will only be editable by administrators, but you can define permissions after." %}
   </p>
diff --git a/pydis_site/templates/wiki/root_missing.html b/pydis_site/templates/wiki/root_missing.html
index 0fb610ad..01efa4cb 100644
--- a/pydis_site/templates/wiki/root_missing.html
+++ b/pydis_site/templates/wiki/root_missing.html
@@ -2,36 +2,40 @@
 {% load i18n wiki_tags %}
 
 {% block wiki_contents %}
-
-<div class="row">
-  <div class="col-lg-2"></div>
-  <div class="col-lg-8">
-
-    <h1>{% trans "Congratulations!" %}</h1>
-    <p class="lead">
-      {% trans "You have django-wiki installed and it seems to be working. But there are no articles yet." %}
-    </p>
-
-    {% if not user.is_superuser %}
-      <p class="lead">
-        {% trans "Not to worry! You simply have to login with a superuser account and create the first article in the root of the URL hierarchy." %}
-      </p>
-      {% login_url as wiki_login_url %}
-      {% if wiki_login_url %}
-        <a href="{{ wiki_login_url }}" class="btn btn-primary btn-lg">{% trans "Click here to login" %}</a>
-      {% endif %}
-
-    {% else %}
-
-      <p class="lead">
-        {% trans "But since you're logged in as a superuser, we should really get started..." %}
-      </p>
-      <a href="{% url 'wiki:root_create' %}" class="btn btn-primary btn-lg">{% trans "Yes, I'll go and create the first article" %}</a>
-      <a href="http://django-wiki.readthedocs.org/" class="btn btn-default">{% trans "No thanks, I'd rather read the documentation" %}</a>
-
-      {% endif %}
+  <div class="columns">
+    <div class="column is-two-thirds is-offset-2">
+      <article class="message is-primary">
+        <div class="message-header">
+          <p>Congratulations!</p>
+        </div>
+        <div class="message-body">
+          <p>
+            {% trans "You have django-wiki installed and it seems to be working. But there are no articles yet." %}
+          </p>
+
+          {% if not user.is_superuser %}
+            <p>
+              {% trans "Not to worry! You simply have to login with a superuser account and create the first article in the root of the URL hierarchy." %}
+            </p>
+
+            {% login_url as wiki_login_url %}
+
+            {% if wiki_login_url %}
+              <div class="has-text-centered">
+                <a href="{{ wiki_login_url }}" class="button is-primary">{% trans "Click here to login" %}</a>
+              </div>
+            {% endif %}
+          {% else %}
+            <p>
+              {% trans "But since you're logged in as a superuser, we should really get started..." %}
+            </p>
+
+            <a class="button is-primary" href="{% url 'wiki:root_create' %}">Create Article</a>
+            <a class="button is-info" href="http://django-wiki.readthedocs.org/">Documentation</a>
+          {% endif %}
+        </div>
+      </article>
+    </div>
   </div>
-  <div class="col-lg-2"></div>
-</div>
 
 {% endblock %}
-- 
cgit v1.2.3


From d44d5fcb91acbdb8e1d0684f223c9d6324a0c944 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 11 Apr 2019 19:32:21 +0100
Subject: Some work towards initial pages and forms

There's tons more to do here, ultimately
---
 pydis_site/templates/wiki/create_root.html        | 42 ++++++++++----
 pydis_site/templates/wiki/includes/formfield.html | 67 ++++++++++++++++-------
 pydis_site/templates/wiki/root_missing.html       | 11 ++--
 3 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/pydis_site/templates/wiki/create_root.html b/pydis_site/templates/wiki/create_root.html
index 52f5ffb6..7b677d47 100644
--- a/pydis_site/templates/wiki/create_root.html
+++ b/pydis_site/templates/wiki/create_root.html
@@ -1,24 +1,42 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n sekizai_tags static %}
+{% load wiki_tags crispy_forms_tags i18n sekizai_tags static %}
 
 {% block wiki_pagetitle %}{% trans "Create root article" %}{% endblock %}
 
 {% block wiki_contents %}
-  <h1 class="title">{% trans "Congratulations!" %}</h1>
-
-  <p>
-    {% trans "You have django-wiki installed... but there are no articles. So it's time to create the first one, the root article." %}
-    {% trans "In the beginning, it will only be editable by administrators, but you can define permissions after." %}
-  </p>
+  <div class="columns">
+    <div class="column is-two-thirds is-offset-2">
+      <article class="message is-primary">
+        <div class="message-header">
+          <p>Create first article</p>
+        </div>
+        <div class="message-body">
+          <p>
+            Please create the root article. This article will be available at the root of your wiki,
+            so consider creating a landing page here.
+          </p>
+          <p>
+            Please note that, to begin with, this article may only be modified by wiki administrators.
+            Once it's been created, you may edit the permissions and set up plugins, metadata, and so on.
+          </p>
+        </div>
+      </article>
+    </div>
+  </div>
 
-  <h2 class="page-header">{% trans "Root article" %}</h2>
+  <h2 class="title is-2">{% trans "Root article" %}</h2>
 
   <form method="POST" class="form-horizontal">
     {% wiki_form form %}
-    <div class="form-group form-actions">
-      <div class="col-lg-2"></div>
-      <div class="col-lg-10">
-        <input type="submit" name="save_changes" value="{% trans "Create root" %} &raquo;" class="btn btn-primary btn-lg" />
+
+    <div class="field is-horizontal">
+      <div class="field-label">
+        {# Empty for spacing #}
+      </div>
+      <div class="field-body">
+        <div class="control">
+          <input type="submit" class="button is-primary" name="save_changes" value="Create" />
+        </div>
       </div>
     </div>
   </form>
diff --git a/pydis_site/templates/wiki/includes/formfield.html b/pydis_site/templates/wiki/includes/formfield.html
index db6725a9..9ca88d4a 100644
--- a/pydis_site/templates/wiki/includes/formfield.html
+++ b/pydis_site/templates/wiki/includes/formfield.html
@@ -1,25 +1,54 @@
 {% if field.is_hidden %}
   {{ field }}
 {% else %}
+  <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
+    <div class="field-label">
+      {% if field.label %}
+        <label for="div_{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk">*</span>{% endif %}
+        </label>
+      {% endif %}
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+    <div class="field-body">
+      <div class="field">
+        <div class="control">
+          {{ field }}
+        </div>
+      </div>
 
-<div id="div_{{ field.auto_id }}" class="form-group{% if field.errors %} has-error{% endif %}">
-  <div class="wiki-label col-xs-3 col-lg-2">
-  {% if field.label %}
-    <label for="{{ field.id_for_label }}" class="control-label {% if field.field.required %}requiredField{% endif %}">
-    {{ field.label|safe }}
-    </label>
-  {% endif %}
+      {% if field.errors %}
+        <p class="help is-danger">
+          {% for error in field.errors %}
+            <span id="error_{{ forloop.counter }}_{{ field.auto_id }}">{{ error }}</span><br />
+          {% endfor %}
+        </p>
+      {% endif %}
+    </div>
   </div>
-  <div class="wiki-control col-xs-9 col-lg-10">
-    {{ field }} {% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
-    {% if field.errors %}
-      {% for error in field.errors %}
-        <div id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="help-block"><strong>{{ error }}</strong></div>
-      {% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help-block">{{ field.help_text|safe }}</p>
-    {% endif %}
-  </div>
-</div>
+
+{#<div id="div_{{ field.auto_id }}" class="form-group{% if field.errors %} has-error{% endif %}">#}
+{#  <div class="wiki-label col-xs-3 col-lg-2">#}
+{#  {% if field.label %}#}
+{#    <label for="{{ field.id_for_label }}" class="control-label {% if field.field.required %}requiredField{% endif %}">#}
+{#    {{ field.label|safe }}#}
+{#    </label>#}
+{#  {% endif %}#}
+{#  </div>#}
+{#  <div class="wiki-control col-xs-9 col-lg-10">#}
+{#    {{ field }} {% if field.field.required %}<span class="asteriskField">*</span>{% endif %}#}
+{#    {% if field.errors %}#}
+{#      {% for error in field.errors %}#}
+{#        <div id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="help-block"><strong>{{ error }}</strong></div>#}
+{#      {% endfor %}#}
+{#    {% endif %}#}
+{#    {% if field.help_text %}#}
+{#      <p id="hint_{{ field.auto_id }}" class="help-block">{{ field.help_text|safe }}</p>#}
+{#    {% endif %}#}
+{#  </div>#}
+{#</div>#}
 {% endif %}
diff --git a/pydis_site/templates/wiki/root_missing.html b/pydis_site/templates/wiki/root_missing.html
index 01efa4cb..c3b89c45 100644
--- a/pydis_site/templates/wiki/root_missing.html
+++ b/pydis_site/templates/wiki/root_missing.html
@@ -6,28 +6,29 @@
     <div class="column is-two-thirds is-offset-2">
       <article class="message is-primary">
         <div class="message-header">
-          <p>Congratulations!</p>
+          <p>No articles found</p>
         </div>
         <div class="message-body">
           <p>
-            {% trans "You have django-wiki installed and it seems to be working. But there are no articles yet." %}
+            It appears that there are no articles available on this wiki.
           </p>
 
           {% if not user.is_superuser %}
             <p>
-              {% trans "Not to worry! You simply have to login with a superuser account and create the first article in the root of the URL hierarchy." %}
+              To get started, please login with a superuser account.
             </p>
 
             {% login_url as wiki_login_url %}
 
             {% if wiki_login_url %}
               <div class="has-text-centered">
-                <a href="{{ wiki_login_url }}" class="button is-primary">{% trans "Click here to login" %}</a>
+                <a href="{{ wiki_login_url }}" class="button is-primary">Login</a>
               </div>
             {% endif %}
           {% else %}
             <p>
-              {% trans "But since you're logged in as a superuser, we should really get started..." %}
+              Let's get started - click below to create the first article, or to read up on the
+              <code>django-wiki</code> documentation.
             </p>
 
             <a class="button is-primary" href="{% url 'wiki:root_create' %}">Create Article</a>
-- 
cgit v1.2.3


From ed8311057579de883fc010f9dd5e1bb331970418 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 11 Apr 2019 20:34:18 +0100
Subject: Lots of extra form input handling.

But now the root article creator form renders nicely!
---
 pydis_site/apps/home/templatetags/wiki_extra.py   | 66 +++++++++++++++++++++++
 pydis_site/templates/wiki/base.html               |  7 +++
 pydis_site/templates/wiki/create_root.html        | 15 ++++++
 pydis_site/templates/wiki/forms/fields/char.html  | 21 ++++++++
 pydis_site/templates/wiki/includes/formfield.html | 27 ++--------
 5 files changed, 114 insertions(+), 22 deletions(-)
 create mode 100644 pydis_site/apps/home/templatetags/wiki_extra.py
 create mode 100644 pydis_site/templates/wiki/forms/fields/char.html

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
new file mode 100644
index 00000000..9749a411
--- /dev/null
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -0,0 +1,66 @@
+from django import template
+from django.forms import (
+    BooleanField, CharField, ChoiceField, ComboField, DateField, DateTimeField, DecimalField, DurationField, EmailField,
+    Field, FileField, FilePathField, FloatField, GenericIPAddressField, ImageField, IntegerField, ModelChoiceField,
+    ModelMultipleChoiceField, MultiValueField, MultipleChoiceField, NullBooleanField, RegexField, SlugField,
+    SplitDateTimeField, TimeField, TypedChoiceField, TypedMultipleChoiceField, URLField, UUIDField, BoundField)
+from django.template import Template
+from django.template.loader import get_template
+from django.utils.safestring import mark_safe
+from wiki.editors.markitup import MarkItUpWidget
+
+TEMPLATE_PATH = "wiki/forms/fields/{0}.html"
+
+TEMPLATES = {
+    BooleanField: TEMPLATE_PATH.format("boolean"),
+    CharField: TEMPLATE_PATH.format("char"),
+    ChoiceField: TEMPLATE_PATH.format("choice"),
+    TypedChoiceField: TEMPLATE_PATH.format("typed_choice"),
+    DateField: TEMPLATE_PATH.format("date"),
+    DateTimeField: TEMPLATE_PATH.format("date_time"),
+    DecimalField: TEMPLATE_PATH.format("decimal"),
+    DurationField: TEMPLATE_PATH.format("duration"),
+    EmailField: TEMPLATE_PATH.format("email"),
+    FileField: TEMPLATE_PATH.format("file"),
+    FilePathField: TEMPLATE_PATH.format("file_path"),
+    FloatField: TEMPLATE_PATH.format("float"),
+    ImageField: TEMPLATE_PATH.format("image"),
+    IntegerField: TEMPLATE_PATH.format("integer"),
+    GenericIPAddressField: TEMPLATE_PATH.format("generic_ip_address"),
+    MultipleChoiceField: TEMPLATE_PATH.format("multiple_choice"),
+    TypedMultipleChoiceField: TEMPLATE_PATH.format("typed_multiple_choice"),
+    NullBooleanField: TEMPLATE_PATH.format("null_boolean"),
+    RegexField: TEMPLATE_PATH.format("regex"),
+    SlugField: TEMPLATE_PATH.format("slug"),
+    TimeField: TEMPLATE_PATH.format("time"),
+    URLField: TEMPLATE_PATH.format("url"),
+    UUIDField: TEMPLATE_PATH.format("uuid"),
+
+    ComboField: TEMPLATE_PATH.format("combo"),
+    MultiValueField: TEMPLATE_PATH.format("multi_value"),
+    SplitDateTimeField: TEMPLATE_PATH.format("split_date_time"),
+
+    ModelChoiceField: TEMPLATE_PATH.format("model_choice"),
+    ModelMultipleChoiceField: TEMPLATE_PATH.format("model_multiple_choice"),
+}
+
+
+register = template.Library()
+
+
+@register.simple_tag
+def render_field(field: Field):
+    if isinstance(field, BoundField):
+        template_path = TEMPLATES.get(field.field.__class__)
+        is_markitup = isinstance(field.field.widget, MarkItUpWidget)
+    else:
+        template_path = TEMPLATES.get(field.__class__)
+        is_markitup = isinstance(field.widget, MarkItUpWidget)
+
+    if not template_path:
+        raise NotImplementedError(f"Unknown field type: {field.__class__}")
+
+    template_obj: Template = get_template(template_path)
+    context = {"field": field, "is_markitup": is_markitup}
+
+    return mark_safe(template_obj.render(context))
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index 95b0186d..44ad8353 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -5,6 +5,13 @@
   Wiki | {% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %}{% endblock %}
 {% endblock %}
 
+{% block head %}
+  {{ block.super }}
+
+  <script src="{% static "wiki/js/jquery-3.3.1.min.js" %}" type="text/javascript"></script>
+  <script src="{% static "wiki/js/core.js" %}" type="text/javascript"></script>
+{% endblock %}
+
 {% block content %}
   {% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="far" use_logo=True %}
 
diff --git a/pydis_site/templates/wiki/create_root.html b/pydis_site/templates/wiki/create_root.html
index 7b677d47..0d7662ec 100644
--- a/pydis_site/templates/wiki/create_root.html
+++ b/pydis_site/templates/wiki/create_root.html
@@ -3,6 +3,21 @@
 
 {% block wiki_pagetitle %}{% trans "Create root article" %}{% endblock %}
 
+{% block head %}
+  {{ block.super }}
+
+  {% for js in editor.Media.js %}
+    <script type="text/javascript" src="{% static js %}"></script>
+  {% endfor %}
+
+  {% for media, srcs in editor.Media.css.items %}
+    {% for src in srcs %}
+      <link rel="stylesheet" media="{{ media }}" href="{% static src %}" />
+    {% endfor %}
+  {% endfor %}
+{% endblock %}
+
+
 {% block wiki_contents %}
   <div class="columns">
     <div class="column is-two-thirds is-offset-2">
diff --git a/pydis_site/templates/wiki/forms/fields/char.html b/pydis_site/templates/wiki/forms/fields/char.html
new file mode 100644
index 00000000..c94f5771
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/fields/char.html
@@ -0,0 +1,21 @@
+{% if is_markitup %}
+  <textarea class="textarea is-family-monospace{% if field.errors %} is-danger{% endif %}"
+            id="{{ field.auto_id }}"
+            rows = 10
+
+            {% if field.required %}required{% endif %}
+            {% if field.max_length %}maxlength="{{ field.maxlength }}"{% endif %}
+            {% if field.min_length %}minlength="{{ field.minelength }}"{% endif %}
+            {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
+  ></textarea>
+{% else %}
+  <input class="input{% if field.errors %} is-danger{% endif %}"
+         type="text"
+         id="{{ field.auto_id }}"
+
+         {% if field.required %}required{% endif %}
+         {% if field.max_length %}maxlength="{{ field.maxlength }}"{% endif %}
+         {% if field.min_length %}minlength="{{ field.minelength }}"{% endif %}
+         {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
+  />
+{% endif %}
diff --git a/pydis_site/templates/wiki/includes/formfield.html b/pydis_site/templates/wiki/includes/formfield.html
index 9ca88d4a..0176f9d4 100644
--- a/pydis_site/templates/wiki/includes/formfield.html
+++ b/pydis_site/templates/wiki/includes/formfield.html
@@ -1,3 +1,5 @@
+{% load wiki_extra %}
+
 {% if field.is_hidden %}
   {{ field }}
 {% else %}
@@ -8,16 +10,18 @@
           {{ field.label | safe }} {% if field.field.required %}<span class="asterisk">*</span>{% endif %}
         </label>
       {% endif %}
+
       {% if field.help_text %}
         <p id="hint_{{ field.auto_id }}" class="help">
           {{ field.help_text|safe }}
         </p>
       {% endif %}
     </div>
+
     <div class="field-body">
       <div class="field">
         <div class="control">
-          {{ field }}
+          {% render_field field %}
         </div>
       </div>
 
@@ -30,25 +34,4 @@
       {% endif %}
     </div>
   </div>
-
-{#<div id="div_{{ field.auto_id }}" class="form-group{% if field.errors %} has-error{% endif %}">#}
-{#  <div class="wiki-label col-xs-3 col-lg-2">#}
-{#  {% if field.label %}#}
-{#    <label for="{{ field.id_for_label }}" class="control-label {% if field.field.required %}requiredField{% endif %}">#}
-{#    {{ field.label|safe }}#}
-{#    </label>#}
-{#  {% endif %}#}
-{#  </div>#}
-{#  <div class="wiki-control col-xs-9 col-lg-10">#}
-{#    {{ field }} {% if field.field.required %}<span class="asteriskField">*</span>{% endif %}#}
-{#    {% if field.errors %}#}
-{#      {% for error in field.errors %}#}
-{#        <div id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="help-block"><strong>{{ error }}</strong></div>#}
-{#      {% endfor %}#}
-{#    {% endif %}#}
-{#    {% if field.help_text %}#}
-{#      <p id="hint_{{ field.auto_id }}" class="help-block">{{ field.help_text|safe }}</p>#}
-{#    {% endif %}#}
-{#  </div>#}
-{#</div>#}
 {% endif %}
-- 
cgit v1.2.3


From e6968597cce2a8834bf5376fed3afcb2372cee5e Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 12 Apr 2019 10:59:21 +0100
Subject: Small typos in char field

---
 pydis_site/templates/wiki/forms/fields/char.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pydis_site/templates/wiki/forms/fields/char.html b/pydis_site/templates/wiki/forms/fields/char.html
index c94f5771..ccae0630 100644
--- a/pydis_site/templates/wiki/forms/fields/char.html
+++ b/pydis_site/templates/wiki/forms/fields/char.html
@@ -4,8 +4,8 @@
             rows = 10
 
             {% if field.required %}required{% endif %}
-            {% if field.max_length %}maxlength="{{ field.maxlength }}"{% endif %}
-            {% if field.min_length %}minlength="{{ field.minelength }}"{% endif %}
+            {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
+            {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
             {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
   ></textarea>
 {% else %}
@@ -14,8 +14,8 @@
          id="{{ field.auto_id }}"
 
          {% if field.required %}required{% endif %}
-         {% if field.max_length %}maxlength="{{ field.maxlength }}"{% endif %}
-         {% if field.min_length %}minlength="{{ field.minelength }}"{% endif %}
+         {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
+         {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
          {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
   />
 {% endif %}
-- 
cgit v1.2.3


From a27d88923c6451d450d9155adb0ccd9fd0dcaa5f Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 12 Apr 2019 11:46:39 +0100
Subject: Finish initial article creation form

---
 pydis_site/templates/wiki/create_root.html        | 31 ++++++++---------------
 pydis_site/templates/wiki/includes/formfield.html |  4 +--
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/pydis_site/templates/wiki/create_root.html b/pydis_site/templates/wiki/create_root.html
index 0d7662ec..08ee7f82 100644
--- a/pydis_site/templates/wiki/create_root.html
+++ b/pydis_site/templates/wiki/create_root.html
@@ -19,27 +19,16 @@
 
 
 {% block wiki_contents %}
-  <div class="columns">
-    <div class="column is-two-thirds is-offset-2">
-      <article class="message is-primary">
-        <div class="message-header">
-          <p>Create first article</p>
-        </div>
-        <div class="message-body">
-          <p>
-            Please create the root article. This article will be available at the root of your wiki,
-            so consider creating a landing page here.
-          </p>
-          <p>
-            Please note that, to begin with, this article may only be modified by wiki administrators.
-            Once it's been created, you may edit the permissions and set up plugins, metadata, and so on.
-          </p>
-        </div>
-      </article>
-    </div>
-  </div>
+  <h2 class="title is-2">Create First Article</h2>
 
-  <h2 class="title is-2">{% trans "Root article" %}</h2>
+  <p>
+    Please create the root article. This article will be available at the root of your wiki,
+    so consider creating a landing page here.
+  </p>
+  <p>
+    Please note that, to begin with, this article may only be modified by wiki administrators.
+    Once it's been created, you may edit the permissions and set up plugins, metadata, and so on.
+  </p>
 
   <form method="POST" class="form-horizontal">
     {% wiki_form form %}
@@ -50,7 +39,7 @@
       </div>
       <div class="field-body">
         <div class="control">
-          <input type="submit" class="button is-primary" name="save_changes" value="Create" />
+          <input type="submit" class="button is-primary is-medium" name="save_changes" value="Create" />
         </div>
       </div>
     </div>
diff --git a/pydis_site/templates/wiki/includes/formfield.html b/pydis_site/templates/wiki/includes/formfield.html
index 0176f9d4..9f68fb26 100644
--- a/pydis_site/templates/wiki/includes/formfield.html
+++ b/pydis_site/templates/wiki/includes/formfield.html
@@ -7,7 +7,7 @@
     <div class="field-label">
       {% if field.label %}
         <label for="div_{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk">*</span>{% endif %}
+          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
         </label>
       {% endif %}
 
@@ -23,7 +23,6 @@
         <div class="control">
           {% render_field field %}
         </div>
-      </div>
 
       {% if field.errors %}
         <p class="help is-danger">
@@ -32,6 +31,7 @@
           {% endfor %}
         </p>
       {% endif %}
+      </div>
     </div>
   </div>
 {% endif %}
-- 
cgit v1.2.3


From dbe815fd1c148135426edbe15f9dcdf016d689d9 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 12 Apr 2019 14:06:40 +0100
Subject: More forms work - Boolean is done!

---
 pydis_site/apps/home/templatetags/wiki_extra.py    | 29 ++++++---
 .../templates/wiki/forms/fields/boolean.html       | 42 +++++++++++++
 pydis_site/templates/wiki/forms/fields/char.html   | 71 ++++++++++++++++------
 .../wiki/forms/fields/in_place_render.html         | 31 ++++++++++
 .../templates/wiki/forms/fields/model_choice.html  | 31 ++++++++++
 pydis_site/templates/wiki/includes/formfield.html  | 32 +---------
 6 files changed, 177 insertions(+), 59 deletions(-)
 create mode 100644 pydis_site/templates/wiki/forms/fields/boolean.html
 create mode 100644 pydis_site/templates/wiki/forms/fields/in_place_render.html
 create mode 100644 pydis_site/templates/wiki/forms/fields/model_choice.html

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index 9749a411..03ca8210 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -1,13 +1,14 @@
 from django import template
 from django.forms import (
-    BooleanField, CharField, ChoiceField, ComboField, DateField, DateTimeField, DecimalField, DurationField, EmailField,
-    Field, FileField, FilePathField, FloatField, GenericIPAddressField, ImageField, IntegerField, ModelChoiceField,
-    ModelMultipleChoiceField, MultiValueField, MultipleChoiceField, NullBooleanField, RegexField, SlugField,
-    SplitDateTimeField, TimeField, TypedChoiceField, TypedMultipleChoiceField, URLField, UUIDField, BoundField)
+    BooleanField, BoundField, CharField, ChoiceField, ComboField, DateField, DateTimeField, DecimalField, DurationField,
+    EmailField, Field, FileField, FilePathField, FloatField, GenericIPAddressField, ImageField, IntegerField,
+    ModelChoiceField, ModelMultipleChoiceField, MultiValueField, MultipleChoiceField, NullBooleanField, RegexField,
+    SlugField, SplitDateTimeField, TimeField, TypedChoiceField, TypedMultipleChoiceField, URLField, UUIDField)
 from django.template import Template
 from django.template.loader import get_template
 from django.utils.safestring import mark_safe
 from wiki.editors.markitup import MarkItUpWidget
+from wiki.plugins.notifications.forms import SettingsModelChoiceField
 
 TEMPLATE_PATH = "wiki/forms/fields/{0}.html"
 
@@ -42,23 +43,33 @@ TEMPLATES = {
 
     ModelChoiceField: TEMPLATE_PATH.format("model_choice"),
     ModelMultipleChoiceField: TEMPLATE_PATH.format("model_multiple_choice"),
+
+    SettingsModelChoiceField: TEMPLATE_PATH.format("in_place_render"),
 }
 
 
 register = template.Library()
 
 
+def get_unbound_field(field: BoundField):
+    while isinstance(field, BoundField):
+        field = field.field
+
+    return field
+
+
 @register.simple_tag
 def render_field(field: Field):
     if isinstance(field, BoundField):
-        template_path = TEMPLATES.get(field.field.__class__)
-        is_markitup = isinstance(field.field.widget, MarkItUpWidget)
+        unbound_field = get_unbound_field(field)
     else:
-        template_path = TEMPLATES.get(field.__class__)
-        is_markitup = isinstance(field.widget, MarkItUpWidget)
+        unbound_field = field
+
+    template_path = TEMPLATES.get(unbound_field.__class__)
+    is_markitup = isinstance(unbound_field.widget, MarkItUpWidget)
 
     if not template_path:
-        raise NotImplementedError(f"Unknown field type: {field.__class__}")
+        raise NotImplementedError(f"Unknown field type: {unbound_field.__class__}")
 
     template_obj: Template = get_template(template_path)
     context = {"field": field, "is_markitup": is_markitup}
diff --git a/pydis_site/templates/wiki/forms/fields/boolean.html b/pydis_site/templates/wiki/forms/fields/boolean.html
new file mode 100644
index 00000000..9d054083
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/fields/boolean.html
@@ -0,0 +1,42 @@
+<div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
+  <div class="field-label">
+    <label class="label {% if field.errors %} is-danger{% endif %}">
+      {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+    </label>
+
+    {% if field.help_text %}
+      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+        {{ field.help_text|safe }}
+      </p>
+    {% endif %}
+  </div>
+
+  <div class="field-body">
+    <div class="field">
+      <div class="control">
+        <input class="switch is-rounded{% if field.errors %} is-danger{% endif %}"
+               type="checkbox"
+               id="{{ field.auto_id }}"
+               name="{{ field.name }}"
+               {% if field.value %}checked="checked"{% endif %}
+
+               {% if field.required %}required{% endif %}
+               {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
+               {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
+               {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
+        />
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          &nbsp;
+        </label>
+      </div>
+
+    {% if field.errors %}
+      <p class="help is-danger">
+        {% for error in field.errors %}
+          <span id="error_{{ forloop.counter }}_{{ field.auto_id }}">{{ error }}</span><br />
+        {% endfor %}
+      </p>
+    {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/pydis_site/templates/wiki/forms/fields/char.html b/pydis_site/templates/wiki/forms/fields/char.html
index ccae0630..9539f6eb 100644
--- a/pydis_site/templates/wiki/forms/fields/char.html
+++ b/pydis_site/templates/wiki/forms/fields/char.html
@@ -1,21 +1,54 @@
-{% if is_markitup %}
-  <textarea class="textarea is-family-monospace{% if field.errors %} is-danger{% endif %}"
-            id="{{ field.auto_id }}"
-            rows = 10
+<div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
+  <div class="field-label">
+    {% if field.label %}
+      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+      </label>
+    {% endif %}
 
-            {% if field.required %}required{% endif %}
-            {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
-            {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
-            {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
-  ></textarea>
-{% else %}
-  <input class="input{% if field.errors %} is-danger{% endif %}"
-         type="text"
-         id="{{ field.auto_id }}"
+    {% if field.help_text %}
+      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+        {{ field.help_text|safe }}
+      </p>
+    {% endif %}
+  </div>
 
-         {% if field.required %}required{% endif %}
-         {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
-         {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
-         {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
-  />
-{% endif %}
+  <div class="field-body">
+    <div class="field">
+      <div class="control">
+        {% if is_markitup %}
+          <textarea class="textarea is-family-monospace{% if field.errors %} is-danger{% endif %}"
+                    id="{{ field.auto_id }}"
+                    name="{{ field.name }}"
+                    rows = 10
+
+                    {% if field.required %}required{% endif %}
+                    {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
+                    {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
+                    {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
+          >{% if field.value %}{{ field.value }}{% endif %}</textarea>
+        {% else %}
+          <input class="input{% if field.errors %} is-danger{% endif %}"
+                 type="text"
+                 id="{{ field.auto_id }}"
+                 name="{{ field.name }}"
+
+                 {% if field.required %}required{% endif %}
+                 {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
+                 {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
+                 {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
+                 {% if field.value %}value="{{ field.value }}"{% endif %}
+          />
+        {% endif %}
+      </div>
+
+    {% if field.errors %}
+      <p class="help is-danger">
+        {% for error in field.errors %}
+          <span id="error_{{ forloop.counter }}_{{ field.auto_id }}">{{ error }}</span><br />
+        {% endfor %}
+      </p>
+    {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/pydis_site/templates/wiki/forms/fields/in_place_render.html b/pydis_site/templates/wiki/forms/fields/in_place_render.html
new file mode 100644
index 00000000..47e115fe
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/fields/in_place_render.html
@@ -0,0 +1,31 @@
+<div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
+  <div class="field-label">
+    {% if field.label %}
+      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+        IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+      </label>
+    {% endif %}
+
+    {% if field.help_text %}
+      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+        {{ field.help_text|safe }}
+      </p>
+    {% endif %}
+  </div>
+
+  <div class="field-body">
+    <div class="field">
+      <div class="control">
+        {{ field }}
+      </div>
+
+    {% if field.errors %}
+      <p class="help is-danger">
+        {% for error in field.errors %}
+          <span id="error_{{ forloop.counter }}_{{ field.auto_id }}">{{ error }}</span><br />
+        {% endfor %}
+      </p>
+    {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/pydis_site/templates/wiki/forms/fields/model_choice.html b/pydis_site/templates/wiki/forms/fields/model_choice.html
new file mode 100644
index 00000000..f1104b98
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/fields/model_choice.html
@@ -0,0 +1,31 @@
+<div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
+  <div class="field-label">
+    {% if field.label %}
+      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+        MODEL CHOICE: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+      </label>
+    {% endif %}
+
+    {% if field.help_text %}
+      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+        {{ field.help_text|safe }}
+      </p>
+    {% endif %}
+  </div>
+
+  <div class="field-body">
+    <div class="field">
+      <div class="control">
+        {{ field }}
+      </div>
+
+    {% if field.errors %}
+      <p class="help is-danger">
+        {% for error in field.errors %}
+          <span id="error_{{ forloop.counter }}_{{ field.auto_id }}">{{ error }}</span><br />
+        {% endfor %}
+      </p>
+    {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/pydis_site/templates/wiki/includes/formfield.html b/pydis_site/templates/wiki/includes/formfield.html
index 9f68fb26..c466719b 100644
--- a/pydis_site/templates/wiki/includes/formfield.html
+++ b/pydis_site/templates/wiki/includes/formfield.html
@@ -3,35 +3,5 @@
 {% if field.is_hidden %}
   {{ field }}
 {% else %}
-  <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-    <div class="field-label">
-      {% if field.label %}
-        <label for="div_{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-        </label>
-      {% endif %}
-
-      {% if field.help_text %}
-        <p id="hint_{{ field.auto_id }}" class="help">
-          {{ field.help_text|safe }}
-        </p>
-      {% endif %}
-    </div>
-
-    <div class="field-body">
-      <div class="field">
-        <div class="control">
-          {% render_field field %}
-        </div>
-
-      {% if field.errors %}
-        <p class="help is-danger">
-          {% for error in field.errors %}
-            <span id="error_{{ forloop.counter }}_{{ field.auto_id }}">{{ error }}</span><br />
-          {% endfor %}
-        </p>
-      {% endif %}
-      </div>
-    </div>
-  </div>
+  {% render_field field %}
 {% endif %}
-- 
cgit v1.2.3


From a0ff872429a0a61239b78ecd9ed80bb3b12bae98 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 12 Apr 2019 16:00:03 +0100
Subject: Mostly-working model choice stuff

---
 pydis_site/apps/home/templatetags/wiki_extra.py    | 13 +++++++
 .../templates/wiki/forms/fields/model_choice.html  | 42 ++++++++++++++++++++--
 pydis_site/templates/wiki/settings.html            | 17 +++++----
 3 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index 03ca8210..6d693b96 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -75,3 +75,16 @@ def render_field(field: Field):
     context = {"field": field, "is_markitup": is_markitup}
 
     return mark_safe(template_obj.render(context))
+
+
+@register.simple_tag(takes_context=True)
+def get_field_options(context, field: BoundField):
+    widget = field.field.widget
+
+    if field.value() is None:
+        value = []
+    else:
+        value = [str(field.value())]
+
+    context["options"] = widget.optgroups(field.name, value)
+    return ""
diff --git a/pydis_site/templates/wiki/forms/fields/model_choice.html b/pydis_site/templates/wiki/forms/fields/model_choice.html
index f1104b98..c6cd53ab 100644
--- a/pydis_site/templates/wiki/forms/fields/model_choice.html
+++ b/pydis_site/templates/wiki/forms/fields/model_choice.html
@@ -1,8 +1,10 @@
+{% load wiki_extra %}
+
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
   <div class="field-label">
     {% if field.label %}
       <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        MODEL CHOICE: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
       </label>
     {% endif %}
 
@@ -16,7 +18,43 @@
   <div class="field-body">
     <div class="field">
       <div class="control">
-        {{ field }}
+        <div class="select">
+          {% get_field_options field %}
+
+          <select {% if not options %}disabled{% endif %}
+                  id="{{ field.auto_id }}"
+                  name="{{ field.name }}"
+
+                  {% if field.required %}required{% endif %}
+          >
+            {% if options %}
+              {% for group_name, group_choices, group_index in options %}
+                {% if group_name %}
+                  <optgroup label="{{ group_name }}">
+                {% endif %}
+                {% for option in group_choices %}
+                  <option {% if option.value == field.value %}selected{% endif %}
+                          value="{{ option.value|stringformat:'s' }}"
+                  >
+                    {{ option.label }}
+                  </option>
+                {% endfor %}
+                {% if group_name %}
+                  </optgroup>
+                {% endif %}
+              {% endfor %}
+            {% else %}
+              <option value="">
+                {% if field.field.empty_label %}
+                  {{ field.field.empty_label }}
+                {% else %}
+                  N/A
+                {% endif %}
+                </option>
+            {% endif %}
+          </select>
+        </div>
+
       </div>
 
     {% if field.errors %}
diff --git a/pydis_site/templates/wiki/settings.html b/pydis_site/templates/wiki/settings.html
index 6d6c0f49..3e8c8dab 100644
--- a/pydis_site/templates/wiki/settings.html
+++ b/pydis_site/templates/wiki/settings.html
@@ -7,15 +7,18 @@
 {% block wiki_contents_tab %}
 
   {% for form in forms %}
-  <form method="POST" class="form-horizontal settings-form" action="?f={{form.action}}">
+  <form method="POST" class="form-horizontal" action="?f={{form.action}}">
     <h3 class="page-header">{{ form.settings_form_headline }}</h3>
     {% wiki_form form %}
-    <div class="form-group form-actions">
-      <div class="col-lg-10 col-lg-2-offset">
-        <button type="submit" name="save" value="1" class="btn btn-primary">
-          <span class="fa fa-check"></span>
-          {% trans "Save changes" %}
-        </button>
+
+    <div class="field is-horizontal">
+      <div class="field-label">
+        {# Empty for spacing #}
+      </div>
+      <div class="field-body">
+        <div class="control">
+          <input type="submit" class="button is-primary is-medium" name="save" value="Save Changes" />
+        </div>
       </div>
     </div>
   </form>
-- 
cgit v1.2.3


From f674b636a354acbaf3cf05802e7097f78052fe18 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 13 Apr 2019 15:25:43 +0100
Subject: SimpleMDE editor for wiki Markdown

---
 LICENSE-SimpleMDE                                | 21 ++++++++++
 pydis_site/apps/home/templatetags/wiki_extra.py  |  2 +-
 pydis_site/static/css/wiki/simplemde-fixes.css   |  7 ++++
 pydis_site/static/css/wiki/simplemde.min.css     |  7 ++++
 pydis_site/static/js/wiki/load_editor.js         | 51 ++++++++++++++++++++++++
 pydis_site/static/js/wiki/simplemde.min.js       | 15 +++++++
 pydis_site/templates/wiki/base.html              |  6 +++
 pydis_site/templates/wiki/forms/fields/char.html |  3 +-
 8 files changed, 109 insertions(+), 3 deletions(-)
 create mode 100644 LICENSE-SimpleMDE
 create mode 100644 pydis_site/static/css/wiki/simplemde-fixes.css
 create mode 100644 pydis_site/static/css/wiki/simplemde.min.css
 create mode 100644 pydis_site/static/js/wiki/load_editor.js
 create mode 100644 pydis_site/static/js/wiki/simplemde.min.js

diff --git a/LICENSE-SimpleMDE b/LICENSE-SimpleMDE
new file mode 100644
index 00000000..d9f79afc
--- /dev/null
+++ b/LICENSE-SimpleMDE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Next Step Webs, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index 6d693b96..ab70eeb4 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -44,7 +44,7 @@ TEMPLATES = {
     ModelChoiceField: TEMPLATE_PATH.format("model_choice"),
     ModelMultipleChoiceField: TEMPLATE_PATH.format("model_multiple_choice"),
 
-    SettingsModelChoiceField: TEMPLATE_PATH.format("in_place_render"),
+    SettingsModelChoiceField: TEMPLATE_PATH.format("model_choice"),
 }
 
 
diff --git a/pydis_site/static/css/wiki/simplemde-fixes.css b/pydis_site/static/css/wiki/simplemde-fixes.css
new file mode 100644
index 00000000..a9e3e1dd
--- /dev/null
+++ b/pydis_site/static/css/wiki/simplemde-fixes.css
@@ -0,0 +1,7 @@
+.CodeMirror-line {
+    margin-bottom: 0 !important;
+}
+
+.CodeMirror {
+    height: 30rem;
+}
diff --git a/pydis_site/static/css/wiki/simplemde.min.css b/pydis_site/static/css/wiki/simplemde.min.css
new file mode 100644
index 00000000..d62f4d77
--- /dev/null
+++ b/pydis_site/static/css/wiki/simplemde.min.css
@@ -0,0 +1,7 @@
+/**
+ * simplemde v1.11.2
+ * Copyright Next Step Webs, Inc.
+ * @link https://github.com/NextStepWebs/simplemde-markdown-editor
+ * @license MIT
+ */
+.CodeMirror{color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:none;font-variant-ligatures:none}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected,.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}.CodeMirror{height:auto;min-height:300px;border:1px solid #ddd;border-bottom-left-radius:4px;border-bottom-right-radius:4px;padding:10px;font:inherit;z-index:1}.CodeMirror-scroll{min-height:300px}.CodeMirror-fullscreen{background:#fff;position:fixed!important;top:50px;left:0;right:0;bottom:0;height:auto;z-index:9}.CodeMirror-sided{width:50%!important}.editor-toolbar{position:relative;opacity:.6;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;padding:0 10px;border-top:1px solid #bbb;border-left:1px solid #bbb;border-right:1px solid #bbb;border-top-left-radius:4px;border-top-right-radius:4px}.editor-toolbar:after,.editor-toolbar:before{display:block;content:' ';height:1px}.editor-toolbar:before{margin-bottom:8px}.editor-toolbar:after{margin-top:8px}.editor-toolbar:hover,.editor-wrapper input.title:focus,.editor-wrapper input.title:hover{opacity:.8}.editor-toolbar.fullscreen{width:100%;height:50px;overflow-x:auto;overflow-y:hidden;white-space:nowrap;padding-top:10px;padding-bottom:10px;box-sizing:border-box;background:#fff;border:0;position:fixed;top:0;left:0;opacity:1;z-index:9}.editor-toolbar.fullscreen::before{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,1)),color-stop(100%,rgba(255,255,255,0)));background:-webkit-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-o-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:linear-gradient(to right,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);position:fixed;top:0;left:0;margin:0;padding:0}.editor-toolbar.fullscreen::after{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,0)),color-stop(100%,rgba(255,255,255,1)));background:-webkit-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-o-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:linear-gradient(to right,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);position:fixed;top:0;right:0;margin:0;padding:0}.editor-toolbar a{display:inline-block;text-align:center;text-decoration:none!important;color:#2c3e50!important;width:30px;height:30px;margin:0;border:1px solid transparent;border-radius:3px;cursor:pointer}.editor-toolbar a.active,.editor-toolbar a:hover{background:#fcfcfc;border-color:#95a5a6}.editor-toolbar a:before{line-height:30px}.editor-toolbar i.separator{display:inline-block;width:0;border-left:1px solid #d9d9d9;border-right:1px solid #fff;color:transparent;text-indent:-10px;margin:0 6px}.editor-toolbar a.fa-header-x:after{font-family:Arial,"Helvetica Neue",Helvetica,sans-serif;font-size:65%;vertical-align:text-bottom;position:relative;top:2px}.editor-toolbar a.fa-header-1:after{content:"1"}.editor-toolbar a.fa-header-2:after{content:"2"}.editor-toolbar a.fa-header-3:after{content:"3"}.editor-toolbar a.fa-header-bigger:after{content:"▲"}.editor-toolbar a.fa-header-smaller:after{content:"▼"}.editor-toolbar.disabled-for-preview a:not(.no-disable){pointer-events:none;background:#fff;border-color:transparent;text-shadow:inherit}@media only screen and (max-width:700px){.editor-toolbar a.no-mobile{display:none}}.editor-statusbar{padding:8px 10px;font-size:12px;color:#959694;text-align:right}.editor-statusbar span{display:inline-block;min-width:4em;margin-left:1em}.editor-preview,.editor-preview-side{padding:10px;background:#fafafa;overflow:auto;display:none;box-sizing:border-box}.editor-statusbar .lines:before{content:'lines: '}.editor-statusbar .words:before{content:'words: '}.editor-statusbar .characters:before{content:'characters: '}.editor-preview{position:absolute;width:100%;height:100%;top:0;left:0;z-index:7}.editor-preview-side{position:fixed;bottom:0;width:50%;top:50px;right:0;z-index:9;border:1px solid #ddd}.editor-preview-active,.editor-preview-active-side{display:block}.editor-preview-side>p,.editor-preview>p{margin-top:0}.editor-preview pre,.editor-preview-side pre{background:#eee;margin-bottom:10px}.editor-preview table td,.editor-preview table th,.editor-preview-side table td,.editor-preview-side table th{border:1px solid #ddd;padding:5px}.CodeMirror .CodeMirror-code .cm-tag{color:#63a35c}.CodeMirror .CodeMirror-code .cm-attribute{color:#795da3}.CodeMirror .CodeMirror-code .cm-string{color:#183691}.CodeMirror .CodeMirror-selected{background:#d9d9d9}.CodeMirror .CodeMirror-code .cm-header-1{font-size:200%;line-height:200%}.CodeMirror .CodeMirror-code .cm-header-2{font-size:160%;line-height:160%}.CodeMirror .CodeMirror-code .cm-header-3{font-size:125%;line-height:125%}.CodeMirror .CodeMirror-code .cm-header-4{font-size:110%;line-height:110%}.CodeMirror .CodeMirror-code .cm-comment{background:rgba(0,0,0,.05);border-radius:2px}.CodeMirror .CodeMirror-code .cm-link{color:#7f8c8d}.CodeMirror .CodeMirror-code .cm-url{color:#aab2b3}.CodeMirror .CodeMirror-code .cm-strikethrough{text-decoration:line-through}.CodeMirror .CodeMirror-placeholder{opacity:.5}.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word){background:rgba(255,0,0,.15)}
\ No newline at end of file
diff --git a/pydis_site/static/js/wiki/load_editor.js b/pydis_site/static/js/wiki/load_editor.js
new file mode 100644
index 00000000..95aa3d65
--- /dev/null
+++ b/pydis_site/static/js/wiki/load_editor.js
@@ -0,0 +1,51 @@
+(function() {
+    window.editors = {};
+
+    let elements = document.getElementsByClassName("simple-mde");
+
+    console.log(elements);
+
+    for (let element of elements) {
+        window.editors[element.id] = new SimpleMDE({
+            "element": element,
+
+            autoDownloadFontAwesome: false,  // We already have the pro one loaded
+
+            autosave: {
+                enabled: false,
+                // uniqueId: element.id + "@" + window.location.href,
+            },
+
+            blockStyles: {
+                bold: "**",
+                code: "```",
+                italic: "_",
+            },
+
+            forceSync: true,
+            indentWithTabs: false,
+            initialValue: element.value,
+            placeholder: "**Write some _markdown_!**",
+            spellChecker: false,
+            tabSize: 4,
+
+            toolbar: [
+                "bold", "italic", "strikethrough", {
+                    name: "heading",
+                    action: SimpleMDE.toggleHeadingSmaller,
+                    className: "fa fa-heading",
+                    title: "Heading",
+                }, "|",
+                "code", "quote", "unordered-list", "ordered-list", "|",
+                "link", {
+                    name: "image",
+                    action: SimpleMDE.drawImage,
+                    className: "fa fa-image",
+                    title: "Insert image",
+                }, "table", "horizontal-rule", "|",
+                "preview", "side-by-side", "fullscreen", "|",
+                "guide"
+            ],
+        })
+    }
+})();
diff --git a/pydis_site/static/js/wiki/simplemde.min.js b/pydis_site/static/js/wiki/simplemde.min.js
new file mode 100644
index 00000000..50c624f2
--- /dev/null
+++ b/pydis_site/static/js/wiki/simplemde.min.js
@@ -0,0 +1,15 @@
+/**
+ * simplemde v1.11.2
+ * Copyright Next Step Webs, Inc.
+ * @link https://github.com/NextStepWebs/simplemde-markdown-editor
+ * @license MIT
+ */
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.SimpleMDE=e()}}(function(){var e;return function t(e,n,r){function i(a,l){if(!n[a]){if(!e[a]){var s="function"==typeof require&&require;if(!l&&s)return s(a,!0);if(o)return o(a,!0);var c=new Error("Cannot find module '"+a+"'");throw c.code="MODULE_NOT_FOUND",c}var u=n[a]={exports:{}};e[a][0].call(u.exports,function(t){var n=e[a][1][t];return i(n?n:t)},u,u.exports,t,e,n,r)}return n[a].exports}for(var o="function"==typeof require&&require,a=0;a<r.length;a++)i(r[a]);return i}({1:[function(e,t,n){"use strict";function r(){for(var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",t=0,n=e.length;n>t;++t)s[t]=e[t],c[e.charCodeAt(t)]=t;c["-".charCodeAt(0)]=62,c["_".charCodeAt(0)]=63}function i(e){var t,n,r,i,o,a,l=e.length;if(l%4>0)throw new Error("Invalid string. Length must be a multiple of 4");o="="===e[l-2]?2:"="===e[l-1]?1:0,a=new u(3*l/4-o),r=o>0?l-4:l;var s=0;for(t=0,n=0;r>t;t+=4,n+=3)i=c[e.charCodeAt(t)]<<18|c[e.charCodeAt(t+1)]<<12|c[e.charCodeAt(t+2)]<<6|c[e.charCodeAt(t+3)],a[s++]=i>>16&255,a[s++]=i>>8&255,a[s++]=255&i;return 2===o?(i=c[e.charCodeAt(t)]<<2|c[e.charCodeAt(t+1)]>>4,a[s++]=255&i):1===o&&(i=c[e.charCodeAt(t)]<<10|c[e.charCodeAt(t+1)]<<4|c[e.charCodeAt(t+2)]>>2,a[s++]=i>>8&255,a[s++]=255&i),a}function o(e){return s[e>>18&63]+s[e>>12&63]+s[e>>6&63]+s[63&e]}function a(e,t,n){for(var r,i=[],a=t;n>a;a+=3)r=(e[a]<<16)+(e[a+1]<<8)+e[a+2],i.push(o(r));return i.join("")}function l(e){for(var t,n=e.length,r=n%3,i="",o=[],l=16383,c=0,u=n-r;u>c;c+=l)o.push(a(e,c,c+l>u?u:c+l));return 1===r?(t=e[n-1],i+=s[t>>2],i+=s[t<<4&63],i+="=="):2===r&&(t=(e[n-2]<<8)+e[n-1],i+=s[t>>10],i+=s[t>>4&63],i+=s[t<<2&63],i+="="),o.push(i),o.join("")}n.toByteArray=i,n.fromByteArray=l;var s=[],c=[],u="undefined"!=typeof Uint8Array?Uint8Array:Array;r()},{}],2:[function(e,t,n){},{}],3:[function(e,t,n){(function(t){"use strict";function r(){try{var e=new Uint8Array(1);return e.foo=function(){return 42},42===e.foo()&&"function"==typeof e.subarray&&0===e.subarray(1,1).byteLength}catch(t){return!1}}function i(){return a.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function o(e,t){if(i()<t)throw new RangeError("Invalid typed array length");return a.TYPED_ARRAY_SUPPORT?(e=new Uint8Array(t),e.__proto__=a.prototype):(null===e&&(e=new a(t)),e.length=t),e}function a(e,t,n){if(!(a.TYPED_ARRAY_SUPPORT||this instanceof a))return new a(e,t,n);if("number"==typeof e){if("string"==typeof t)throw new Error("If encoding is specified then the first argument must be a string");return u(this,e)}return l(this,e,t,n)}function l(e,t,n,r){if("number"==typeof t)throw new TypeError('"value" argument must not be a number');return"undefined"!=typeof ArrayBuffer&&t instanceof ArrayBuffer?d(e,t,n,r):"string"==typeof t?f(e,t,n):p(e,t)}function s(e){if("number"!=typeof e)throw new TypeError('"size" argument must be a number')}function c(e,t,n,r){return s(t),0>=t?o(e,t):void 0!==n?"string"==typeof r?o(e,t).fill(n,r):o(e,t).fill(n):o(e,t)}function u(e,t){if(s(t),e=o(e,0>t?0:0|m(t)),!a.TYPED_ARRAY_SUPPORT)for(var n=0;t>n;n++)e[n]=0;return e}function f(e,t,n){if("string"==typeof n&&""!==n||(n="utf8"),!a.isEncoding(n))throw new TypeError('"encoding" must be a valid string encoding');var r=0|v(t,n);return e=o(e,r),e.write(t,n),e}function h(e,t){var n=0|m(t.length);e=o(e,n);for(var r=0;n>r;r+=1)e[r]=255&t[r];return e}function d(e,t,n,r){if(t.byteLength,0>n||t.byteLength<n)throw new RangeError("'offset' is out of bounds");if(t.byteLength<n+(r||0))throw new RangeError("'length' is out of bounds");return t=void 0===r?new Uint8Array(t,n):new Uint8Array(t,n,r),a.TYPED_ARRAY_SUPPORT?(e=t,e.__proto__=a.prototype):e=h(e,t),e}function p(e,t){if(a.isBuffer(t)){var n=0|m(t.length);return e=o(e,n),0===e.length?e:(t.copy(e,0,0,n),e)}if(t){if("undefined"!=typeof ArrayBuffer&&t.buffer instanceof ArrayBuffer||"length"in t)return"number"!=typeof t.length||K(t.length)?o(e,0):h(e,t);if("Buffer"===t.type&&J(t.data))return h(e,t.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function m(e){if(e>=i())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+i().toString(16)+" bytes");return 0|e}function g(e){return+e!=e&&(e=0),a.alloc(+e)}function v(e,t){if(a.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"binary":case"raw":case"raws":return n;case"utf8":case"utf-8":case void 0:return q(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return $(e).length;default:if(r)return q(e).length;t=(""+t).toLowerCase(),r=!0}}function y(e,t,n){var r=!1;if((void 0===t||0>t)&&(t=0),t>this.length)return"";if((void 0===n||n>this.length)&&(n=this.length),0>=n)return"";if(n>>>=0,t>>>=0,t>=n)return"";for(e||(e="utf8");;)switch(e){case"hex":return I(this,t,n);case"utf8":case"utf-8":return N(this,t,n);case"ascii":return E(this,t,n);case"binary":return O(this,t,n);case"base64":return M(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return P(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}function x(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function b(e,t,n,r){function i(e,t){return 1===o?e[t]:e.readUInt16BE(t*o)}var o=1,a=e.length,l=t.length;if(void 0!==r&&(r=String(r).toLowerCase(),"ucs2"===r||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(e.length<2||t.length<2)return-1;o=2,a/=2,l/=2,n/=2}for(var s=-1,c=0;a>n+c;c++)if(i(e,n+c)===i(t,-1===s?0:c-s)){if(-1===s&&(s=c),c-s+1===l)return(n+s)*o}else-1!==s&&(c-=c-s),s=-1;return-1}function w(e,t,n,r){n=Number(n)||0;var i=e.length-n;r?(r=Number(r),r>i&&(r=i)):r=i;var o=t.length;if(o%2!==0)throw new Error("Invalid hex string");r>o/2&&(r=o/2);for(var a=0;r>a;a++){var l=parseInt(t.substr(2*a,2),16);if(isNaN(l))return a;e[n+a]=l}return a}function k(e,t,n,r){return V(q(t,e.length-n),e,n,r)}function S(e,t,n,r){return V(G(t),e,n,r)}function C(e,t,n,r){return S(e,t,n,r)}function L(e,t,n,r){return V($(t),e,n,r)}function T(e,t,n,r){return V(Y(t,e.length-n),e,n,r)}function M(e,t,n){return 0===t&&n===e.length?X.fromByteArray(e):X.fromByteArray(e.slice(t,n))}function N(e,t,n){n=Math.min(e.length,n);for(var r=[],i=t;n>i;){var o=e[i],a=null,l=o>239?4:o>223?3:o>191?2:1;if(n>=i+l){var s,c,u,f;switch(l){case 1:128>o&&(a=o);break;case 2:s=e[i+1],128===(192&s)&&(f=(31&o)<<6|63&s,f>127&&(a=f));break;case 3:s=e[i+1],c=e[i+2],128===(192&s)&&128===(192&c)&&(f=(15&o)<<12|(63&s)<<6|63&c,f>2047&&(55296>f||f>57343)&&(a=f));break;case 4:s=e[i+1],c=e[i+2],u=e[i+3],128===(192&s)&&128===(192&c)&&128===(192&u)&&(f=(15&o)<<18|(63&s)<<12|(63&c)<<6|63&u,f>65535&&1114112>f&&(a=f))}}null===a?(a=65533,l=1):a>65535&&(a-=65536,r.push(a>>>10&1023|55296),a=56320|1023&a),r.push(a),i+=l}return A(r)}function A(e){var t=e.length;if(Q>=t)return String.fromCharCode.apply(String,e);for(var n="",r=0;t>r;)n+=String.fromCharCode.apply(String,e.slice(r,r+=Q));return n}function E(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;n>i;i++)r+=String.fromCharCode(127&e[i]);return r}function O(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;n>i;i++)r+=String.fromCharCode(e[i]);return r}function I(e,t,n){var r=e.length;(!t||0>t)&&(t=0),(!n||0>n||n>r)&&(n=r);for(var i="",o=t;n>o;o++)i+=U(e[o]);return i}function P(e,t,n){for(var r=e.slice(t,n),i="",o=0;o<r.length;o+=2)i+=String.fromCharCode(r[o]+256*r[o+1]);return i}function R(e,t,n){if(e%1!==0||0>e)throw new RangeError("offset is not uint");if(e+t>n)throw new RangeError("Trying to access beyond buffer length")}function D(e,t,n,r,i,o){if(!a.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>i||o>t)throw new RangeError('"value" argument is out of bounds');if(n+r>e.length)throw new RangeError("Index out of range")}function H(e,t,n,r){0>t&&(t=65535+t+1);for(var i=0,o=Math.min(e.length-n,2);o>i;i++)e[n+i]=(t&255<<8*(r?i:1-i))>>>8*(r?i:1-i)}function W(e,t,n,r){0>t&&(t=4294967295+t+1);for(var i=0,o=Math.min(e.length-n,4);o>i;i++)e[n+i]=t>>>8*(r?i:3-i)&255}function B(e,t,n,r,i,o){if(n+r>e.length)throw new RangeError("Index out of range");if(0>n)throw new RangeError("Index out of range")}function _(e,t,n,r,i){return i||B(e,t,n,4,3.4028234663852886e38,-3.4028234663852886e38),Z.write(e,t,n,r,23,4),n+4}function F(e,t,n,r,i){return i||B(e,t,n,8,1.7976931348623157e308,-1.7976931348623157e308),Z.write(e,t,n,r,52,8),n+8}function z(e){if(e=j(e).replace(ee,""),e.length<2)return"";for(;e.length%4!==0;)e+="=";return e}function j(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}function U(e){return 16>e?"0"+e.toString(16):e.toString(16)}function q(e,t){t=t||1/0;for(var n,r=e.length,i=null,o=[],a=0;r>a;a++){if(n=e.charCodeAt(a),n>55295&&57344>n){if(!i){if(n>56319){(t-=3)>-1&&o.push(239,191,189);continue}if(a+1===r){(t-=3)>-1&&o.push(239,191,189);continue}i=n;continue}if(56320>n){(t-=3)>-1&&o.push(239,191,189),i=n;continue}n=(i-55296<<10|n-56320)+65536}else i&&(t-=3)>-1&&o.push(239,191,189);if(i=null,128>n){if((t-=1)<0)break;o.push(n)}else if(2048>n){if((t-=2)<0)break;o.push(n>>6|192,63&n|128)}else if(65536>n){if((t-=3)<0)break;o.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(1114112>n))throw new Error("Invalid code point");if((t-=4)<0)break;o.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return o}function G(e){for(var t=[],n=0;n<e.length;n++)t.push(255&e.charCodeAt(n));return t}function Y(e,t){for(var n,r,i,o=[],a=0;a<e.length&&!((t-=2)<0);a++)n=e.charCodeAt(a),r=n>>8,i=n%256,o.push(i),o.push(r);return o}function $(e){return X.toByteArray(z(e))}function V(e,t,n,r){for(var i=0;r>i&&!(i+n>=t.length||i>=e.length);i++)t[i+n]=e[i];return i}function K(e){return e!==e}var X=e("base64-js"),Z=e("ieee754"),J=e("isarray");n.Buffer=a,n.SlowBuffer=g,n.INSPECT_MAX_BYTES=50,a.TYPED_ARRAY_SUPPORT=void 0!==t.TYPED_ARRAY_SUPPORT?t.TYPED_ARRAY_SUPPORT:r(),n.kMaxLength=i(),a.poolSize=8192,a._augment=function(e){return e.__proto__=a.prototype,e},a.from=function(e,t,n){return l(null,e,t,n)},a.TYPED_ARRAY_SUPPORT&&(a.prototype.__proto__=Uint8Array.prototype,a.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&a[Symbol.species]===a&&Object.defineProperty(a,Symbol.species,{value:null,configurable:!0})),a.alloc=function(e,t,n){return c(null,e,t,n)},a.allocUnsafe=function(e){return u(null,e)},a.allocUnsafeSlow=function(e){return u(null,e)},a.isBuffer=function(e){return!(null==e||!e._isBuffer)},a.compare=function(e,t){if(!a.isBuffer(e)||!a.isBuffer(t))throw new TypeError("Arguments must be Buffers");if(e===t)return 0;for(var n=e.length,r=t.length,i=0,o=Math.min(n,r);o>i;++i)if(e[i]!==t[i]){n=e[i],r=t[i];break}return r>n?-1:n>r?1:0},a.isEncoding=function(e){switch(String(e).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"raw":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},a.concat=function(e,t){if(!J(e))throw new TypeError('"list" argument must be an Array of Buffers');if(0===e.length)return a.alloc(0);var n;if(void 0===t)for(t=0,n=0;n<e.length;n++)t+=e[n].length;var r=a.allocUnsafe(t),i=0;for(n=0;n<e.length;n++){var o=e[n];if(!a.isBuffer(o))throw new TypeError('"list" argument must be an Array of Buffers');o.copy(r,i),i+=o.length}return r},a.byteLength=v,a.prototype._isBuffer=!0,a.prototype.swap16=function(){var e=this.length;if(e%2!==0)throw new RangeError("Buffer size must be a multiple of 16-bits");for(var t=0;e>t;t+=2)x(this,t,t+1);return this},a.prototype.swap32=function(){var e=this.length;if(e%4!==0)throw new RangeError("Buffer size must be a multiple of 32-bits");for(var t=0;e>t;t+=4)x(this,t,t+3),x(this,t+1,t+2);return this},a.prototype.toString=function(){var e=0|this.length;return 0===e?"":0===arguments.length?N(this,0,e):y.apply(this,arguments)},a.prototype.equals=function(e){if(!a.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e?!0:0===a.compare(this,e)},a.prototype.inspect=function(){var e="",t=n.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,t).match(/.{2}/g).join(" "),this.length>t&&(e+=" ... ")),"<Buffer "+e+">"},a.prototype.compare=function(e,t,n,r,i){if(!a.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===n&&(n=e?e.length:0),void 0===r&&(r=0),void 0===i&&(i=this.length),0>t||n>e.length||0>r||i>this.length)throw new RangeError("out of range index");if(r>=i&&t>=n)return 0;if(r>=i)return-1;if(t>=n)return 1;if(t>>>=0,n>>>=0,r>>>=0,i>>>=0,this===e)return 0;for(var o=i-r,l=n-t,s=Math.min(o,l),c=this.slice(r,i),u=e.slice(t,n),f=0;s>f;++f)if(c[f]!==u[f]){o=c[f],l=u[f];break}return l>o?-1:o>l?1:0},a.prototype.indexOf=function(e,t,n){if("string"==typeof t?(n=t,t=0):t>2147483647?t=2147483647:-2147483648>t&&(t=-2147483648),t>>=0,0===this.length)return-1;if(t>=this.length)return-1;if(0>t&&(t=Math.max(this.length+t,0)),"string"==typeof e&&(e=a.from(e,n)),a.isBuffer(e))return 0===e.length?-1:b(this,e,t,n);if("number"==typeof e)return a.TYPED_ARRAY_SUPPORT&&"function"===Uint8Array.prototype.indexOf?Uint8Array.prototype.indexOf.call(this,e,t):b(this,[e],t,n);throw new TypeError("val must be string, number or Buffer")},a.prototype.includes=function(e,t,n){return-1!==this.indexOf(e,t,n)},a.prototype.write=function(e,t,n,r){if(void 0===t)r="utf8",n=this.length,t=0;else if(void 0===n&&"string"==typeof t)r=t,n=this.length,t=0;else{if(!isFinite(t))throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported");t=0|t,isFinite(n)?(n=0|n,void 0===r&&(r="utf8")):(r=n,n=void 0)}var i=this.length-t;if((void 0===n||n>i)&&(n=i),e.length>0&&(0>n||0>t)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var o=!1;;)switch(r){case"hex":return w(this,e,t,n);case"utf8":case"utf-8":return k(this,e,t,n);case"ascii":return S(this,e,t,n);case"binary":return C(this,e,t,n);case"base64":return L(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return T(this,e,t,n);default:if(o)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),o=!0}},a.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var Q=4096;a.prototype.slice=function(e,t){var n=this.length;e=~~e,t=void 0===t?n:~~t,0>e?(e+=n,0>e&&(e=0)):e>n&&(e=n),0>t?(t+=n,0>t&&(t=0)):t>n&&(t=n),e>t&&(t=e);var r;if(a.TYPED_ARRAY_SUPPORT)r=this.subarray(e,t),r.__proto__=a.prototype;else{var i=t-e;r=new a(i,void 0);for(var o=0;i>o;o++)r[o]=this[o+e]}return r},a.prototype.readUIntLE=function(e,t,n){e=0|e,t=0|t,n||R(e,t,this.length);for(var r=this[e],i=1,o=0;++o<t&&(i*=256);)r+=this[e+o]*i;return r},a.prototype.readUIntBE=function(e,t,n){e=0|e,t=0|t,n||R(e,t,this.length);for(var r=this[e+--t],i=1;t>0&&(i*=256);)r+=this[e+--t]*i;return r},a.prototype.readUInt8=function(e,t){return t||R(e,1,this.length),this[e]},a.prototype.readUInt16LE=function(e,t){return t||R(e,2,this.length),this[e]|this[e+1]<<8},a.prototype.readUInt16BE=function(e,t){return t||R(e,2,this.length),this[e]<<8|this[e+1]},a.prototype.readUInt32LE=function(e,t){return t||R(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},a.prototype.readUInt32BE=function(e,t){return t||R(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},a.prototype.readIntLE=function(e,t,n){e=0|e,t=0|t,n||R(e,t,this.length);for(var r=this[e],i=1,o=0;++o<t&&(i*=256);)r+=this[e+o]*i;return i*=128,r>=i&&(r-=Math.pow(2,8*t)),r},a.prototype.readIntBE=function(e,t,n){e=0|e,t=0|t,n||R(e,t,this.length);for(var r=t,i=1,o=this[e+--r];r>0&&(i*=256);)o+=this[e+--r]*i;return i*=128,o>=i&&(o-=Math.pow(2,8*t)),o},a.prototype.readInt8=function(e,t){return t||R(e,1,this.length),128&this[e]?-1*(255-this[e]+1):this[e]},a.prototype.readInt16LE=function(e,t){t||R(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},a.prototype.readInt16BE=function(e,t){t||R(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},a.prototype.readInt32LE=function(e,t){return t||R(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},a.prototype.readInt32BE=function(e,t){return t||R(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},a.prototype.readFloatLE=function(e,t){return t||R(e,4,this.length),Z.read(this,e,!0,23,4)},a.prototype.readFloatBE=function(e,t){return t||R(e,4,this.length),Z.read(this,e,!1,23,4)},a.prototype.readDoubleLE=function(e,t){return t||R(e,8,this.length),Z.read(this,e,!0,52,8)},a.prototype.readDoubleBE=function(e,t){return t||R(e,8,this.length),Z.read(this,e,!1,52,8)},a.prototype.writeUIntLE=function(e,t,n,r){if(e=+e,t=0|t,n=0|n,!r){var i=Math.pow(2,8*n)-1;D(this,e,t,n,i,0)}var o=1,a=0;for(this[t]=255&e;++a<n&&(o*=256);)this[t+a]=e/o&255;return t+n},a.prototype.writeUIntBE=function(e,t,n,r){if(e=+e,t=0|t,n=0|n,!r){var i=Math.pow(2,8*n)-1;D(this,e,t,n,i,0)}var o=n-1,a=1;for(this[t+o]=255&e;--o>=0&&(a*=256);)this[t+o]=e/a&255;return t+n},a.prototype.writeUInt8=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,1,255,0),a.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},a.prototype.writeUInt16LE=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,2,65535,0),a.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):H(this,e,t,!0),t+2},a.prototype.writeUInt16BE=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,2,65535,0),a.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):H(this,e,t,!1),t+2},a.prototype.writeUInt32LE=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,4,4294967295,0),a.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):W(this,e,t,!0),t+4},a.prototype.writeUInt32BE=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,4,4294967295,0),a.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):W(this,e,t,!1),t+4},a.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t=0|t,!r){var i=Math.pow(2,8*n-1);D(this,e,t,n,i-1,-i)}var o=0,a=1,l=0;for(this[t]=255&e;++o<n&&(a*=256);)0>e&&0===l&&0!==this[t+o-1]&&(l=1),this[t+o]=(e/a>>0)-l&255;return t+n},a.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t=0|t,!r){var i=Math.pow(2,8*n-1);D(this,e,t,n,i-1,-i)}var o=n-1,a=1,l=0;for(this[t+o]=255&e;--o>=0&&(a*=256);)0>e&&0===l&&0!==this[t+o+1]&&(l=1),this[t+o]=(e/a>>0)-l&255;return t+n},a.prototype.writeInt8=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,1,127,-128),a.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),0>e&&(e=255+e+1),this[t]=255&e,t+1},a.prototype.writeInt16LE=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,2,32767,-32768),a.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):H(this,e,t,!0),t+2},a.prototype.writeInt16BE=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,2,32767,-32768),a.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):H(this,e,t,!1),t+2},a.prototype.writeInt32LE=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,4,2147483647,-2147483648),a.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):W(this,e,t,!0),t+4},a.prototype.writeInt32BE=function(e,t,n){return e=+e,t=0|t,n||D(this,e,t,4,2147483647,-2147483648),0>e&&(e=4294967295+e+1),a.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):W(this,e,t,!1),t+4},a.prototype.writeFloatLE=function(e,t,n){return _(this,e,t,!0,n)},a.prototype.writeFloatBE=function(e,t,n){return _(this,e,t,!1,n)},a.prototype.writeDoubleLE=function(e,t,n){return F(this,e,t,!0,n)},a.prototype.writeDoubleBE=function(e,t,n){return F(this,e,t,!1,n)},a.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&n>r&&(r=n),r===n)return 0;if(0===e.length||0===this.length)return 0;if(0>t)throw new RangeError("targetStart out of bounds");if(0>n||n>=this.length)throw new RangeError("sourceStart out of bounds");if(0>r)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t<r-n&&(r=e.length-t+n);var i,o=r-n;if(this===e&&t>n&&r>t)for(i=o-1;i>=0;i--)e[i+t]=this[i+n];else if(1e3>o||!a.TYPED_ARRAY_SUPPORT)for(i=0;o>i;i++)e[i+t]=this[i+n];else Uint8Array.prototype.set.call(e,this.subarray(n,n+o),t);return o},a.prototype.fill=function(e,t,n,r){if("string"==typeof e){if("string"==typeof t?(r=t,t=0,n=this.length):"string"==typeof n&&(r=n,n=this.length),1===e.length){var i=e.charCodeAt(0);256>i&&(e=i)}if(void 0!==r&&"string"!=typeof r)throw new TypeError("encoding must be a string");if("string"==typeof r&&!a.isEncoding(r))throw new TypeError("Unknown encoding: "+r)}else"number"==typeof e&&(e=255&e);if(0>t||this.length<t||this.length<n)throw new RangeError("Out of range index");if(t>=n)return this;t>>>=0,n=void 0===n?this.length:n>>>0,e||(e=0);var o;if("number"==typeof e)for(o=t;n>o;o++)this[o]=e;else{var l=a.isBuffer(e)?e:q(new a(e,r).toString()),s=l.length;for(o=0;n-t>o;o++)this[o+t]=l[o%s]}return this};var ee=/[^+\/0-9A-Za-z-_]/g}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"base64-js":1,ieee754:15,isarray:16}],4:[function(e,t,n){"use strict";function r(e){return e=e||{},"function"!=typeof e.codeMirrorInstance||"function"!=typeof e.codeMirrorInstance.defineMode?void console.log("CodeMirror Spell Checker: You must provide an instance of CodeMirror via the option `codeMirrorInstance`"):(String.prototype.includes||(String.prototype.includes=function(){return-1!==String.prototype.indexOf.apply(this,arguments)}),void e.codeMirrorInstance.defineMode("spell-checker",function(t){if(!r.aff_loading){r.aff_loading=!0;var n=new XMLHttpRequest;n.open("GET","https://cdn.jsdelivr.net/codemirror.spell-checker/latest/en_US.aff",!0),n.onload=function(){4===n.readyState&&200===n.status&&(r.aff_data=n.responseText,r.num_loaded++,2==r.num_loaded&&(r.typo=new i("en_US",r.aff_data,r.dic_data,{platform:"any"})))},n.send(null)}if(!r.dic_loading){r.dic_loading=!0;var o=new XMLHttpRequest;o.open("GET","https://cdn.jsdelivr.net/codemirror.spell-checker/latest/en_US.dic",!0),o.onload=function(){4===o.readyState&&200===o.status&&(r.dic_data=o.responseText,r.num_loaded++,2==r.num_loaded&&(r.typo=new i("en_US",r.aff_data,r.dic_data,{platform:"any"})))},o.send(null)}var a='!"#$%&()*+,-./:;<=>?@[\\]^_`{|}~ ',l={token:function(e){var t=e.peek(),n="";if(a.includes(t))return e.next(),null;for(;null!=(t=e.peek())&&!a.includes(t);)n+=t,e.next();return r.typo&&!r.typo.check(n)?"spell-error":null}},s=e.codeMirrorInstance.getMode(t,t.backdrop||"text/plain");return e.codeMirrorInstance.overlayMode(s,l,!0)}))}var i=e("typo-js");r.num_loaded=0,r.aff_loading=!1,r.dic_loading=!1,r.aff_data="",r.dic_data="",r.typo,t.exports=r},{"typo-js":18}],5:[function(t,n,r){!function(i){"object"==typeof r&&"object"==typeof n?i(t("../../lib/codemirror")):"function"==typeof e&&e.amd?e(["../../lib/codemirror"],i):i(CodeMirror)}(function(e){"use strict";function t(e){var t=e.getWrapperElement();e.state.fullScreenRestore={scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,width:t.style.width,height:t.style.height},t.style.width="",t.style.height="auto",t.className+=" CodeMirror-fullscreen",document.documentElement.style.overflow="hidden",e.refresh()}function n(e){var t=e.getWrapperElement();t.className=t.className.replace(/\s*CodeMirror-fullscreen\b/,""),document.documentElement.style.overflow="";var n=e.state.fullScreenRestore;t.style.width=n.width,t.style.height=n.height,window.scrollTo(n.scrollLeft,n.scrollTop),e.refresh()}e.defineOption("fullScreen",!1,function(r,i,o){o==e.Init&&(o=!1),!o!=!i&&(i?t(r):n(r))})})},{"../../lib/codemirror":10}],6:[function(t,n,r){!function(i){"object"==typeof r&&"object"==typeof n?i(t("../../lib/codemirror")):"function"==typeof e&&e.amd?e(["../../lib/codemirror"],i):i(CodeMirror)}(function(e){function t(e){e.state.placeholder&&(e.state.placeholder.parentNode.removeChild(e.state.placeholder),e.state.placeholder=null)}function n(e){t(e);var n=e.state.placeholder=document.createElement("pre");n.style.cssText="height: 0; overflow: visible",n.className="CodeMirror-placeholder";var r=e.getOption("placeholder");"string"==typeof r&&(r=document.createTextNode(r)),n.appendChild(r),e.display.lineSpace.insertBefore(n,e.display.lineSpace.firstChild)}function r(e){o(e)&&n(e)}function i(e){var r=e.getWrapperElement(),i=o(e);r.className=r.className.replace(" CodeMirror-empty","")+(i?" CodeMirror-empty":""),i?n(e):t(e)}function o(e){return 1===e.lineCount()&&""===e.getLine(0)}e.defineOption("placeholder","",function(n,o,a){var l=a&&a!=e.Init;if(o&&!l)n.on("blur",r),n.on("change",i),n.on("swapDoc",i),i(n);else if(!o&&l){n.off("blur",r),n.off("change",i),n.off("swapDoc",i),t(n);var s=n.getWrapperElement();s.className=s.className.replace(" CodeMirror-empty","")}o&&!n.hasFocus()&&r(n)})})},{"../../lib/codemirror":10}],7:[function(t,n,r){!function(i){"object"==typeof r&&"object"==typeof n?i(t("../../lib/codemirror")):"function"==typeof e&&e.amd?e(["../../lib/codemirror"],i):i(CodeMirror)}(function(e){"use strict";var t=/^(\s*)(>[> ]*|[*+-]\s|(\d+)([.)]))(\s*)/,n=/^(\s*)(>[> ]*|[*+-]|(\d+)[.)])(\s*)$/,r=/[*+-]\s/;e.commands.newlineAndIndentContinueMarkdownList=function(i){if(i.getOption("disableInput"))return e.Pass;for(var o=i.listSelections(),a=[],l=0;l<o.length;l++){var s=o[l].head,c=i.getStateAfter(s.line),u=c.list!==!1,f=0!==c.quote,h=i.getLine(s.line),d=t.exec(h);if(!o[l].empty()||!u&&!f||!d)return void i.execCommand("newlineAndIndent");if(n.test(h))i.replaceRange("",{line:s.line,ch:0},{line:s.line,ch:s.ch+1}),a[l]="\n";else{var p=d[1],m=d[5],g=r.test(d[2])||d[2].indexOf(">")>=0?d[2]:parseInt(d[3],10)+1+d[4];a[l]="\n"+p+g+m}}i.replaceSelections(a)}})},{"../../lib/codemirror":10}],8:[function(t,n,r){!function(i){"object"==typeof r&&"object"==typeof n?i(t("../../lib/codemirror")):"function"==typeof e&&e.amd?e(["../../lib/codemirror"],i):i(CodeMirror)}(function(e){"use strict";e.overlayMode=function(t,n,r){return{startState:function(){return{base:e.startState(t),overlay:e.startState(n),basePos:0,baseCur:null,overlayPos:0,overlayCur:null,streamSeen:null}},copyState:function(r){return{base:e.copyState(t,r.base),overlay:e.copyState(n,r.overlay),basePos:r.basePos,baseCur:null,overlayPos:r.overlayPos,overlayCur:null}},token:function(e,i){return(e!=i.streamSeen||Math.min(i.basePos,i.overlayPos)<e.start)&&(i.streamSeen=e,i.basePos=i.overlayPos=e.start),e.start==i.basePos&&(i.baseCur=t.token(e,i.base),i.basePos=e.pos),e.start==i.overlayPos&&(e.pos=e.start,i.overlayCur=n.token(e,i.overlay),i.overlayPos=e.pos),e.pos=Math.min(i.basePos,i.overlayPos),null==i.overlayCur?i.baseCur:null!=i.baseCur&&i.overlay.combineTokens||r&&null==i.overlay.combineTokens?i.baseCur+" "+i.overlayCur:i.overlayCur},indent:t.indent&&function(e,n){return t.indent(e.base,n)},electricChars:t.electricChars,innerMode:function(e){return{state:e.base,mode:t}},blankLine:function(e){t.blankLine&&t.blankLine(e.base),n.blankLine&&n.blankLine(e.overlay)}}}})},{"../../lib/codemirror":10}],9:[function(t,n,r){!function(i){"object"==typeof r&&"object"==typeof n?i(t("../../lib/codemirror")):"function"==typeof e&&e.amd?e(["../../lib/codemirror"],i):i(CodeMirror)}(function(e){"use strict";function t(e){e.operation(function(){a(e)})}function n(e){e.state.markedSelection.length&&e.operation(function(){i(e)})}function r(e,t,n,r){if(0!=c(t,n))for(var i=e.state.markedSelection,o=e.state.markedSelectionStyle,a=t.line;;){var u=a==t.line?t:s(a,0),f=a+l,h=f>=n.line,d=h?n:s(f,0),p=e.markText(u,d,{className:o});if(null==r?i.push(p):i.splice(r++,0,p),h)break;a=f}}function i(e){for(var t=e.state.markedSelection,n=0;n<t.length;++n)t[n].clear();t.length=0}function o(e){i(e);for(var t=e.listSelections(),n=0;n<t.length;n++)r(e,t[n].from(),t[n].to())}function a(e){if(!e.somethingSelected())return i(e);if(e.listSelections().length>1)return o(e);var t=e.getCursor("start"),n=e.getCursor("end"),a=e.state.markedSelection;if(!a.length)return r(e,t,n);var s=a[0].find(),u=a[a.length-1].find();if(!s||!u||n.line-t.line<l||c(t,u.to)>=0||c(n,s.from)<=0)return o(e);for(;c(t,s.from)>0;)a.shift().clear(),s=a[0].find();for(c(t,s.from)<0&&(s.to.line-t.line<l?(a.shift().clear(),r(e,t,s.to,0)):r(e,t,s.from,0));c(n,u.to)<0;)a.pop().clear(),u=a[a.length-1].find();c(n,u.to)>0&&(n.line-u.from.line<l?(a.pop().clear(),r(e,u.from,n)):r(e,u.to,n))}e.defineOption("styleSelectedText",!1,function(r,a,l){var s=l&&l!=e.Init;a&&!s?(r.state.markedSelection=[],r.state.markedSelectionStyle="string"==typeof a?a:"CodeMirror-selectedtext",o(r),r.on("cursorActivity",t),r.on("change",n)):!a&&s&&(r.off("cursorActivity",t),r.off("change",n),i(r),r.state.markedSelection=r.state.markedSelectionStyle=null)});var l=8,s=e.Pos,c=e.cmpPos})},{"../../lib/codemirror":10}],10:[function(t,n,r){!function(t){if("object"==typeof r&&"object"==typeof n)n.exports=t();else{if("function"==typeof e&&e.amd)return e([],t);(this||window).CodeMirror=t()}}(function(){"use strict";function e(n,r){if(!(this instanceof e))return new e(n,r);this.options=r=r?Wi(r):{},Wi(ea,r,!1),d(r);var i=r.value;"string"==typeof i&&(i=new Ca(i,r.mode,null,r.lineSeparator)),this.doc=i;var o=new e.inputStyles[r.inputStyle](this),a=this.display=new t(n,i,o);a.wrapper.CodeMirror=this,c(this),l(this),r.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),r.autofocus&&!Ao&&a.input.focus(),v(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,selectingText:!1,draggingText:!1,highlight:new Ei,keySeq:null,specialChars:null};var s=this;xo&&11>bo&&setTimeout(function(){s.display.input.reset(!0)},20),jt(this),Ki(),bt(this),this.curOp.forceUpdate=!0,Xr(this,i),r.autofocus&&!Ao||s.hasFocus()?setTimeout(Bi(vn,this),20):yn(this);for(var u in ta)ta.hasOwnProperty(u)&&ta[u](this,r[u],na);k(this),r.finishInit&&r.finishInit(this);for(var f=0;f<aa.length;++f)aa[f](this);kt(this),wo&&r.lineWrapping&&"optimizelegibility"==getComputedStyle(a.lineDiv).textRendering&&(a.lineDiv.style.textRendering="auto")}function t(e,t,n){var r=this;this.input=n,r.scrollbarFiller=ji("div",null,"CodeMirror-scrollbar-filler"),r.scrollbarFiller.setAttribute("cm-not-content","true"),r.gutterFiller=ji("div",null,"CodeMirror-gutter-filler"),r.gutterFiller.setAttribute("cm-not-content","true"),r.lineDiv=ji("div",null,"CodeMirror-code"),r.selectionDiv=ji("div",null,null,"position: relative; z-index: 1"),r.cursorDiv=ji("div",null,"CodeMirror-cursors"),r.measure=ji("div",null,"CodeMirror-measure"),r.lineMeasure=ji("div",null,"CodeMirror-measure"),r.lineSpace=ji("div",[r.measure,r.lineMeasure,r.selectionDiv,r.cursorDiv,r.lineDiv],null,"position: relative; outline: none"),r.mover=ji("div",[ji("div",[r.lineSpace],"CodeMirror-lines")],null,"position: relative"),r.sizer=ji("div",[r.mover],"CodeMirror-sizer"),r.sizerWidth=null,r.heightForcer=ji("div",null,null,"position: absolute; height: "+Da+"px; width: 1px;"),r.gutters=ji("div",null,"CodeMirror-gutters"),r.lineGutter=null,r.scroller=ji("div",[r.sizer,r.heightForcer,r.gutters],"CodeMirror-scroll"),r.scroller.setAttribute("tabIndex","-1"),r.wrapper=ji("div",[r.scrollbarFiller,r.gutterFiller,r.scroller],"CodeMirror"),xo&&8>bo&&(r.gutters.style.zIndex=-1,r.scroller.style.paddingRight=0),wo||go&&Ao||(r.scroller.draggable=!0),e&&(e.appendChild?e.appendChild(r.wrapper):e(r.wrapper)),r.viewFrom=r.viewTo=t.first,r.reportedViewFrom=r.reportedViewTo=t.first,r.view=[],r.renderedView=null,r.externalMeasured=null,r.viewOffset=0,r.lastWrapHeight=r.lastWrapWidth=0,r.updateLineNumbers=null,r.nativeBarWidth=r.barHeight=r.barWidth=0,r.scrollbarsClipped=!1,r.lineNumWidth=r.lineNumInnerWidth=r.lineNumChars=null,r.alignWidgets=!1,r.cachedCharWidth=r.cachedTextHeight=r.cachedPaddingH=null,
+r.maxLine=null,r.maxLineLength=0,r.maxLineChanged=!1,r.wheelDX=r.wheelDY=r.wheelStartX=r.wheelStartY=null,r.shift=!1,r.selForContextMenu=null,r.activeTouch=null,n.init(r)}function n(t){t.doc.mode=e.getMode(t.options,t.doc.modeOption),r(t)}function r(e){e.doc.iter(function(e){e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null)}),e.doc.frontier=e.doc.first,_e(e,100),e.state.modeGen++,e.curOp&&Dt(e)}function i(e){e.options.lineWrapping?(Ja(e.display.wrapper,"CodeMirror-wrap"),e.display.sizer.style.minWidth="",e.display.sizerWidth=null):(Za(e.display.wrapper,"CodeMirror-wrap"),h(e)),a(e),Dt(e),lt(e),setTimeout(function(){y(e)},100)}function o(e){var t=yt(e.display),n=e.options.lineWrapping,r=n&&Math.max(5,e.display.scroller.clientWidth/xt(e.display)-3);return function(i){if(kr(e.doc,i))return 0;var o=0;if(i.widgets)for(var a=0;a<i.widgets.length;a++)i.widgets[a].height&&(o+=i.widgets[a].height);return n?o+(Math.ceil(i.text.length/r)||1)*t:o+t}}function a(e){var t=e.doc,n=o(e);t.iter(function(e){var t=n(e);t!=e.height&&ei(e,t)})}function l(e){e.display.wrapper.className=e.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+e.options.theme.replace(/(^|\s)\s*/g," cm-s-"),lt(e)}function s(e){c(e),Dt(e),setTimeout(function(){w(e)},20)}function c(e){var t=e.display.gutters,n=e.options.gutters;Ui(t);for(var r=0;r<n.length;++r){var i=n[r],o=t.appendChild(ji("div",null,"CodeMirror-gutter "+i));"CodeMirror-linenumbers"==i&&(e.display.lineGutter=o,o.style.width=(e.display.lineNumWidth||1)+"px")}t.style.display=r?"":"none",u(e)}function u(e){var t=e.display.gutters.offsetWidth;e.display.sizer.style.marginLeft=t+"px"}function f(e){if(0==e.height)return 0;for(var t,n=e.text.length,r=e;t=mr(r);){var i=t.find(0,!0);r=i.from.line,n+=i.from.ch-i.to.ch}for(r=e;t=gr(r);){var i=t.find(0,!0);n-=r.text.length-i.from.ch,r=i.to.line,n+=r.text.length-i.to.ch}return n}function h(e){var t=e.display,n=e.doc;t.maxLine=Zr(n,n.first),t.maxLineLength=f(t.maxLine),t.maxLineChanged=!0,n.iter(function(e){var n=f(e);n>t.maxLineLength&&(t.maxLineLength=n,t.maxLine=e)})}function d(e){var t=Pi(e.gutters,"CodeMirror-linenumbers");-1==t&&e.lineNumbers?e.gutters=e.gutters.concat(["CodeMirror-linenumbers"]):t>-1&&!e.lineNumbers&&(e.gutters=e.gutters.slice(0),e.gutters.splice(t,1))}function p(e){var t=e.display,n=t.gutters.offsetWidth,r=Math.round(e.doc.height+qe(e.display));return{clientHeight:t.scroller.clientHeight,viewHeight:t.wrapper.clientHeight,scrollWidth:t.scroller.scrollWidth,clientWidth:t.scroller.clientWidth,viewWidth:t.wrapper.clientWidth,barLeft:e.options.fixedGutter?n:0,docHeight:r,scrollHeight:r+Ye(e)+t.barHeight,nativeBarWidth:t.nativeBarWidth,gutterWidth:n}}function m(e,t,n){this.cm=n;var r=this.vert=ji("div",[ji("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),i=this.horiz=ji("div",[ji("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");e(r),e(i),Ea(r,"scroll",function(){r.clientHeight&&t(r.scrollTop,"vertical")}),Ea(i,"scroll",function(){i.clientWidth&&t(i.scrollLeft,"horizontal")}),this.checkedZeroWidth=!1,xo&&8>bo&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")}function g(){}function v(t){t.display.scrollbars&&(t.display.scrollbars.clear(),t.display.scrollbars.addClass&&Za(t.display.wrapper,t.display.scrollbars.addClass)),t.display.scrollbars=new e.scrollbarModel[t.options.scrollbarStyle](function(e){t.display.wrapper.insertBefore(e,t.display.scrollbarFiller),Ea(e,"mousedown",function(){t.state.focused&&setTimeout(function(){t.display.input.focus()},0)}),e.setAttribute("cm-not-content","true")},function(e,n){"horizontal"==n?on(t,e):rn(t,e)},t),t.display.scrollbars.addClass&&Ja(t.display.wrapper,t.display.scrollbars.addClass)}function y(e,t){t||(t=p(e));var n=e.display.barWidth,r=e.display.barHeight;x(e,t);for(var i=0;4>i&&n!=e.display.barWidth||r!=e.display.barHeight;i++)n!=e.display.barWidth&&e.options.lineWrapping&&O(e),x(e,p(e)),n=e.display.barWidth,r=e.display.barHeight}function x(e,t){var n=e.display,r=n.scrollbars.update(t);n.sizer.style.paddingRight=(n.barWidth=r.right)+"px",n.sizer.style.paddingBottom=(n.barHeight=r.bottom)+"px",n.heightForcer.style.borderBottom=r.bottom+"px solid transparent",r.right&&r.bottom?(n.scrollbarFiller.style.display="block",n.scrollbarFiller.style.height=r.bottom+"px",n.scrollbarFiller.style.width=r.right+"px"):n.scrollbarFiller.style.display="",r.bottom&&e.options.coverGutterNextToScrollbar&&e.options.fixedGutter?(n.gutterFiller.style.display="block",n.gutterFiller.style.height=r.bottom+"px",n.gutterFiller.style.width=t.gutterWidth+"px"):n.gutterFiller.style.display=""}function b(e,t,n){var r=n&&null!=n.top?Math.max(0,n.top):e.scroller.scrollTop;r=Math.floor(r-Ue(e));var i=n&&null!=n.bottom?n.bottom:r+e.wrapper.clientHeight,o=ni(t,r),a=ni(t,i);if(n&&n.ensure){var l=n.ensure.from.line,s=n.ensure.to.line;o>l?(o=l,a=ni(t,ri(Zr(t,l))+e.wrapper.clientHeight)):Math.min(s,t.lastLine())>=a&&(o=ni(t,ri(Zr(t,s))-e.wrapper.clientHeight),a=s)}return{from:o,to:Math.max(a,o+1)}}function w(e){var t=e.display,n=t.view;if(t.alignWidgets||t.gutters.firstChild&&e.options.fixedGutter){for(var r=C(t)-t.scroller.scrollLeft+e.doc.scrollLeft,i=t.gutters.offsetWidth,o=r+"px",a=0;a<n.length;a++)if(!n[a].hidden){e.options.fixedGutter&&n[a].gutter&&(n[a].gutter.style.left=o);var l=n[a].alignable;if(l)for(var s=0;s<l.length;s++)l[s].style.left=o}e.options.fixedGutter&&(t.gutters.style.left=r+i+"px")}}function k(e){if(!e.options.lineNumbers)return!1;var t=e.doc,n=S(e.options,t.first+t.size-1),r=e.display;if(n.length!=r.lineNumChars){var i=r.measure.appendChild(ji("div",[ji("div",n)],"CodeMirror-linenumber CodeMirror-gutter-elt")),o=i.firstChild.offsetWidth,a=i.offsetWidth-o;return r.lineGutter.style.width="",r.lineNumInnerWidth=Math.max(o,r.lineGutter.offsetWidth-a)+1,r.lineNumWidth=r.lineNumInnerWidth+a,r.lineNumChars=r.lineNumInnerWidth?n.length:-1,r.lineGutter.style.width=r.lineNumWidth+"px",u(e),!0}return!1}function S(e,t){return String(e.lineNumberFormatter(t+e.firstLineNumber))}function C(e){return e.scroller.getBoundingClientRect().left-e.sizer.getBoundingClientRect().left}function L(e,t,n){var r=e.display;this.viewport=t,this.visible=b(r,e.doc,t),this.editorIsHidden=!r.wrapper.offsetWidth,this.wrapperHeight=r.wrapper.clientHeight,this.wrapperWidth=r.wrapper.clientWidth,this.oldDisplayWidth=$e(e),this.force=n,this.dims=P(e),this.events=[]}function T(e){var t=e.display;!t.scrollbarsClipped&&t.scroller.offsetWidth&&(t.nativeBarWidth=t.scroller.offsetWidth-t.scroller.clientWidth,t.heightForcer.style.height=Ye(e)+"px",t.sizer.style.marginBottom=-t.nativeBarWidth+"px",t.sizer.style.borderRightWidth=Ye(e)+"px",t.scrollbarsClipped=!0)}function M(e,t){var n=e.display,r=e.doc;if(t.editorIsHidden)return Wt(e),!1;if(!t.force&&t.visible.from>=n.viewFrom&&t.visible.to<=n.viewTo&&(null==n.updateLineNumbers||n.updateLineNumbers>=n.viewTo)&&n.renderedView==n.view&&0==zt(e))return!1;k(e)&&(Wt(e),t.dims=P(e));var i=r.first+r.size,o=Math.max(t.visible.from-e.options.viewportMargin,r.first),a=Math.min(i,t.visible.to+e.options.viewportMargin);n.viewFrom<o&&o-n.viewFrom<20&&(o=Math.max(r.first,n.viewFrom)),n.viewTo>a&&n.viewTo-a<20&&(a=Math.min(i,n.viewTo)),Wo&&(o=br(e.doc,o),a=wr(e.doc,a));var l=o!=n.viewFrom||a!=n.viewTo||n.lastWrapHeight!=t.wrapperHeight||n.lastWrapWidth!=t.wrapperWidth;Ft(e,o,a),n.viewOffset=ri(Zr(e.doc,n.viewFrom)),e.display.mover.style.top=n.viewOffset+"px";var s=zt(e);if(!l&&0==s&&!t.force&&n.renderedView==n.view&&(null==n.updateLineNumbers||n.updateLineNumbers>=n.viewTo))return!1;var c=Gi();return s>4&&(n.lineDiv.style.display="none"),R(e,n.updateLineNumbers,t.dims),s>4&&(n.lineDiv.style.display=""),n.renderedView=n.view,c&&Gi()!=c&&c.offsetHeight&&c.focus(),Ui(n.cursorDiv),Ui(n.selectionDiv),n.gutters.style.height=n.sizer.style.minHeight=0,l&&(n.lastWrapHeight=t.wrapperHeight,n.lastWrapWidth=t.wrapperWidth,_e(e,400)),n.updateLineNumbers=null,!0}function N(e,t){for(var n=t.viewport,r=!0;(r&&e.options.lineWrapping&&t.oldDisplayWidth!=$e(e)||(n&&null!=n.top&&(n={top:Math.min(e.doc.height+qe(e.display)-Ve(e),n.top)}),t.visible=b(e.display,e.doc,n),!(t.visible.from>=e.display.viewFrom&&t.visible.to<=e.display.viewTo)))&&M(e,t);r=!1){O(e);var i=p(e);Re(e),y(e,i),E(e,i)}t.signal(e,"update",e),e.display.viewFrom==e.display.reportedViewFrom&&e.display.viewTo==e.display.reportedViewTo||(t.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo),e.display.reportedViewFrom=e.display.viewFrom,e.display.reportedViewTo=e.display.viewTo)}function A(e,t){var n=new L(e,t);if(M(e,n)){O(e),N(e,n);var r=p(e);Re(e),y(e,r),E(e,r),n.finish()}}function E(e,t){e.display.sizer.style.minHeight=t.docHeight+"px",e.display.heightForcer.style.top=t.docHeight+"px",e.display.gutters.style.height=t.docHeight+e.display.barHeight+Ye(e)+"px"}function O(e){for(var t=e.display,n=t.lineDiv.offsetTop,r=0;r<t.view.length;r++){var i,o=t.view[r];if(!o.hidden){if(xo&&8>bo){var a=o.node.offsetTop+o.node.offsetHeight;i=a-n,n=a}else{var l=o.node.getBoundingClientRect();i=l.bottom-l.top}var s=o.line.height-i;if(2>i&&(i=yt(t)),(s>.001||-.001>s)&&(ei(o.line,i),I(o.line),o.rest))for(var c=0;c<o.rest.length;c++)I(o.rest[c])}}}function I(e){if(e.widgets)for(var t=0;t<e.widgets.length;++t)e.widgets[t].height=e.widgets[t].node.parentNode.offsetHeight}function P(e){for(var t=e.display,n={},r={},i=t.gutters.clientLeft,o=t.gutters.firstChild,a=0;o;o=o.nextSibling,++a)n[e.options.gutters[a]]=o.offsetLeft+o.clientLeft+i,r[e.options.gutters[a]]=o.clientWidth;return{fixedPos:C(t),gutterTotalWidth:t.gutters.offsetWidth,gutterLeft:n,gutterWidth:r,wrapperWidth:t.wrapper.clientWidth}}function R(e,t,n){function r(t){var n=t.nextSibling;return wo&&Eo&&e.display.currentWheelTarget==t?t.style.display="none":t.parentNode.removeChild(t),n}for(var i=e.display,o=e.options.lineNumbers,a=i.lineDiv,l=a.firstChild,s=i.view,c=i.viewFrom,u=0;u<s.length;u++){var f=s[u];if(f.hidden);else if(f.node&&f.node.parentNode==a){for(;l!=f.node;)l=r(l);var h=o&&null!=t&&c>=t&&f.lineNumber;f.changes&&(Pi(f.changes,"gutter")>-1&&(h=!1),D(e,f,c,n)),h&&(Ui(f.lineNumber),f.lineNumber.appendChild(document.createTextNode(S(e.options,c)))),l=f.node.nextSibling}else{var d=U(e,f,c,n);a.insertBefore(d,l)}c+=f.size}for(;l;)l=r(l)}function D(e,t,n,r){for(var i=0;i<t.changes.length;i++){var o=t.changes[i];"text"==o?_(e,t):"gutter"==o?z(e,t,n,r):"class"==o?F(t):"widget"==o&&j(e,t,r)}t.changes=null}function H(e){return e.node==e.text&&(e.node=ji("div",null,null,"position: relative"),e.text.parentNode&&e.text.parentNode.replaceChild(e.node,e.text),e.node.appendChild(e.text),xo&&8>bo&&(e.node.style.zIndex=2)),e.node}function W(e){var t=e.bgClass?e.bgClass+" "+(e.line.bgClass||""):e.line.bgClass;if(t&&(t+=" CodeMirror-linebackground"),e.background)t?e.background.className=t:(e.background.parentNode.removeChild(e.background),e.background=null);else if(t){var n=H(e);e.background=n.insertBefore(ji("div",null,t),n.firstChild)}}function B(e,t){var n=e.display.externalMeasured;return n&&n.line==t.line?(e.display.externalMeasured=null,t.measure=n.measure,n.built):Br(e,t)}function _(e,t){var n=t.text.className,r=B(e,t);t.text==t.node&&(t.node=r.pre),t.text.parentNode.replaceChild(r.pre,t.text),t.text=r.pre,r.bgClass!=t.bgClass||r.textClass!=t.textClass?(t.bgClass=r.bgClass,t.textClass=r.textClass,F(t)):n&&(t.text.className=n)}function F(e){W(e),e.line.wrapClass?H(e).className=e.line.wrapClass:e.node!=e.text&&(e.node.className="");var t=e.textClass?e.textClass+" "+(e.line.textClass||""):e.line.textClass;e.text.className=t||""}function z(e,t,n,r){if(t.gutter&&(t.node.removeChild(t.gutter),t.gutter=null),t.gutterBackground&&(t.node.removeChild(t.gutterBackground),t.gutterBackground=null),t.line.gutterClass){var i=H(t);t.gutterBackground=ji("div",null,"CodeMirror-gutter-background "+t.line.gutterClass,"left: "+(e.options.fixedGutter?r.fixedPos:-r.gutterTotalWidth)+"px; width: "+r.gutterTotalWidth+"px"),i.insertBefore(t.gutterBackground,t.text)}var o=t.line.gutterMarkers;if(e.options.lineNumbers||o){var i=H(t),a=t.gutter=ji("div",null,"CodeMirror-gutter-wrapper","left: "+(e.options.fixedGutter?r.fixedPos:-r.gutterTotalWidth)+"px");if(e.display.input.setUneditable(a),i.insertBefore(a,t.text),t.line.gutterClass&&(a.className+=" "+t.line.gutterClass),!e.options.lineNumbers||o&&o["CodeMirror-linenumbers"]||(t.lineNumber=a.appendChild(ji("div",S(e.options,n),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+r.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+e.display.lineNumInnerWidth+"px"))),o)for(var l=0;l<e.options.gutters.length;++l){var s=e.options.gutters[l],c=o.hasOwnProperty(s)&&o[s];c&&a.appendChild(ji("div",[c],"CodeMirror-gutter-elt","left: "+r.gutterLeft[s]+"px; width: "+r.gutterWidth[s]+"px"))}}}function j(e,t,n){t.alignable&&(t.alignable=null);for(var r,i=t.node.firstChild;i;i=r){var r=i.nextSibling;"CodeMirror-linewidget"==i.className&&t.node.removeChild(i)}q(e,t,n)}function U(e,t,n,r){var i=B(e,t);return t.text=t.node=i.pre,i.bgClass&&(t.bgClass=i.bgClass),i.textClass&&(t.textClass=i.textClass),F(t),z(e,t,n,r),q(e,t,r),t.node}function q(e,t,n){if(G(e,t.line,t,n,!0),t.rest)for(var r=0;r<t.rest.length;r++)G(e,t.rest[r],t,n,!1)}function G(e,t,n,r,i){if(t.widgets)for(var o=H(n),a=0,l=t.widgets;a<l.length;++a){var s=l[a],c=ji("div",[s.node],"CodeMirror-linewidget");s.handleMouseEvents||c.setAttribute("cm-ignore-events","true"),Y(s,c,n,r),e.display.input.setUneditable(c),i&&s.above?o.insertBefore(c,n.gutter||n.text):o.appendChild(c),Ci(s,"redraw")}}function Y(e,t,n,r){if(e.noHScroll){(n.alignable||(n.alignable=[])).push(t);var i=r.wrapperWidth;t.style.left=r.fixedPos+"px",e.coverGutter||(i-=r.gutterTotalWidth,t.style.paddingLeft=r.gutterTotalWidth+"px"),t.style.width=i+"px"}e.coverGutter&&(t.style.zIndex=5,t.style.position="relative",e.noHScroll||(t.style.marginLeft=-r.gutterTotalWidth+"px"))}function $(e){return Bo(e.line,e.ch)}function V(e,t){return _o(e,t)<0?t:e}function K(e,t){return _o(e,t)<0?e:t}function X(e){e.state.focused||(e.display.input.focus(),vn(e))}function Z(e,t,n,r,i){var o=e.doc;e.display.shift=!1,r||(r=o.sel);var a=e.state.pasteIncoming||"paste"==i,l=o.splitLines(t),s=null;if(a&&r.ranges.length>1)if(Fo&&Fo.text.join("\n")==t){if(r.ranges.length%Fo.text.length==0){s=[];for(var c=0;c<Fo.text.length;c++)s.push(o.splitLines(Fo.text[c]))}}else l.length==r.ranges.length&&(s=Ri(l,function(e){return[e]}));for(var c=r.ranges.length-1;c>=0;c--){var u=r.ranges[c],f=u.from(),h=u.to();u.empty()&&(n&&n>0?f=Bo(f.line,f.ch-n):e.state.overwrite&&!a?h=Bo(h.line,Math.min(Zr(o,h.line).text.length,h.ch+Ii(l).length)):Fo&&Fo.lineWise&&Fo.text.join("\n")==t&&(f=h=Bo(f.line,0)));var d=e.curOp.updateInput,p={from:f,to:h,text:s?s[c%s.length]:l,origin:i||(a?"paste":e.state.cutIncoming?"cut":"+input")};Tn(e.doc,p),Ci(e,"inputRead",e,p)}t&&!a&&Q(e,t),Bn(e),e.curOp.updateInput=d,e.curOp.typing=!0,e.state.pasteIncoming=e.state.cutIncoming=!1}function J(e,t){var n=e.clipboardData&&e.clipboardData.getData("text/plain");return n?(e.preventDefault(),t.isReadOnly()||t.options.disableInput||At(t,function(){Z(t,n,0,null,"paste")}),!0):void 0}function Q(e,t){if(e.options.electricChars&&e.options.smartIndent)for(var n=e.doc.sel,r=n.ranges.length-1;r>=0;r--){var i=n.ranges[r];if(!(i.head.ch>100||r&&n.ranges[r-1].head.line==i.head.line)){var o=e.getModeAt(i.head),a=!1;if(o.electricChars){for(var l=0;l<o.electricChars.length;l++)if(t.indexOf(o.electricChars.charAt(l))>-1){a=Fn(e,i.head.line,"smart");break}}else o.electricInput&&o.electricInput.test(Zr(e.doc,i.head.line).text.slice(0,i.head.ch))&&(a=Fn(e,i.head.line,"smart"));a&&Ci(e,"electricInput",e,i.head.line)}}}function ee(e){for(var t=[],n=[],r=0;r<e.doc.sel.ranges.length;r++){var i=e.doc.sel.ranges[r].head.line,o={anchor:Bo(i,0),head:Bo(i+1,0)};n.push(o),t.push(e.getRange(o.anchor,o.head))}return{text:t,ranges:n}}function te(e){e.setAttribute("autocorrect","off"),e.setAttribute("autocapitalize","off"),e.setAttribute("spellcheck","false")}function ne(e){this.cm=e,this.prevInput="",this.pollingFast=!1,this.polling=new Ei,this.inaccurateSelection=!1,this.hasSelection=!1,this.composing=null}function re(){var e=ji("textarea",null,null,"position: absolute; padding: 0; width: 1px; height: 1em; outline: none"),t=ji("div",[e],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return wo?e.style.width="1000px":e.setAttribute("wrap","off"),No&&(e.style.border="1px solid black"),te(e),t}function ie(e){this.cm=e,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new Ei,this.gracePeriod=!1}function oe(e,t){var n=Qe(e,t.line);if(!n||n.hidden)return null;var r=Zr(e.doc,t.line),i=Xe(n,r,t.line),o=ii(r),a="left";if(o){var l=co(o,t.ch);a=l%2?"right":"left"}var s=nt(i.map,t.ch,a);return s.offset="right"==s.collapse?s.end:s.start,s}function ae(e,t){return t&&(e.bad=!0),e}function le(e,t,n){var r;if(t==e.display.lineDiv){if(r=e.display.lineDiv.childNodes[n],!r)return ae(e.clipPos(Bo(e.display.viewTo-1)),!0);t=null,n=0}else for(r=t;;r=r.parentNode){if(!r||r==e.display.lineDiv)return null;if(r.parentNode&&r.parentNode==e.display.lineDiv)break}for(var i=0;i<e.display.view.length;i++){var o=e.display.view[i];if(o.node==r)return se(o,t,n)}}function se(e,t,n){function r(t,n,r){for(var i=-1;i<(u?u.length:0);i++)for(var o=0>i?c.map:u[i],a=0;a<o.length;a+=3){var l=o[a+2];if(l==t||l==n){var s=ti(0>i?e.line:e.rest[i]),f=o[a]+r;return(0>r||l!=t)&&(f=o[a+(r?1:0)]),Bo(s,f)}}}var i=e.text.firstChild,o=!1;if(!t||!Va(i,t))return ae(Bo(ti(e.line),0),!0);if(t==i&&(o=!0,t=i.childNodes[n],n=0,!t)){var a=e.rest?Ii(e.rest):e.line;return ae(Bo(ti(a),a.text.length),o)}var l=3==t.nodeType?t:null,s=t;for(l||1!=t.childNodes.length||3!=t.firstChild.nodeType||(l=t.firstChild,n&&(n=l.nodeValue.length));s.parentNode!=i;)s=s.parentNode;var c=e.measure,u=c.maps,f=r(l,s,n);if(f)return ae(f,o);for(var h=s.nextSibling,d=l?l.nodeValue.length-n:0;h;h=h.nextSibling){if(f=r(h,h.firstChild,0))return ae(Bo(f.line,f.ch-d),o);d+=h.textContent.length}for(var p=s.previousSibling,d=n;p;p=p.previousSibling){if(f=r(p,p.firstChild,-1))return ae(Bo(f.line,f.ch+d),o);d+=h.textContent.length}}function ce(e,t,n,r,i){function o(e){return function(t){return t.id==e}}function a(t){if(1==t.nodeType){var n=t.getAttribute("cm-text");if(null!=n)return""==n&&(n=t.textContent.replace(/\u200b/g,"")),void(l+=n);var u,f=t.getAttribute("cm-marker");if(f){var h=e.findMarks(Bo(r,0),Bo(i+1,0),o(+f));return void(h.length&&(u=h[0].find())&&(l+=Jr(e.doc,u.from,u.to).join(c)))}if("false"==t.getAttribute("contenteditable"))return;for(var d=0;d<t.childNodes.length;d++)a(t.childNodes[d]);/^(pre|div|p)$/i.test(t.nodeName)&&(s=!0)}else if(3==t.nodeType){var p=t.nodeValue;if(!p)return;s&&(l+=c,s=!1),l+=p}}for(var l="",s=!1,c=e.doc.lineSeparator();a(t),t!=n;)t=t.nextSibling;return l}function ue(e,t){this.ranges=e,this.primIndex=t}function fe(e,t){this.anchor=e,this.head=t}function he(e,t){var n=e[t];e.sort(function(e,t){return _o(e.from(),t.from())}),t=Pi(e,n);for(var r=1;r<e.length;r++){var i=e[r],o=e[r-1];if(_o(o.to(),i.from())>=0){var a=K(o.from(),i.from()),l=V(o.to(),i.to()),s=o.empty()?i.from()==i.head:o.from()==o.head;t>=r&&--t,e.splice(--r,2,new fe(s?l:a,s?a:l))}}return new ue(e,t)}function de(e,t){return new ue([new fe(e,t||e)],0)}function pe(e,t){return Math.max(e.first,Math.min(t,e.first+e.size-1))}function me(e,t){if(t.line<e.first)return Bo(e.first,0);var n=e.first+e.size-1;return t.line>n?Bo(n,Zr(e,n).text.length):ge(t,Zr(e,t.line).text.length)}function ge(e,t){var n=e.ch;return null==n||n>t?Bo(e.line,t):0>n?Bo(e.line,0):e}function ve(e,t){return t>=e.first&&t<e.first+e.size}function ye(e,t){for(var n=[],r=0;r<t.length;r++)n[r]=me(e,t[r]);return n}function xe(e,t,n,r){if(e.cm&&e.cm.display.shift||e.extend){var i=t.anchor;if(r){var o=_o(n,i)<0;o!=_o(r,i)<0?(i=n,n=r):o!=_o(n,r)<0&&(n=r)}return new fe(i,n)}return new fe(r||n,n)}function be(e,t,n,r){Te(e,new ue([xe(e,e.sel.primary(),t,n)],0),r)}function we(e,t,n){for(var r=[],i=0;i<e.sel.ranges.length;i++)r[i]=xe(e,e.sel.ranges[i],t[i],null);var o=he(r,e.sel.primIndex);Te(e,o,n)}function ke(e,t,n,r){var i=e.sel.ranges.slice(0);i[t]=n,Te(e,he(i,e.sel.primIndex),r)}function Se(e,t,n,r){Te(e,de(t,n),r)}function Ce(e,t,n){var r={ranges:t.ranges,update:function(t){this.ranges=[];for(var n=0;n<t.length;n++)this.ranges[n]=new fe(me(e,t[n].anchor),me(e,t[n].head))},origin:n&&n.origin};return Pa(e,"beforeSelectionChange",e,r),e.cm&&Pa(e.cm,"beforeSelectionChange",e.cm,r),r.ranges!=t.ranges?he(r.ranges,r.ranges.length-1):t}function Le(e,t,n){var r=e.history.done,i=Ii(r);i&&i.ranges?(r[r.length-1]=t,Me(e,t,n)):Te(e,t,n)}function Te(e,t,n){Me(e,t,n),fi(e,e.sel,e.cm?e.cm.curOp.id:NaN,n)}function Me(e,t,n){(Ni(e,"beforeSelectionChange")||e.cm&&Ni(e.cm,"beforeSelectionChange"))&&(t=Ce(e,t,n));var r=n&&n.bias||(_o(t.primary().head,e.sel.primary().head)<0?-1:1);Ne(e,Ee(e,t,r,!0)),n&&n.scroll===!1||!e.cm||Bn(e.cm)}function Ne(e,t){t.equals(e.sel)||(e.sel=t,e.cm&&(e.cm.curOp.updateInput=e.cm.curOp.selectionChanged=!0,Mi(e.cm)),Ci(e,"cursorActivity",e))}function Ae(e){Ne(e,Ee(e,e.sel,null,!1),Wa)}function Ee(e,t,n,r){for(var i,o=0;o<t.ranges.length;o++){var a=t.ranges[o],l=t.ranges.length==e.sel.ranges.length&&e.sel.ranges[o],s=Ie(e,a.anchor,l&&l.anchor,n,r),c=Ie(e,a.head,l&&l.head,n,r);(i||s!=a.anchor||c!=a.head)&&(i||(i=t.ranges.slice(0,o)),i[o]=new fe(s,c))}return i?he(i,t.primIndex):t}function Oe(e,t,n,r,i){var o=Zr(e,t.line);if(o.markedSpans)for(var a=0;a<o.markedSpans.length;++a){var l=o.markedSpans[a],s=l.marker;if((null==l.from||(s.inclusiveLeft?l.from<=t.ch:l.from<t.ch))&&(null==l.to||(s.inclusiveRight?l.to>=t.ch:l.to>t.ch))){if(i&&(Pa(s,"beforeCursorEnter"),s.explicitlyCleared)){if(o.markedSpans){--a;continue}break}if(!s.atomic)continue;if(n){var c,u=s.find(0>r?1:-1);if((0>r?s.inclusiveRight:s.inclusiveLeft)&&(u=Pe(e,u,-r,u&&u.line==t.line?o:null)),u&&u.line==t.line&&(c=_o(u,n))&&(0>r?0>c:c>0))return Oe(e,u,t,r,i)}var f=s.find(0>r?-1:1);return(0>r?s.inclusiveLeft:s.inclusiveRight)&&(f=Pe(e,f,r,f.line==t.line?o:null)),f?Oe(e,f,t,r,i):null}}return t}function Ie(e,t,n,r,i){var o=r||1,a=Oe(e,t,n,o,i)||!i&&Oe(e,t,n,o,!0)||Oe(e,t,n,-o,i)||!i&&Oe(e,t,n,-o,!0);return a?a:(e.cantEdit=!0,Bo(e.first,0))}function Pe(e,t,n,r){return 0>n&&0==t.ch?t.line>e.first?me(e,Bo(t.line-1)):null:n>0&&t.ch==(r||Zr(e,t.line)).text.length?t.line<e.first+e.size-1?Bo(t.line+1,0):null:new Bo(t.line,t.ch+n)}function Re(e){e.display.input.showSelection(e.display.input.prepareSelection())}function De(e,t){for(var n=e.doc,r={},i=r.cursors=document.createDocumentFragment(),o=r.selection=document.createDocumentFragment(),a=0;a<n.sel.ranges.length;a++)if(t!==!1||a!=n.sel.primIndex){var l=n.sel.ranges[a];if(!(l.from().line>=e.display.viewTo||l.to().line<e.display.viewFrom)){var s=l.empty();(s||e.options.showCursorWhenSelecting)&&He(e,l.head,i),s||We(e,l,o)}}return r}function He(e,t,n){var r=dt(e,t,"div",null,null,!e.options.singleCursorHeightPerLine),i=n.appendChild(ji("div"," ","CodeMirror-cursor"));if(i.style.left=r.left+"px",i.style.top=r.top+"px",i.style.height=Math.max(0,r.bottom-r.top)*e.options.cursorHeight+"px",r.other){var o=n.appendChild(ji("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"));o.style.display="",o.style.left=r.other.left+"px",o.style.top=r.other.top+"px",o.style.height=.85*(r.other.bottom-r.other.top)+"px"}}function We(e,t,n){function r(e,t,n,r){0>t&&(t=0),t=Math.round(t),r=Math.round(r),l.appendChild(ji("div",null,"CodeMirror-selected","position: absolute; left: "+e+"px; top: "+t+"px; width: "+(null==n?u-e:n)+"px; height: "+(r-t)+"px"))}function i(t,n,i){function o(n,r){return ht(e,Bo(t,n),"div",f,r)}var l,s,f=Zr(a,t),h=f.text.length;return eo(ii(f),n||0,null==i?h:i,function(e,t,a){var f,d,p,m=o(e,"left");if(e==t)f=m,d=p=m.left;else{if(f=o(t-1,"right"),"rtl"==a){var g=m;m=f,f=g}d=m.left,p=f.right}null==n&&0==e&&(d=c),f.top-m.top>3&&(r(d,m.top,null,m.bottom),d=c,m.bottom<f.top&&r(d,m.bottom,null,f.top)),null==i&&t==h&&(p=u),(!l||m.top<l.top||m.top==l.top&&m.left<l.left)&&(l=m),(!s||f.bottom>s.bottom||f.bottom==s.bottom&&f.right>s.right)&&(s=f),c+1>d&&(d=c),r(d,f.top,p-d,f.bottom)}),{start:l,end:s}}var o=e.display,a=e.doc,l=document.createDocumentFragment(),s=Ge(e.display),c=s.left,u=Math.max(o.sizerWidth,$e(e)-o.sizer.offsetLeft)-s.right,f=t.from(),h=t.to();if(f.line==h.line)i(f.line,f.ch,h.ch);else{var d=Zr(a,f.line),p=Zr(a,h.line),m=yr(d)==yr(p),g=i(f.line,f.ch,m?d.text.length+1:null).end,v=i(h.line,m?0:null,h.ch).start;m&&(g.top<v.top-2?(r(g.right,g.top,null,g.bottom),r(c,v.top,v.left,v.bottom)):r(g.right,g.top,v.left-g.right,g.bottom)),g.bottom<v.top&&r(c,g.bottom,null,v.top)}n.appendChild(l)}function Be(e){if(e.state.focused){var t=e.display;clearInterval(t.blinker);var n=!0;t.cursorDiv.style.visibility="",e.options.cursorBlinkRate>0?t.blinker=setInterval(function(){t.cursorDiv.style.visibility=(n=!n)?"":"hidden"},e.options.cursorBlinkRate):e.options.cursorBlinkRate<0&&(t.cursorDiv.style.visibility="hidden")}}function _e(e,t){e.doc.mode.startState&&e.doc.frontier<e.display.viewTo&&e.state.highlight.set(t,Bi(Fe,e))}function Fe(e){var t=e.doc;if(t.frontier<t.first&&(t.frontier=t.first),!(t.frontier>=e.display.viewTo)){var n=+new Date+e.options.workTime,r=sa(t.mode,je(e,t.frontier)),i=[];t.iter(t.frontier,Math.min(t.first+t.size,e.display.viewTo+500),function(o){if(t.frontier>=e.display.viewFrom){var a=o.styles,l=o.text.length>e.options.maxHighlightLength,s=Rr(e,o,l?sa(t.mode,r):r,!0);o.styles=s.styles;var c=o.styleClasses,u=s.classes;u?o.styleClasses=u:c&&(o.styleClasses=null);for(var f=!a||a.length!=o.styles.length||c!=u&&(!c||!u||c.bgClass!=u.bgClass||c.textClass!=u.textClass),h=0;!f&&h<a.length;++h)f=a[h]!=o.styles[h];f&&i.push(t.frontier),o.stateAfter=l?r:sa(t.mode,r)}else o.text.length<=e.options.maxHighlightLength&&Hr(e,o.text,r),o.stateAfter=t.frontier%5==0?sa(t.mode,r):null;return++t.frontier,+new Date>n?(_e(e,e.options.workDelay),!0):void 0}),i.length&&At(e,function(){for(var t=0;t<i.length;t++)Ht(e,i[t],"text")})}}function ze(e,t,n){for(var r,i,o=e.doc,a=n?-1:t-(e.doc.mode.innerMode?1e3:100),l=t;l>a;--l){if(l<=o.first)return o.first;var s=Zr(o,l-1);if(s.stateAfter&&(!n||l<=o.frontier))return l;var c=Fa(s.text,null,e.options.tabSize);(null==i||r>c)&&(i=l-1,r=c)}return i}function je(e,t,n){var r=e.doc,i=e.display;if(!r.mode.startState)return!0;var o=ze(e,t,n),a=o>r.first&&Zr(r,o-1).stateAfter;return a=a?sa(r.mode,a):ca(r.mode),r.iter(o,t,function(n){Hr(e,n.text,a);var l=o==t-1||o%5==0||o>=i.viewFrom&&o<i.viewTo;n.stateAfter=l?sa(r.mode,a):null,++o}),n&&(r.frontier=o),a}function Ue(e){return e.lineSpace.offsetTop}function qe(e){return e.mover.offsetHeight-e.lineSpace.offsetHeight}function Ge(e){if(e.cachedPaddingH)return e.cachedPaddingH;var t=qi(e.measure,ji("pre","x")),n=window.getComputedStyle?window.getComputedStyle(t):t.currentStyle,r={left:parseInt(n.paddingLeft),right:parseInt(n.paddingRight)};return isNaN(r.left)||isNaN(r.right)||(e.cachedPaddingH=r),r}function Ye(e){return Da-e.display.nativeBarWidth}function $e(e){return e.display.scroller.clientWidth-Ye(e)-e.display.barWidth}function Ve(e){return e.display.scroller.clientHeight-Ye(e)-e.display.barHeight}function Ke(e,t,n){var r=e.options.lineWrapping,i=r&&$e(e);if(!t.measure.heights||r&&t.measure.width!=i){var o=t.measure.heights=[];if(r){t.measure.width=i;for(var a=t.text.firstChild.getClientRects(),l=0;l<a.length-1;l++){var s=a[l],c=a[l+1];Math.abs(s.bottom-c.bottom)>2&&o.push((s.bottom+c.top)/2-n.top)}}o.push(n.bottom-n.top)}}function Xe(e,t,n){if(e.line==t)return{map:e.measure.map,cache:e.measure.cache};for(var r=0;r<e.rest.length;r++)if(e.rest[r]==t)return{map:e.measure.maps[r],cache:e.measure.caches[r]};for(var r=0;r<e.rest.length;r++)if(ti(e.rest[r])>n)return{map:e.measure.maps[r],cache:e.measure.caches[r],before:!0}}function Ze(e,t){t=yr(t);var n=ti(t),r=e.display.externalMeasured=new Pt(e.doc,t,n);r.lineN=n;var i=r.built=Br(e,r);return r.text=i.pre,qi(e.display.lineMeasure,i.pre),r}function Je(e,t,n,r){return tt(e,et(e,t),n,r)}function Qe(e,t){if(t>=e.display.viewFrom&&t<e.display.viewTo)return e.display.view[Bt(e,t)];var n=e.display.externalMeasured;return n&&t>=n.lineN&&t<n.lineN+n.size?n:void 0}function et(e,t){var n=ti(t),r=Qe(e,n);r&&!r.text?r=null:r&&r.changes&&(D(e,r,n,P(e)),e.curOp.forceUpdate=!0),r||(r=Ze(e,t));var i=Xe(r,t,n);return{line:t,view:r,rect:null,map:i.map,cache:i.cache,before:i.before,hasHeights:!1}}function tt(e,t,n,r,i){t.before&&(n=-1);var o,a=n+(r||"");return t.cache.hasOwnProperty(a)?o=t.cache[a]:(t.rect||(t.rect=t.view.text.getBoundingClientRect()),t.hasHeights||(Ke(e,t.view,t.rect),t.hasHeights=!0),o=rt(e,t,n,r),o.bogus||(t.cache[a]=o)),{left:o.left,right:o.right,top:i?o.rtop:o.top,bottom:i?o.rbottom:o.bottom}}function nt(e,t,n){for(var r,i,o,a,l=0;l<e.length;l+=3){var s=e[l],c=e[l+1];if(s>t?(i=0,o=1,a="left"):c>t?(i=t-s,o=i+1):(l==e.length-3||t==c&&e[l+3]>t)&&(o=c-s,i=o-1,t>=c&&(a="right")),null!=i){if(r=e[l+2],s==c&&n==(r.insertLeft?"left":"right")&&(a=n),"left"==n&&0==i)for(;l&&e[l-2]==e[l-3]&&e[l-1].insertLeft;)r=e[(l-=3)+2],a="left";if("right"==n&&i==c-s)for(;l<e.length-3&&e[l+3]==e[l+4]&&!e[l+5].insertLeft;)r=e[(l+=3)+2],a="right";break}}return{node:r,start:i,end:o,collapse:a,coverStart:s,coverEnd:c}}function rt(e,t,n,r){var i,o=nt(t.map,n,r),a=o.node,l=o.start,s=o.end,c=o.collapse;if(3==a.nodeType){for(var u=0;4>u;u++){for(;l&&zi(t.line.text.charAt(o.coverStart+l));)--l;for(;o.coverStart+s<o.coverEnd&&zi(t.line.text.charAt(o.coverStart+s));)++s;if(xo&&9>bo&&0==l&&s==o.coverEnd-o.coverStart)i=a.parentNode.getBoundingClientRect();else if(xo&&e.options.lineWrapping){var f=qa(a,l,s).getClientRects();i=f.length?f["right"==r?f.length-1:0]:qo}else i=qa(a,l,s).getBoundingClientRect()||qo;if(i.left||i.right||0==l)break;s=l,l-=1,c="right"}xo&&11>bo&&(i=it(e.display.measure,i))}else{l>0&&(c=r="right");var f;i=e.options.lineWrapping&&(f=a.getClientRects()).length>1?f["right"==r?f.length-1:0]:a.getBoundingClientRect()}if(xo&&9>bo&&!l&&(!i||!i.left&&!i.right)){var h=a.parentNode.getClientRects()[0];i=h?{left:h.left,right:h.left+xt(e.display),top:h.top,bottom:h.bottom}:qo}for(var d=i.top-t.rect.top,p=i.bottom-t.rect.top,m=(d+p)/2,g=t.view.measure.heights,u=0;u<g.length-1&&!(m<g[u]);u++);var v=u?g[u-1]:0,y=g[u],x={left:("right"==c?i.right:i.left)-t.rect.left,right:("left"==c?i.left:i.right)-t.rect.left,top:v,bottom:y};return i.left||i.right||(x.bogus=!0),e.options.singleCursorHeightPerLine||(x.rtop=d,x.rbottom=p),x}function it(e,t){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!Qi(e))return t;var n=screen.logicalXDPI/screen.deviceXDPI,r=screen.logicalYDPI/screen.deviceYDPI;return{left:t.left*n,right:t.right*n,top:t.top*r,bottom:t.bottom*r}}function ot(e){if(e.measure&&(e.measure.cache={},e.measure.heights=null,e.rest))for(var t=0;t<e.rest.length;t++)e.measure.caches[t]={}}function at(e){e.display.externalMeasure=null,Ui(e.display.lineMeasure);for(var t=0;t<e.display.view.length;t++)ot(e.display.view[t])}function lt(e){at(e),e.display.cachedCharWidth=e.display.cachedTextHeight=e.display.cachedPaddingH=null,e.options.lineWrapping||(e.display.maxLineChanged=!0),e.display.lineNumChars=null}function st(){return window.pageXOffset||(document.documentElement||document.body).scrollLeft}function ct(){return window.pageYOffset||(document.documentElement||document.body).scrollTop}function ut(e,t,n,r){if(t.widgets)for(var i=0;i<t.widgets.length;++i)if(t.widgets[i].above){var o=Lr(t.widgets[i]);n.top+=o,n.bottom+=o}if("line"==r)return n;r||(r="local");var a=ri(t);if("local"==r?a+=Ue(e.display):a-=e.display.viewOffset,"page"==r||"window"==r){var l=e.display.lineSpace.getBoundingClientRect();a+=l.top+("window"==r?0:ct());var s=l.left+("window"==r?0:st());n.left+=s,n.right+=s}return n.top+=a,n.bottom+=a,n}function ft(e,t,n){if("div"==n)return t;var r=t.left,i=t.top;if("page"==n)r-=st(),
+i-=ct();else if("local"==n||!n){var o=e.display.sizer.getBoundingClientRect();r+=o.left,i+=o.top}var a=e.display.lineSpace.getBoundingClientRect();return{left:r-a.left,top:i-a.top}}function ht(e,t,n,r,i){return r||(r=Zr(e.doc,t.line)),ut(e,r,Je(e,r,t.ch,i),n)}function dt(e,t,n,r,i,o){function a(t,a){var l=tt(e,i,t,a?"right":"left",o);return a?l.left=l.right:l.right=l.left,ut(e,r,l,n)}function l(e,t){var n=s[t],r=n.level%2;return e==to(n)&&t&&n.level<s[t-1].level?(n=s[--t],e=no(n)-(n.level%2?0:1),r=!0):e==no(n)&&t<s.length-1&&n.level<s[t+1].level&&(n=s[++t],e=to(n)-n.level%2,r=!1),r&&e==n.to&&e>n.from?a(e-1):a(e,r)}r=r||Zr(e.doc,t.line),i||(i=et(e,r));var s=ii(r),c=t.ch;if(!s)return a(c);var u=co(s,c),f=l(c,u);return null!=al&&(f.other=l(c,al)),f}function pt(e,t){var n=0,t=me(e.doc,t);e.options.lineWrapping||(n=xt(e.display)*t.ch);var r=Zr(e.doc,t.line),i=ri(r)+Ue(e.display);return{left:n,right:n,top:i,bottom:i+r.height}}function mt(e,t,n,r){var i=Bo(e,t);return i.xRel=r,n&&(i.outside=!0),i}function gt(e,t,n){var r=e.doc;if(n+=e.display.viewOffset,0>n)return mt(r.first,0,!0,-1);var i=ni(r,n),o=r.first+r.size-1;if(i>o)return mt(r.first+r.size-1,Zr(r,o).text.length,!0,1);0>t&&(t=0);for(var a=Zr(r,i);;){var l=vt(e,a,i,t,n),s=gr(a),c=s&&s.find(0,!0);if(!s||!(l.ch>c.from.ch||l.ch==c.from.ch&&l.xRel>0))return l;i=ti(a=c.to.line)}}function vt(e,t,n,r,i){function o(r){var i=dt(e,Bo(n,r),"line",t,c);return l=!0,a>i.bottom?i.left-s:a<i.top?i.left+s:(l=!1,i.left)}var a=i-ri(t),l=!1,s=2*e.display.wrapper.clientWidth,c=et(e,t),u=ii(t),f=t.text.length,h=ro(t),d=io(t),p=o(h),m=l,g=o(d),v=l;if(r>g)return mt(n,d,v,1);for(;;){if(u?d==h||d==fo(t,h,1):1>=d-h){for(var y=p>r||g-r>=r-p?h:d,x=r-(y==h?p:g);zi(t.text.charAt(y));)++y;var b=mt(n,y,y==h?m:v,-1>x?-1:x>1?1:0);return b}var w=Math.ceil(f/2),k=h+w;if(u){k=h;for(var S=0;w>S;++S)k=fo(t,k,1)}var C=o(k);C>r?(d=k,g=C,(v=l)&&(g+=1e3),f=w):(h=k,p=C,m=l,f-=w)}}function yt(e){if(null!=e.cachedTextHeight)return e.cachedTextHeight;if(null==zo){zo=ji("pre");for(var t=0;49>t;++t)zo.appendChild(document.createTextNode("x")),zo.appendChild(ji("br"));zo.appendChild(document.createTextNode("x"))}qi(e.measure,zo);var n=zo.offsetHeight/50;return n>3&&(e.cachedTextHeight=n),Ui(e.measure),n||1}function xt(e){if(null!=e.cachedCharWidth)return e.cachedCharWidth;var t=ji("span","xxxxxxxxxx"),n=ji("pre",[t]);qi(e.measure,n);var r=t.getBoundingClientRect(),i=(r.right-r.left)/10;return i>2&&(e.cachedCharWidth=i),i||10}function bt(e){e.curOp={cm:e,viewChanged:!1,startHeight:e.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++Yo},Go?Go.ops.push(e.curOp):e.curOp.ownsGroup=Go={ops:[e.curOp],delayedCallbacks:[]}}function wt(e){var t=e.delayedCallbacks,n=0;do{for(;n<t.length;n++)t[n].call(null);for(var r=0;r<e.ops.length;r++){var i=e.ops[r];if(i.cursorActivityHandlers)for(;i.cursorActivityCalled<i.cursorActivityHandlers.length;)i.cursorActivityHandlers[i.cursorActivityCalled++].call(null,i.cm)}}while(n<t.length)}function kt(e){var t=e.curOp,n=t.ownsGroup;if(n)try{wt(n)}finally{Go=null;for(var r=0;r<n.ops.length;r++)n.ops[r].cm.curOp=null;St(n)}}function St(e){for(var t=e.ops,n=0;n<t.length;n++)Ct(t[n]);for(var n=0;n<t.length;n++)Lt(t[n]);for(var n=0;n<t.length;n++)Tt(t[n]);for(var n=0;n<t.length;n++)Mt(t[n]);for(var n=0;n<t.length;n++)Nt(t[n])}function Ct(e){var t=e.cm,n=t.display;T(t),e.updateMaxLine&&h(t),e.mustUpdate=e.viewChanged||e.forceUpdate||null!=e.scrollTop||e.scrollToPos&&(e.scrollToPos.from.line<n.viewFrom||e.scrollToPos.to.line>=n.viewTo)||n.maxLineChanged&&t.options.lineWrapping,e.update=e.mustUpdate&&new L(t,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}function Lt(e){e.updatedDisplay=e.mustUpdate&&M(e.cm,e.update)}function Tt(e){var t=e.cm,n=t.display;e.updatedDisplay&&O(t),e.barMeasure=p(t),n.maxLineChanged&&!t.options.lineWrapping&&(e.adjustWidthTo=Je(t,n.maxLine,n.maxLine.text.length).left+3,t.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(n.scroller.clientWidth,n.sizer.offsetLeft+e.adjustWidthTo+Ye(t)+t.display.barWidth),e.maxScrollLeft=Math.max(0,n.sizer.offsetLeft+e.adjustWidthTo-$e(t))),(e.updatedDisplay||e.selectionChanged)&&(e.preparedSelection=n.input.prepareSelection(e.focus))}function Mt(e){var t=e.cm;null!=e.adjustWidthTo&&(t.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft<t.doc.scrollLeft&&on(t,Math.min(t.display.scroller.scrollLeft,e.maxScrollLeft),!0),t.display.maxLineChanged=!1);var n=e.focus&&e.focus==Gi()&&(!document.hasFocus||document.hasFocus());e.preparedSelection&&t.display.input.showSelection(e.preparedSelection,n),(e.updatedDisplay||e.startHeight!=t.doc.height)&&y(t,e.barMeasure),e.updatedDisplay&&E(t,e.barMeasure),e.selectionChanged&&Be(t),t.state.focused&&e.updateInput&&t.display.input.reset(e.typing),n&&X(e.cm)}function Nt(e){var t=e.cm,n=t.display,r=t.doc;if(e.updatedDisplay&&N(t,e.update),null==n.wheelStartX||null==e.scrollTop&&null==e.scrollLeft&&!e.scrollToPos||(n.wheelStartX=n.wheelStartY=null),null==e.scrollTop||n.scroller.scrollTop==e.scrollTop&&!e.forceScroll||(r.scrollTop=Math.max(0,Math.min(n.scroller.scrollHeight-n.scroller.clientHeight,e.scrollTop)),n.scrollbars.setScrollTop(r.scrollTop),n.scroller.scrollTop=r.scrollTop),null==e.scrollLeft||n.scroller.scrollLeft==e.scrollLeft&&!e.forceScroll||(r.scrollLeft=Math.max(0,Math.min(n.scroller.scrollWidth-n.scroller.clientWidth,e.scrollLeft)),n.scrollbars.setScrollLeft(r.scrollLeft),n.scroller.scrollLeft=r.scrollLeft,w(t)),e.scrollToPos){var i=Rn(t,me(r,e.scrollToPos.from),me(r,e.scrollToPos.to),e.scrollToPos.margin);e.scrollToPos.isCursor&&t.state.focused&&Pn(t,i)}var o=e.maybeHiddenMarkers,a=e.maybeUnhiddenMarkers;if(o)for(var l=0;l<o.length;++l)o[l].lines.length||Pa(o[l],"hide");if(a)for(var l=0;l<a.length;++l)a[l].lines.length&&Pa(a[l],"unhide");n.wrapper.offsetHeight&&(r.scrollTop=t.display.scroller.scrollTop),e.changeObjs&&Pa(t,"changes",t,e.changeObjs),e.update&&e.update.finish()}function At(e,t){if(e.curOp)return t();bt(e);try{return t()}finally{kt(e)}}function Et(e,t){return function(){if(e.curOp)return t.apply(e,arguments);bt(e);try{return t.apply(e,arguments)}finally{kt(e)}}}function Ot(e){return function(){if(this.curOp)return e.apply(this,arguments);bt(this);try{return e.apply(this,arguments)}finally{kt(this)}}}function It(e){return function(){var t=this.cm;if(!t||t.curOp)return e.apply(this,arguments);bt(t);try{return e.apply(this,arguments)}finally{kt(t)}}}function Pt(e,t,n){this.line=t,this.rest=xr(t),this.size=this.rest?ti(Ii(this.rest))-n+1:1,this.node=this.text=null,this.hidden=kr(e,t)}function Rt(e,t,n){for(var r,i=[],o=t;n>o;o=r){var a=new Pt(e.doc,Zr(e.doc,o),o);r=o+a.size,i.push(a)}return i}function Dt(e,t,n,r){null==t&&(t=e.doc.first),null==n&&(n=e.doc.first+e.doc.size),r||(r=0);var i=e.display;if(r&&n<i.viewTo&&(null==i.updateLineNumbers||i.updateLineNumbers>t)&&(i.updateLineNumbers=t),e.curOp.viewChanged=!0,t>=i.viewTo)Wo&&br(e.doc,t)<i.viewTo&&Wt(e);else if(n<=i.viewFrom)Wo&&wr(e.doc,n+r)>i.viewFrom?Wt(e):(i.viewFrom+=r,i.viewTo+=r);else if(t<=i.viewFrom&&n>=i.viewTo)Wt(e);else if(t<=i.viewFrom){var o=_t(e,n,n+r,1);o?(i.view=i.view.slice(o.index),i.viewFrom=o.lineN,i.viewTo+=r):Wt(e)}else if(n>=i.viewTo){var o=_t(e,t,t,-1);o?(i.view=i.view.slice(0,o.index),i.viewTo=o.lineN):Wt(e)}else{var a=_t(e,t,t,-1),l=_t(e,n,n+r,1);a&&l?(i.view=i.view.slice(0,a.index).concat(Rt(e,a.lineN,l.lineN)).concat(i.view.slice(l.index)),i.viewTo+=r):Wt(e)}var s=i.externalMeasured;s&&(n<s.lineN?s.lineN+=r:t<s.lineN+s.size&&(i.externalMeasured=null))}function Ht(e,t,n){e.curOp.viewChanged=!0;var r=e.display,i=e.display.externalMeasured;if(i&&t>=i.lineN&&t<i.lineN+i.size&&(r.externalMeasured=null),!(t<r.viewFrom||t>=r.viewTo)){var o=r.view[Bt(e,t)];if(null!=o.node){var a=o.changes||(o.changes=[]);-1==Pi(a,n)&&a.push(n)}}}function Wt(e){e.display.viewFrom=e.display.viewTo=e.doc.first,e.display.view=[],e.display.viewOffset=0}function Bt(e,t){if(t>=e.display.viewTo)return null;if(t-=e.display.viewFrom,0>t)return null;for(var n=e.display.view,r=0;r<n.length;r++)if(t-=n[r].size,0>t)return r}function _t(e,t,n,r){var i,o=Bt(e,t),a=e.display.view;if(!Wo||n==e.doc.first+e.doc.size)return{index:o,lineN:n};for(var l=0,s=e.display.viewFrom;o>l;l++)s+=a[l].size;if(s!=t){if(r>0){if(o==a.length-1)return null;i=s+a[o].size-t,o++}else i=s-t;t+=i,n+=i}for(;br(e.doc,n)!=n;){if(o==(0>r?0:a.length-1))return null;n+=r*a[o-(0>r?1:0)].size,o+=r}return{index:o,lineN:n}}function Ft(e,t,n){var r=e.display,i=r.view;0==i.length||t>=r.viewTo||n<=r.viewFrom?(r.view=Rt(e,t,n),r.viewFrom=t):(r.viewFrom>t?r.view=Rt(e,t,r.viewFrom).concat(r.view):r.viewFrom<t&&(r.view=r.view.slice(Bt(e,t))),r.viewFrom=t,r.viewTo<n?r.view=r.view.concat(Rt(e,r.viewTo,n)):r.viewTo>n&&(r.view=r.view.slice(0,Bt(e,n)))),r.viewTo=n}function zt(e){for(var t=e.display.view,n=0,r=0;r<t.length;r++){var i=t[r];i.hidden||i.node&&!i.changes||++n}return n}function jt(e){function t(){i.activeTouch&&(o=setTimeout(function(){i.activeTouch=null},1e3),a=i.activeTouch,a.end=+new Date)}function n(e){if(1!=e.touches.length)return!1;var t=e.touches[0];return t.radiusX<=1&&t.radiusY<=1}function r(e,t){if(null==t.left)return!0;var n=t.left-e.left,r=t.top-e.top;return n*n+r*r>400}var i=e.display;Ea(i.scroller,"mousedown",Et(e,$t)),xo&&11>bo?Ea(i.scroller,"dblclick",Et(e,function(t){if(!Ti(e,t)){var n=Yt(e,t);if(n&&!Jt(e,t)&&!Gt(e.display,t)){Ma(t);var r=e.findWordAt(n);be(e.doc,r.anchor,r.head)}}})):Ea(i.scroller,"dblclick",function(t){Ti(e,t)||Ma(t)}),Do||Ea(i.scroller,"contextmenu",function(t){xn(e,t)});var o,a={end:0};Ea(i.scroller,"touchstart",function(t){if(!Ti(e,t)&&!n(t)){clearTimeout(o);var r=+new Date;i.activeTouch={start:r,moved:!1,prev:r-a.end<=300?a:null},1==t.touches.length&&(i.activeTouch.left=t.touches[0].pageX,i.activeTouch.top=t.touches[0].pageY)}}),Ea(i.scroller,"touchmove",function(){i.activeTouch&&(i.activeTouch.moved=!0)}),Ea(i.scroller,"touchend",function(n){var o=i.activeTouch;if(o&&!Gt(i,n)&&null!=o.left&&!o.moved&&new Date-o.start<300){var a,l=e.coordsChar(i.activeTouch,"page");a=!o.prev||r(o,o.prev)?new fe(l,l):!o.prev.prev||r(o,o.prev.prev)?e.findWordAt(l):new fe(Bo(l.line,0),me(e.doc,Bo(l.line+1,0))),e.setSelection(a.anchor,a.head),e.focus(),Ma(n)}t()}),Ea(i.scroller,"touchcancel",t),Ea(i.scroller,"scroll",function(){i.scroller.clientHeight&&(rn(e,i.scroller.scrollTop),on(e,i.scroller.scrollLeft,!0),Pa(e,"scroll",e))}),Ea(i.scroller,"mousewheel",function(t){an(e,t)}),Ea(i.scroller,"DOMMouseScroll",function(t){an(e,t)}),Ea(i.wrapper,"scroll",function(){i.wrapper.scrollTop=i.wrapper.scrollLeft=0}),i.dragFunctions={enter:function(t){Ti(e,t)||Aa(t)},over:function(t){Ti(e,t)||(tn(e,t),Aa(t))},start:function(t){en(e,t)},drop:Et(e,Qt),leave:function(t){Ti(e,t)||nn(e)}};var l=i.input.getField();Ea(l,"keyup",function(t){pn.call(e,t)}),Ea(l,"keydown",Et(e,hn)),Ea(l,"keypress",Et(e,mn)),Ea(l,"focus",Bi(vn,e)),Ea(l,"blur",Bi(yn,e))}function Ut(t,n,r){var i=r&&r!=e.Init;if(!n!=!i){var o=t.display.dragFunctions,a=n?Ea:Ia;a(t.display.scroller,"dragstart",o.start),a(t.display.scroller,"dragenter",o.enter),a(t.display.scroller,"dragover",o.over),a(t.display.scroller,"dragleave",o.leave),a(t.display.scroller,"drop",o.drop)}}function qt(e){var t=e.display;t.lastWrapHeight==t.wrapper.clientHeight&&t.lastWrapWidth==t.wrapper.clientWidth||(t.cachedCharWidth=t.cachedTextHeight=t.cachedPaddingH=null,t.scrollbarsClipped=!1,e.setSize())}function Gt(e,t){for(var n=wi(t);n!=e.wrapper;n=n.parentNode)if(!n||1==n.nodeType&&"true"==n.getAttribute("cm-ignore-events")||n.parentNode==e.sizer&&n!=e.mover)return!0}function Yt(e,t,n,r){var i=e.display;if(!n&&"true"==wi(t).getAttribute("cm-not-content"))return null;var o,a,l=i.lineSpace.getBoundingClientRect();try{o=t.clientX-l.left,a=t.clientY-l.top}catch(t){return null}var s,c=gt(e,o,a);if(r&&1==c.xRel&&(s=Zr(e.doc,c.line).text).length==c.ch){var u=Fa(s,s.length,e.options.tabSize)-s.length;c=Bo(c.line,Math.max(0,Math.round((o-Ge(e.display).left)/xt(e.display))-u))}return c}function $t(e){var t=this,n=t.display;if(!(Ti(t,e)||n.activeTouch&&n.input.supportsTouch())){if(n.shift=e.shiftKey,Gt(n,e))return void(wo||(n.scroller.draggable=!1,setTimeout(function(){n.scroller.draggable=!0},100)));if(!Jt(t,e)){var r=Yt(t,e);switch(window.focus(),ki(e)){case 1:t.state.selectingText?t.state.selectingText(e):r?Vt(t,e,r):wi(e)==n.scroller&&Ma(e);break;case 2:wo&&(t.state.lastMiddleDown=+new Date),r&&be(t.doc,r),setTimeout(function(){n.input.focus()},20),Ma(e);break;case 3:Do?xn(t,e):gn(t)}}}}function Vt(e,t,n){xo?setTimeout(Bi(X,e),0):e.curOp.focus=Gi();var r,i=+new Date;Uo&&Uo.time>i-400&&0==_o(Uo.pos,n)?r="triple":jo&&jo.time>i-400&&0==_o(jo.pos,n)?(r="double",Uo={time:i,pos:n}):(r="single",jo={time:i,pos:n});var o,a=e.doc.sel,l=Eo?t.metaKey:t.ctrlKey;e.options.dragDrop&&el&&!e.isReadOnly()&&"single"==r&&(o=a.contains(n))>-1&&(_o((o=a.ranges[o]).from(),n)<0||n.xRel>0)&&(_o(o.to(),n)>0||n.xRel<0)?Kt(e,t,n,l):Xt(e,t,n,r,l)}function Kt(e,t,n,r){var i=e.display,o=+new Date,a=Et(e,function(l){wo&&(i.scroller.draggable=!1),e.state.draggingText=!1,Ia(document,"mouseup",a),Ia(i.scroller,"drop",a),Math.abs(t.clientX-l.clientX)+Math.abs(t.clientY-l.clientY)<10&&(Ma(l),!r&&+new Date-200<o&&be(e.doc,n),wo||xo&&9==bo?setTimeout(function(){document.body.focus(),i.input.focus()},20):i.input.focus())});wo&&(i.scroller.draggable=!0),e.state.draggingText=a,i.scroller.dragDrop&&i.scroller.dragDrop(),Ea(document,"mouseup",a),Ea(i.scroller,"drop",a)}function Xt(e,t,n,r,i){function o(t){if(0!=_o(g,t))if(g=t,"rect"==r){for(var i=[],o=e.options.tabSize,a=Fa(Zr(c,n.line).text,n.ch,o),l=Fa(Zr(c,t.line).text,t.ch,o),s=Math.min(a,l),d=Math.max(a,l),p=Math.min(n.line,t.line),m=Math.min(e.lastLine(),Math.max(n.line,t.line));m>=p;p++){var v=Zr(c,p).text,y=za(v,s,o);s==d?i.push(new fe(Bo(p,y),Bo(p,y))):v.length>y&&i.push(new fe(Bo(p,y),Bo(p,za(v,d,o))))}i.length||i.push(new fe(n,n)),Te(c,he(h.ranges.slice(0,f).concat(i),f),{origin:"*mouse",scroll:!1}),e.scrollIntoView(t)}else{var x=u,b=x.anchor,w=t;if("single"!=r){if("double"==r)var k=e.findWordAt(t);else var k=new fe(Bo(t.line,0),me(c,Bo(t.line+1,0)));_o(k.anchor,b)>0?(w=k.head,b=K(x.from(),k.anchor)):(w=k.anchor,b=V(x.to(),k.head))}var i=h.ranges.slice(0);i[f]=new fe(me(c,b),w),Te(c,he(i,f),Ba)}}function a(t){var n=++y,i=Yt(e,t,!0,"rect"==r);if(i)if(0!=_o(i,g)){e.curOp.focus=Gi(),o(i);var l=b(s,c);(i.line>=l.to||i.line<l.from)&&setTimeout(Et(e,function(){y==n&&a(t)}),150)}else{var u=t.clientY<v.top?-20:t.clientY>v.bottom?20:0;u&&setTimeout(Et(e,function(){y==n&&(s.scroller.scrollTop+=u,a(t))}),50)}}function l(t){e.state.selectingText=!1,y=1/0,Ma(t),s.input.focus(),Ia(document,"mousemove",x),Ia(document,"mouseup",w),c.history.lastSelOrigin=null}var s=e.display,c=e.doc;Ma(t);var u,f,h=c.sel,d=h.ranges;if(i&&!t.shiftKey?(f=c.sel.contains(n),u=f>-1?d[f]:new fe(n,n)):(u=c.sel.primary(),f=c.sel.primIndex),Oo?t.shiftKey&&t.metaKey:t.altKey)r="rect",i||(u=new fe(n,n)),n=Yt(e,t,!0,!0),f=-1;else if("double"==r){var p=e.findWordAt(n);u=e.display.shift||c.extend?xe(c,u,p.anchor,p.head):p}else if("triple"==r){var m=new fe(Bo(n.line,0),me(c,Bo(n.line+1,0)));u=e.display.shift||c.extend?xe(c,u,m.anchor,m.head):m}else u=xe(c,u,n);i?-1==f?(f=d.length,Te(c,he(d.concat([u]),f),{scroll:!1,origin:"*mouse"})):d.length>1&&d[f].empty()&&"single"==r&&!t.shiftKey?(Te(c,he(d.slice(0,f).concat(d.slice(f+1)),0),{scroll:!1,origin:"*mouse"}),h=c.sel):ke(c,f,u,Ba):(f=0,Te(c,new ue([u],0),Ba),h=c.sel);var g=n,v=s.wrapper.getBoundingClientRect(),y=0,x=Et(e,function(e){ki(e)?a(e):l(e)}),w=Et(e,l);e.state.selectingText=w,Ea(document,"mousemove",x),Ea(document,"mouseup",w)}function Zt(e,t,n,r){try{var i=t.clientX,o=t.clientY}catch(t){return!1}if(i>=Math.floor(e.display.gutters.getBoundingClientRect().right))return!1;r&&Ma(t);var a=e.display,l=a.lineDiv.getBoundingClientRect();if(o>l.bottom||!Ni(e,n))return bi(t);o-=l.top-a.viewOffset;for(var s=0;s<e.options.gutters.length;++s){var c=a.gutters.childNodes[s];if(c&&c.getBoundingClientRect().right>=i){var u=ni(e.doc,o),f=e.options.gutters[s];return Pa(e,n,e,u,f,t),bi(t)}}}function Jt(e,t){return Zt(e,t,"gutterClick",!0)}function Qt(e){var t=this;if(nn(t),!Ti(t,e)&&!Gt(t.display,e)){Ma(e),xo&&($o=+new Date);var n=Yt(t,e,!0),r=e.dataTransfer.files;if(n&&!t.isReadOnly())if(r&&r.length&&window.FileReader&&window.File)for(var i=r.length,o=Array(i),a=0,l=function(e,r){if(!t.options.allowDropFileTypes||-1!=Pi(t.options.allowDropFileTypes,e.type)){var l=new FileReader;l.onload=Et(t,function(){var e=l.result;if(/[\x00-\x08\x0e-\x1f]{2}/.test(e)&&(e=""),o[r]=e,++a==i){n=me(t.doc,n);var s={from:n,to:n,text:t.doc.splitLines(o.join(t.doc.lineSeparator())),origin:"paste"};Tn(t.doc,s),Le(t.doc,de(n,Qo(s)))}}),l.readAsText(e)}},s=0;i>s;++s)l(r[s],s);else{if(t.state.draggingText&&t.doc.sel.contains(n)>-1)return t.state.draggingText(e),void setTimeout(function(){t.display.input.focus()},20);try{var o=e.dataTransfer.getData("Text");if(o){if(t.state.draggingText&&!(Eo?e.altKey:e.ctrlKey))var c=t.listSelections();if(Me(t.doc,de(n,n)),c)for(var s=0;s<c.length;++s)In(t.doc,"",c[s].anchor,c[s].head,"drag");t.replaceSelection(o,"around","paste"),t.display.input.focus()}}catch(e){}}}}function en(e,t){if(xo&&(!e.state.draggingText||+new Date-$o<100))return void Aa(t);if(!Ti(e,t)&&!Gt(e.display,t)&&(t.dataTransfer.setData("Text",e.getSelection()),t.dataTransfer.effectAllowed="copyMove",t.dataTransfer.setDragImage&&!Lo)){var n=ji("img",null,null,"position: fixed; left: 0; top: 0;");n.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",Co&&(n.width=n.height=1,e.display.wrapper.appendChild(n),n._top=n.offsetTop),t.dataTransfer.setDragImage(n,0,0),Co&&n.parentNode.removeChild(n)}}function tn(e,t){var n=Yt(e,t);if(n){var r=document.createDocumentFragment();He(e,n,r),e.display.dragCursor||(e.display.dragCursor=ji("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),e.display.lineSpace.insertBefore(e.display.dragCursor,e.display.cursorDiv)),qi(e.display.dragCursor,r)}}function nn(e){e.display.dragCursor&&(e.display.lineSpace.removeChild(e.display.dragCursor),e.display.dragCursor=null)}function rn(e,t){Math.abs(e.doc.scrollTop-t)<2||(e.doc.scrollTop=t,go||A(e,{top:t}),e.display.scroller.scrollTop!=t&&(e.display.scroller.scrollTop=t),e.display.scrollbars.setScrollTop(t),go&&A(e),_e(e,100))}function on(e,t,n){(n?t==e.doc.scrollLeft:Math.abs(e.doc.scrollLeft-t)<2)||(t=Math.min(t,e.display.scroller.scrollWidth-e.display.scroller.clientWidth),e.doc.scrollLeft=t,w(e),e.display.scroller.scrollLeft!=t&&(e.display.scroller.scrollLeft=t),e.display.scrollbars.setScrollLeft(t))}function an(e,t){var n=Xo(t),r=n.x,i=n.y,o=e.display,a=o.scroller,l=a.scrollWidth>a.clientWidth,s=a.scrollHeight>a.clientHeight;if(r&&l||i&&s){if(i&&Eo&&wo)e:for(var c=t.target,u=o.view;c!=a;c=c.parentNode)for(var f=0;f<u.length;f++)if(u[f].node==c){e.display.currentWheelTarget=c;break e}if(r&&!go&&!Co&&null!=Ko)return i&&s&&rn(e,Math.max(0,Math.min(a.scrollTop+i*Ko,a.scrollHeight-a.clientHeight))),on(e,Math.max(0,Math.min(a.scrollLeft+r*Ko,a.scrollWidth-a.clientWidth))),(!i||i&&s)&&Ma(t),void(o.wheelStartX=null);if(i&&null!=Ko){var h=i*Ko,d=e.doc.scrollTop,p=d+o.wrapper.clientHeight;0>h?d=Math.max(0,d+h-50):p=Math.min(e.doc.height,p+h+50),A(e,{top:d,bottom:p})}20>Vo&&(null==o.wheelStartX?(o.wheelStartX=a.scrollLeft,o.wheelStartY=a.scrollTop,o.wheelDX=r,o.wheelDY=i,setTimeout(function(){if(null!=o.wheelStartX){var e=a.scrollLeft-o.wheelStartX,t=a.scrollTop-o.wheelStartY,n=t&&o.wheelDY&&t/o.wheelDY||e&&o.wheelDX&&e/o.wheelDX;o.wheelStartX=o.wheelStartY=null,n&&(Ko=(Ko*Vo+n)/(Vo+1),++Vo)}},200)):(o.wheelDX+=r,o.wheelDY+=i))}}function ln(e,t,n){if("string"==typeof t&&(t=ua[t],!t))return!1;e.display.input.ensurePolled();var r=e.display.shift,i=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),n&&(e.display.shift=!1),i=t(e)!=Ha}finally{e.display.shift=r,e.state.suppressEdits=!1}return i}function sn(e,t,n){for(var r=0;r<e.state.keyMaps.length;r++){var i=ha(t,e.state.keyMaps[r],n,e);if(i)return i}return e.options.extraKeys&&ha(t,e.options.extraKeys,n,e)||ha(t,e.options.keyMap,n,e)}function cn(e,t,n,r){var i=e.state.keySeq;if(i){if(da(t))return"handled";Zo.set(50,function(){e.state.keySeq==i&&(e.state.keySeq=null,e.display.input.reset())}),t=i+" "+t}var o=sn(e,t,r);return"multi"==o&&(e.state.keySeq=t),"handled"==o&&Ci(e,"keyHandled",e,t,n),"handled"!=o&&"multi"!=o||(Ma(n),Be(e)),i&&!o&&/\'$/.test(t)?(Ma(n),!0):!!o}function un(e,t){var n=pa(t,!0);return n?t.shiftKey&&!e.state.keySeq?cn(e,"Shift-"+n,t,function(t){return ln(e,t,!0)})||cn(e,n,t,function(t){return("string"==typeof t?/^go[A-Z]/.test(t):t.motion)?ln(e,t):void 0}):cn(e,n,t,function(t){return ln(e,t)}):!1}function fn(e,t,n){return cn(e,"'"+n+"'",t,function(t){return ln(e,t,!0)})}function hn(e){var t=this;if(t.curOp.focus=Gi(),!Ti(t,e)){xo&&11>bo&&27==e.keyCode&&(e.returnValue=!1);var n=e.keyCode;t.display.shift=16==n||e.shiftKey;var r=un(t,e);Co&&(Jo=r?n:null,!r&&88==n&&!rl&&(Eo?e.metaKey:e.ctrlKey)&&t.replaceSelection("",null,"cut")),18!=n||/\bCodeMirror-crosshair\b/.test(t.display.lineDiv.className)||dn(t)}}function dn(e){function t(e){18!=e.keyCode&&e.altKey||(Za(n,"CodeMirror-crosshair"),Ia(document,"keyup",t),Ia(document,"mouseover",t))}var n=e.display.lineDiv;Ja(n,"CodeMirror-crosshair"),Ea(document,"keyup",t),Ea(document,"mouseover",t)}function pn(e){16==e.keyCode&&(this.doc.sel.shift=!1),Ti(this,e)}function mn(e){var t=this;if(!(Gt(t.display,e)||Ti(t,e)||e.ctrlKey&&!e.altKey||Eo&&e.metaKey)){var n=e.keyCode,r=e.charCode;if(Co&&n==Jo)return Jo=null,void Ma(e);if(!Co||e.which&&!(e.which<10)||!un(t,e)){var i=String.fromCharCode(null==r?n:r);fn(t,e,i)||t.display.input.onKeyPress(e)}}}function gn(e){e.state.delayingBlurEvent=!0,setTimeout(function(){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1,yn(e))},100)}function vn(e){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1),"nocursor"!=e.options.readOnly&&(e.state.focused||(Pa(e,"focus",e),e.state.focused=!0,Ja(e.display.wrapper,"CodeMirror-focused"),e.curOp||e.display.selForContextMenu==e.doc.sel||(e.display.input.reset(),wo&&setTimeout(function(){e.display.input.reset(!0)},20)),e.display.input.receivedFocus()),Be(e))}function yn(e){e.state.delayingBlurEvent||(e.state.focused&&(Pa(e,"blur",e),e.state.focused=!1,Za(e.display.wrapper,"CodeMirror-focused")),clearInterval(e.display.blinker),setTimeout(function(){e.state.focused||(e.display.shift=!1)},150))}function xn(e,t){Gt(e.display,t)||bn(e,t)||Ti(e,t,"contextmenu")||e.display.input.onContextMenu(t)}function bn(e,t){return Ni(e,"gutterContextMenu")?Zt(e,t,"gutterContextMenu",!1):!1}function wn(e,t){if(_o(e,t.from)<0)return e;if(_o(e,t.to)<=0)return Qo(t);var n=e.line+t.text.length-(t.to.line-t.from.line)-1,r=e.ch;return e.line==t.to.line&&(r+=Qo(t).ch-t.to.ch),Bo(n,r)}function kn(e,t){for(var n=[],r=0;r<e.sel.ranges.length;r++){var i=e.sel.ranges[r];n.push(new fe(wn(i.anchor,t),wn(i.head,t)))}return he(n,e.sel.primIndex)}function Sn(e,t,n){return e.line==t.line?Bo(n.line,e.ch-t.ch+n.ch):Bo(n.line+(e.line-t.line),e.ch)}function Cn(e,t,n){for(var r=[],i=Bo(e.first,0),o=i,a=0;a<t.length;a++){var l=t[a],s=Sn(l.from,i,o),c=Sn(Qo(l),i,o);if(i=l.to,o=c,"around"==n){var u=e.sel.ranges[a],f=_o(u.head,u.anchor)<0;r[a]=new fe(f?c:s,f?s:c)}else r[a]=new fe(s,s)}return new ue(r,e.sel.primIndex)}function Ln(e,t,n){var r={canceled:!1,from:t.from,to:t.to,text:t.text,origin:t.origin,cancel:function(){this.canceled=!0}};return n&&(r.update=function(t,n,r,i){t&&(this.from=me(e,t)),n&&(this.to=me(e,n)),r&&(this.text=r),void 0!==i&&(this.origin=i)}),Pa(e,"beforeChange",e,r),e.cm&&Pa(e.cm,"beforeChange",e.cm,r),r.canceled?null:{from:r.from,to:r.to,text:r.text,origin:r.origin}}function Tn(e,t,n){if(e.cm){if(!e.cm.curOp)return Et(e.cm,Tn)(e,t,n);if(e.cm.state.suppressEdits)return}if(!(Ni(e,"beforeChange")||e.cm&&Ni(e.cm,"beforeChange"))||(t=Ln(e,t,!0))){var r=Ho&&!n&&sr(e,t.from,t.to);if(r)for(var i=r.length-1;i>=0;--i)Mn(e,{from:r[i].from,to:r[i].to,text:i?[""]:t.text});else Mn(e,t)}}function Mn(e,t){if(1!=t.text.length||""!=t.text[0]||0!=_o(t.from,t.to)){var n=kn(e,t);ci(e,t,n,e.cm?e.cm.curOp.id:NaN),En(e,t,n,or(e,t));var r=[];Kr(e,function(e,n){n||-1!=Pi(r,e.history)||(xi(e.history,t),r.push(e.history)),En(e,t,null,or(e,t))})}}function Nn(e,t,n){if(!e.cm||!e.cm.state.suppressEdits){for(var r,i=e.history,o=e.sel,a="undo"==t?i.done:i.undone,l="undo"==t?i.undone:i.done,s=0;s<a.length&&(r=a[s],n?!r.ranges||r.equals(e.sel):r.ranges);s++);if(s!=a.length){for(i.lastOrigin=i.lastSelOrigin=null;r=a.pop(),r.ranges;){if(hi(r,l),n&&!r.equals(e.sel))return void Te(e,r,{clearRedo:!1});o=r}var c=[];hi(o,l),l.push({changes:c,generation:i.generation}),i.generation=r.generation||++i.maxGeneration;for(var u=Ni(e,"beforeChange")||e.cm&&Ni(e.cm,"beforeChange"),s=r.changes.length-1;s>=0;--s){var f=r.changes[s];if(f.origin=t,u&&!Ln(e,f,!1))return void(a.length=0);c.push(ai(e,f));var h=s?kn(e,f):Ii(a);En(e,f,h,lr(e,f)),!s&&e.cm&&e.cm.scrollIntoView({from:f.from,to:Qo(f)});var d=[];Kr(e,function(e,t){t||-1!=Pi(d,e.history)||(xi(e.history,f),d.push(e.history)),En(e,f,null,lr(e,f))})}}}}function An(e,t){if(0!=t&&(e.first+=t,e.sel=new ue(Ri(e.sel.ranges,function(e){return new fe(Bo(e.anchor.line+t,e.anchor.ch),Bo(e.head.line+t,e.head.ch))}),e.sel.primIndex),e.cm)){Dt(e.cm,e.first,e.first-t,t);for(var n=e.cm.display,r=n.viewFrom;r<n.viewTo;r++)Ht(e.cm,r,"gutter")}}function En(e,t,n,r){if(e.cm&&!e.cm.curOp)return Et(e.cm,En)(e,t,n,r);if(t.to.line<e.first)return void An(e,t.text.length-1-(t.to.line-t.from.line));if(!(t.from.line>e.lastLine())){if(t.from.line<e.first){var i=t.text.length-1-(e.first-t.from.line);An(e,i),t={from:Bo(e.first,0),to:Bo(t.to.line+i,t.to.ch),text:[Ii(t.text)],origin:t.origin}}var o=e.lastLine();t.to.line>o&&(t={from:t.from,to:Bo(o,Zr(e,o).text.length),text:[t.text[0]],origin:t.origin}),t.removed=Jr(e,t.from,t.to),n||(n=kn(e,t)),e.cm?On(e.cm,t,r):Yr(e,t,r),Me(e,n,Wa)}}function On(e,t,n){var r=e.doc,i=e.display,a=t.from,l=t.to,s=!1,c=a.line;e.options.lineWrapping||(c=ti(yr(Zr(r,a.line))),r.iter(c,l.line+1,function(e){return e==i.maxLine?(s=!0,!0):void 0})),r.sel.contains(t.from,t.to)>-1&&Mi(e),Yr(r,t,n,o(e)),e.options.lineWrapping||(r.iter(c,a.line+t.text.length,function(e){var t=f(e);t>i.maxLineLength&&(i.maxLine=e,i.maxLineLength=t,i.maxLineChanged=!0,s=!1)}),s&&(e.curOp.updateMaxLine=!0)),r.frontier=Math.min(r.frontier,a.line),_e(e,400);var u=t.text.length-(l.line-a.line)-1;t.full?Dt(e):a.line!=l.line||1!=t.text.length||Gr(e.doc,t)?Dt(e,a.line,l.line+1,u):Ht(e,a.line,"text");var h=Ni(e,"changes"),d=Ni(e,"change");if(d||h){var p={from:a,to:l,text:t.text,removed:t.removed,origin:t.origin};d&&Ci(e,"change",e,p),h&&(e.curOp.changeObjs||(e.curOp.changeObjs=[])).push(p)}e.display.selForContextMenu=null}function In(e,t,n,r,i){if(r||(r=n),_o(r,n)<0){var o=r;r=n,n=o}"string"==typeof t&&(t=e.splitLines(t)),Tn(e,{from:n,to:r,text:t,origin:i})}function Pn(e,t){if(!Ti(e,"scrollCursorIntoView")){var n=e.display,r=n.sizer.getBoundingClientRect(),i=null;if(t.top+r.top<0?i=!0:t.bottom+r.top>(window.innerHeight||document.documentElement.clientHeight)&&(i=!1),null!=i&&!Mo){var o=ji("div","​",null,"position: absolute; top: "+(t.top-n.viewOffset-Ue(e.display))+"px; height: "+(t.bottom-t.top+Ye(e)+n.barHeight)+"px; left: "+t.left+"px; width: 2px;");e.display.lineSpace.appendChild(o),o.scrollIntoView(i),e.display.lineSpace.removeChild(o)}}}function Rn(e,t,n,r){null==r&&(r=0);for(var i=0;5>i;i++){var o=!1,a=dt(e,t),l=n&&n!=t?dt(e,n):a,s=Hn(e,Math.min(a.left,l.left),Math.min(a.top,l.top)-r,Math.max(a.left,l.left),Math.max(a.bottom,l.bottom)+r),c=e.doc.scrollTop,u=e.doc.scrollLeft;if(null!=s.scrollTop&&(rn(e,s.scrollTop),Math.abs(e.doc.scrollTop-c)>1&&(o=!0)),null!=s.scrollLeft&&(on(e,s.scrollLeft),Math.abs(e.doc.scrollLeft-u)>1&&(o=!0)),!o)break}return a}function Dn(e,t,n,r,i){var o=Hn(e,t,n,r,i);null!=o.scrollTop&&rn(e,o.scrollTop),null!=o.scrollLeft&&on(e,o.scrollLeft)}function Hn(e,t,n,r,i){var o=e.display,a=yt(e.display);0>n&&(n=0);var l=e.curOp&&null!=e.curOp.scrollTop?e.curOp.scrollTop:o.scroller.scrollTop,s=Ve(e),c={};i-n>s&&(i=n+s);var u=e.doc.height+qe(o),f=a>n,h=i>u-a;if(l>n)c.scrollTop=f?0:n;else if(i>l+s){var d=Math.min(n,(h?u:i)-s);d!=l&&(c.scrollTop=d)}var p=e.curOp&&null!=e.curOp.scrollLeft?e.curOp.scrollLeft:o.scroller.scrollLeft,m=$e(e)-(e.options.fixedGutter?o.gutters.offsetWidth:0),g=r-t>m;return g&&(r=t+m),10>t?c.scrollLeft=0:p>t?c.scrollLeft=Math.max(0,t-(g?0:10)):r>m+p-3&&(c.scrollLeft=r+(g?0:10)-m),c}function Wn(e,t,n){null==t&&null==n||_n(e),null!=t&&(e.curOp.scrollLeft=(null==e.curOp.scrollLeft?e.doc.scrollLeft:e.curOp.scrollLeft)+t),null!=n&&(e.curOp.scrollTop=(null==e.curOp.scrollTop?e.doc.scrollTop:e.curOp.scrollTop)+n)}function Bn(e){_n(e);var t=e.getCursor(),n=t,r=t;e.options.lineWrapping||(n=t.ch?Bo(t.line,t.ch-1):t,r=Bo(t.line,t.ch+1)),e.curOp.scrollToPos={from:n,to:r,margin:e.options.cursorScrollMargin,isCursor:!0}}function _n(e){var t=e.curOp.scrollToPos;if(t){e.curOp.scrollToPos=null;var n=pt(e,t.from),r=pt(e,t.to),i=Hn(e,Math.min(n.left,r.left),Math.min(n.top,r.top)-t.margin,Math.max(n.right,r.right),Math.max(n.bottom,r.bottom)+t.margin);e.scrollTo(i.scrollLeft,i.scrollTop)}}function Fn(e,t,n,r){var i,o=e.doc;null==n&&(n="add"),"smart"==n&&(o.mode.indent?i=je(e,t):n="prev");var a=e.options.tabSize,l=Zr(o,t),s=Fa(l.text,null,a);l.stateAfter&&(l.stateAfter=null);var c,u=l.text.match(/^\s*/)[0];if(r||/\S/.test(l.text)){if("smart"==n&&(c=o.mode.indent(i,l.text.slice(u.length),l.text),c==Ha||c>150)){if(!r)return;n="prev"}}else c=0,n="not";"prev"==n?c=t>o.first?Fa(Zr(o,t-1).text,null,a):0:"add"==n?c=s+e.options.indentUnit:"subtract"==n?c=s-e.options.indentUnit:"number"==typeof n&&(c=s+n),c=Math.max(0,c);var f="",h=0;if(e.options.indentWithTabs)for(var d=Math.floor(c/a);d;--d)h+=a,f+="	";if(c>h&&(f+=Oi(c-h)),f!=u)return In(o,f,Bo(t,0),Bo(t,u.length),"+input"),l.stateAfter=null,!0;for(var d=0;d<o.sel.ranges.length;d++){var p=o.sel.ranges[d];if(p.head.line==t&&p.head.ch<u.length){var h=Bo(t,u.length);ke(o,d,new fe(h,h));break}}}function zn(e,t,n,r){var i=t,o=t;return"number"==typeof t?o=Zr(e,pe(e,t)):i=ti(t),null==i?null:(r(o,i)&&e.cm&&Ht(e.cm,i,n),o)}function jn(e,t){for(var n=e.doc.sel.ranges,r=[],i=0;i<n.length;i++){for(var o=t(n[i]);r.length&&_o(o.from,Ii(r).to)<=0;){var a=r.pop();if(_o(a.from,o.from)<0){o.from=a.from;break}}r.push(o)}At(e,function(){for(var t=r.length-1;t>=0;t--)In(e.doc,"",r[t].from,r[t].to,"+delete");Bn(e)})}function Un(e,t,n,r,i){function o(){var t=l+n;return t<e.first||t>=e.first+e.size?!1:(l=t,u=Zr(e,t))}function a(e){var t=(i?fo:ho)(u,s,n,!0);if(null==t){if(e||!o())return!1;s=i?(0>n?io:ro)(u):0>n?u.text.length:0}else s=t;return!0}var l=t.line,s=t.ch,c=n,u=Zr(e,l);if("char"==r)a();else if("column"==r)a(!0);else if("word"==r||"group"==r)for(var f=null,h="group"==r,d=e.cm&&e.cm.getHelper(t,"wordChars"),p=!0;!(0>n)||a(!p);p=!1){var m=u.text.charAt(s)||"\n",g=_i(m,d)?"w":h&&"\n"==m?"n":!h||/\s/.test(m)?null:"p";if(!h||p||g||(g="s"),f&&f!=g){0>n&&(n=1,a());break}if(g&&(f=g),n>0&&!a(!p))break}var v=Ie(e,Bo(l,s),t,c,!0);return _o(t,v)||(v.hitSide=!0),v}function qn(e,t,n,r){var i,o=e.doc,a=t.left;if("page"==r){var l=Math.min(e.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight);i=t.top+n*(l-(0>n?1.5:.5)*yt(e.display))}else"line"==r&&(i=n>0?t.bottom+3:t.top-3);for(;;){var s=gt(e,a,i);if(!s.outside)break;if(0>n?0>=i:i>=o.height){s.hitSide=!0;break}i+=5*n}return s}function Gn(t,n,r,i){e.defaults[t]=n,r&&(ta[t]=i?function(e,t,n){n!=na&&r(e,t,n)}:r)}function Yn(e){for(var t,n,r,i,o=e.split(/-(?!$)/),e=o[o.length-1],a=0;a<o.length-1;a++){var l=o[a];if(/^(cmd|meta|m)$/i.test(l))i=!0;else if(/^a(lt)?$/i.test(l))t=!0;else if(/^(c|ctrl|control)$/i.test(l))n=!0;else{
+if(!/^s(hift)$/i.test(l))throw new Error("Unrecognized modifier name: "+l);r=!0}}return t&&(e="Alt-"+e),n&&(e="Ctrl-"+e),i&&(e="Cmd-"+e),r&&(e="Shift-"+e),e}function $n(e){return"string"==typeof e?fa[e]:e}function Vn(e,t,n,r,i){if(r&&r.shared)return Kn(e,t,n,r,i);if(e.cm&&!e.cm.curOp)return Et(e.cm,Vn)(e,t,n,r,i);var o=new va(e,i),a=_o(t,n);if(r&&Wi(r,o,!1),a>0||0==a&&o.clearWhenEmpty!==!1)return o;if(o.replacedWith&&(o.collapsed=!0,o.widgetNode=ji("span",[o.replacedWith],"CodeMirror-widget"),r.handleMouseEvents||o.widgetNode.setAttribute("cm-ignore-events","true"),r.insertLeft&&(o.widgetNode.insertLeft=!0)),o.collapsed){if(vr(e,t.line,t,n,o)||t.line!=n.line&&vr(e,n.line,t,n,o))throw new Error("Inserting collapsed marker partially overlapping an existing one");Wo=!0}o.addToHistory&&ci(e,{from:t,to:n,origin:"markText"},e.sel,NaN);var l,s=t.line,c=e.cm;if(e.iter(s,n.line+1,function(e){c&&o.collapsed&&!c.options.lineWrapping&&yr(e)==c.display.maxLine&&(l=!0),o.collapsed&&s!=t.line&&ei(e,0),nr(e,new Qn(o,s==t.line?t.ch:null,s==n.line?n.ch:null)),++s}),o.collapsed&&e.iter(t.line,n.line+1,function(t){kr(e,t)&&ei(t,0)}),o.clearOnEnter&&Ea(o,"beforeCursorEnter",function(){o.clear()}),o.readOnly&&(Ho=!0,(e.history.done.length||e.history.undone.length)&&e.clearHistory()),o.collapsed&&(o.id=++ga,o.atomic=!0),c){if(l&&(c.curOp.updateMaxLine=!0),o.collapsed)Dt(c,t.line,n.line+1);else if(o.className||o.title||o.startStyle||o.endStyle||o.css)for(var u=t.line;u<=n.line;u++)Ht(c,u,"text");o.atomic&&Ae(c.doc),Ci(c,"markerAdded",c,o)}return o}function Kn(e,t,n,r,i){r=Wi(r),r.shared=!1;var o=[Vn(e,t,n,r,i)],a=o[0],l=r.widgetNode;return Kr(e,function(e){l&&(r.widgetNode=l.cloneNode(!0)),o.push(Vn(e,me(e,t),me(e,n),r,i));for(var s=0;s<e.linked.length;++s)if(e.linked[s].isParent)return;a=Ii(o)}),new ya(o,a)}function Xn(e){return e.findMarks(Bo(e.first,0),e.clipPos(Bo(e.lastLine())),function(e){return e.parent})}function Zn(e,t){for(var n=0;n<t.length;n++){var r=t[n],i=r.find(),o=e.clipPos(i.from),a=e.clipPos(i.to);if(_o(o,a)){var l=Vn(e,o,a,r.primary,r.primary.type);r.markers.push(l),l.parent=r}}}function Jn(e){for(var t=0;t<e.length;t++){var n=e[t],r=[n.primary.doc];Kr(n.primary.doc,function(e){r.push(e)});for(var i=0;i<n.markers.length;i++){var o=n.markers[i];-1==Pi(r,o.doc)&&(o.parent=null,n.markers.splice(i--,1))}}}function Qn(e,t,n){this.marker=e,this.from=t,this.to=n}function er(e,t){if(e)for(var n=0;n<e.length;++n){var r=e[n];if(r.marker==t)return r}}function tr(e,t){for(var n,r=0;r<e.length;++r)e[r]!=t&&(n||(n=[])).push(e[r]);return n}function nr(e,t){e.markedSpans=e.markedSpans?e.markedSpans.concat([t]):[t],t.marker.attachLine(e)}function rr(e,t,n){if(e)for(var r,i=0;i<e.length;++i){var o=e[i],a=o.marker,l=null==o.from||(a.inclusiveLeft?o.from<=t:o.from<t);if(l||o.from==t&&"bookmark"==a.type&&(!n||!o.marker.insertLeft)){var s=null==o.to||(a.inclusiveRight?o.to>=t:o.to>t);(r||(r=[])).push(new Qn(a,o.from,s?null:o.to))}}return r}function ir(e,t,n){if(e)for(var r,i=0;i<e.length;++i){var o=e[i],a=o.marker,l=null==o.to||(a.inclusiveRight?o.to>=t:o.to>t);if(l||o.from==t&&"bookmark"==a.type&&(!n||o.marker.insertLeft)){var s=null==o.from||(a.inclusiveLeft?o.from<=t:o.from<t);(r||(r=[])).push(new Qn(a,s?null:o.from-t,null==o.to?null:o.to-t))}}return r}function or(e,t){if(t.full)return null;var n=ve(e,t.from.line)&&Zr(e,t.from.line).markedSpans,r=ve(e,t.to.line)&&Zr(e,t.to.line).markedSpans;if(!n&&!r)return null;var i=t.from.ch,o=t.to.ch,a=0==_o(t.from,t.to),l=rr(n,i,a),s=ir(r,o,a),c=1==t.text.length,u=Ii(t.text).length+(c?i:0);if(l)for(var f=0;f<l.length;++f){var h=l[f];if(null==h.to){var d=er(s,h.marker);d?c&&(h.to=null==d.to?null:d.to+u):h.to=i}}if(s)for(var f=0;f<s.length;++f){var h=s[f];if(null!=h.to&&(h.to+=u),null==h.from){var d=er(l,h.marker);d||(h.from=u,c&&(l||(l=[])).push(h))}else h.from+=u,c&&(l||(l=[])).push(h)}l&&(l=ar(l)),s&&s!=l&&(s=ar(s));var p=[l];if(!c){var m,g=t.text.length-2;if(g>0&&l)for(var f=0;f<l.length;++f)null==l[f].to&&(m||(m=[])).push(new Qn(l[f].marker,null,null));for(var f=0;g>f;++f)p.push(m);p.push(s)}return p}function ar(e){for(var t=0;t<e.length;++t){var n=e[t];null!=n.from&&n.from==n.to&&n.marker.clearWhenEmpty!==!1&&e.splice(t--,1)}return e.length?e:null}function lr(e,t){var n=mi(e,t),r=or(e,t);if(!n)return r;if(!r)return n;for(var i=0;i<n.length;++i){var o=n[i],a=r[i];if(o&&a)e:for(var l=0;l<a.length;++l){for(var s=a[l],c=0;c<o.length;++c)if(o[c].marker==s.marker)continue e;o.push(s)}else a&&(n[i]=a)}return n}function sr(e,t,n){var r=null;if(e.iter(t.line,n.line+1,function(e){if(e.markedSpans)for(var t=0;t<e.markedSpans.length;++t){var n=e.markedSpans[t].marker;!n.readOnly||r&&-1!=Pi(r,n)||(r||(r=[])).push(n)}}),!r)return null;for(var i=[{from:t,to:n}],o=0;o<r.length;++o)for(var a=r[o],l=a.find(0),s=0;s<i.length;++s){var c=i[s];if(!(_o(c.to,l.from)<0||_o(c.from,l.to)>0)){var u=[s,1],f=_o(c.from,l.from),h=_o(c.to,l.to);(0>f||!a.inclusiveLeft&&!f)&&u.push({from:c.from,to:l.from}),(h>0||!a.inclusiveRight&&!h)&&u.push({from:l.to,to:c.to}),i.splice.apply(i,u),s+=u.length-1}}return i}function cr(e){var t=e.markedSpans;if(t){for(var n=0;n<t.length;++n)t[n].marker.detachLine(e);e.markedSpans=null}}function ur(e,t){if(t){for(var n=0;n<t.length;++n)t[n].marker.attachLine(e);e.markedSpans=t}}function fr(e){return e.inclusiveLeft?-1:0}function hr(e){return e.inclusiveRight?1:0}function dr(e,t){var n=e.lines.length-t.lines.length;if(0!=n)return n;var r=e.find(),i=t.find(),o=_o(r.from,i.from)||fr(e)-fr(t);if(o)return-o;var a=_o(r.to,i.to)||hr(e)-hr(t);return a?a:t.id-e.id}function pr(e,t){var n,r=Wo&&e.markedSpans;if(r)for(var i,o=0;o<r.length;++o)i=r[o],i.marker.collapsed&&null==(t?i.from:i.to)&&(!n||dr(n,i.marker)<0)&&(n=i.marker);return n}function mr(e){return pr(e,!0)}function gr(e){return pr(e,!1)}function vr(e,t,n,r,i){var o=Zr(e,t),a=Wo&&o.markedSpans;if(a)for(var l=0;l<a.length;++l){var s=a[l];if(s.marker.collapsed){var c=s.marker.find(0),u=_o(c.from,n)||fr(s.marker)-fr(i),f=_o(c.to,r)||hr(s.marker)-hr(i);if(!(u>=0&&0>=f||0>=u&&f>=0)&&(0>=u&&(s.marker.inclusiveRight&&i.inclusiveLeft?_o(c.to,n)>=0:_o(c.to,n)>0)||u>=0&&(s.marker.inclusiveRight&&i.inclusiveLeft?_o(c.from,r)<=0:_o(c.from,r)<0)))return!0}}}function yr(e){for(var t;t=mr(e);)e=t.find(-1,!0).line;return e}function xr(e){for(var t,n;t=gr(e);)e=t.find(1,!0).line,(n||(n=[])).push(e);return n}function br(e,t){var n=Zr(e,t),r=yr(n);return n==r?t:ti(r)}function wr(e,t){if(t>e.lastLine())return t;var n,r=Zr(e,t);if(!kr(e,r))return t;for(;n=gr(r);)r=n.find(1,!0).line;return ti(r)+1}function kr(e,t){var n=Wo&&t.markedSpans;if(n)for(var r,i=0;i<n.length;++i)if(r=n[i],r.marker.collapsed){if(null==r.from)return!0;if(!r.marker.widgetNode&&0==r.from&&r.marker.inclusiveLeft&&Sr(e,t,r))return!0}}function Sr(e,t,n){if(null==n.to){var r=n.marker.find(1,!0);return Sr(e,r.line,er(r.line.markedSpans,n.marker))}if(n.marker.inclusiveRight&&n.to==t.text.length)return!0;for(var i,o=0;o<t.markedSpans.length;++o)if(i=t.markedSpans[o],i.marker.collapsed&&!i.marker.widgetNode&&i.from==n.to&&(null==i.to||i.to!=n.from)&&(i.marker.inclusiveLeft||n.marker.inclusiveRight)&&Sr(e,t,i))return!0}function Cr(e,t,n){ri(t)<(e.curOp&&e.curOp.scrollTop||e.doc.scrollTop)&&Wn(e,null,n)}function Lr(e){if(null!=e.height)return e.height;var t=e.doc.cm;if(!t)return 0;if(!Va(document.body,e.node)){var n="position: relative;";e.coverGutter&&(n+="margin-left: -"+t.display.gutters.offsetWidth+"px;"),e.noHScroll&&(n+="width: "+t.display.wrapper.clientWidth+"px;"),qi(t.display.measure,ji("div",[e.node],null,n))}return e.height=e.node.parentNode.offsetHeight}function Tr(e,t,n,r){var i=new xa(e,n,r),o=e.cm;return o&&i.noHScroll&&(o.display.alignWidgets=!0),zn(e,t,"widget",function(t){var n=t.widgets||(t.widgets=[]);if(null==i.insertAt?n.push(i):n.splice(Math.min(n.length-1,Math.max(0,i.insertAt)),0,i),i.line=t,o&&!kr(e,t)){var r=ri(t)<e.scrollTop;ei(t,t.height+Lr(i)),r&&Wn(o,null,i.height),o.curOp.forceUpdate=!0}return!0}),i}function Mr(e,t,n,r){e.text=t,e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null),null!=e.order&&(e.order=null),cr(e),ur(e,n);var i=r?r(e):1;i!=e.height&&ei(e,i)}function Nr(e){e.parent=null,cr(e)}function Ar(e,t){if(e)for(;;){var n=e.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!n)break;e=e.slice(0,n.index)+e.slice(n.index+n[0].length);var r=n[1]?"bgClass":"textClass";null==t[r]?t[r]=n[2]:new RegExp("(?:^|s)"+n[2]+"(?:$|s)").test(t[r])||(t[r]+=" "+n[2])}return e}function Er(t,n){if(t.blankLine)return t.blankLine(n);if(t.innerMode){var r=e.innerMode(t,n);return r.mode.blankLine?r.mode.blankLine(r.state):void 0}}function Or(t,n,r,i){for(var o=0;10>o;o++){i&&(i[0]=e.innerMode(t,r).mode);var a=t.token(n,r);if(n.pos>n.start)return a}throw new Error("Mode "+t.name+" failed to advance stream.")}function Ir(e,t,n,r){function i(e){return{start:f.start,end:f.pos,string:f.current(),type:o||null,state:e?sa(a.mode,u):u}}var o,a=e.doc,l=a.mode;t=me(a,t);var s,c=Zr(a,t.line),u=je(e,t.line,n),f=new ma(c.text,e.options.tabSize);for(r&&(s=[]);(r||f.pos<t.ch)&&!f.eol();)f.start=f.pos,o=Or(l,f,u),r&&s.push(i(!0));return r?s:i()}function Pr(e,t,n,r,i,o,a){var l=n.flattenSpans;null==l&&(l=e.options.flattenSpans);var s,c=0,u=null,f=new ma(t,e.options.tabSize),h=e.options.addModeClass&&[null];for(""==t&&Ar(Er(n,r),o);!f.eol();){if(f.pos>e.options.maxHighlightLength?(l=!1,a&&Hr(e,t,r,f.pos),f.pos=t.length,s=null):s=Ar(Or(n,f,r,h),o),h){var d=h[0].name;d&&(s="m-"+(s?d+" "+s:d))}if(!l||u!=s){for(;c<f.start;)c=Math.min(f.start,c+5e4),i(c,u);u=s}f.start=f.pos}for(;c<f.pos;){var p=Math.min(f.pos,c+5e4);i(p,u),c=p}}function Rr(e,t,n,r){var i=[e.state.modeGen],o={};Pr(e,t.text,e.doc.mode,n,function(e,t){i.push(e,t)},o,r);for(var a=0;a<e.state.overlays.length;++a){var l=e.state.overlays[a],s=1,c=0;Pr(e,t.text,l.mode,!0,function(e,t){for(var n=s;e>c;){var r=i[s];r>e&&i.splice(s,1,e,i[s+1],r),s+=2,c=Math.min(e,r)}if(t)if(l.opaque)i.splice(n,s-n,e,"cm-overlay "+t),s=n+2;else for(;s>n;n+=2){var o=i[n+1];i[n+1]=(o?o+" ":"")+"cm-overlay "+t}},o)}return{styles:i,classes:o.bgClass||o.textClass?o:null}}function Dr(e,t,n){if(!t.styles||t.styles[0]!=e.state.modeGen){var r=je(e,ti(t)),i=Rr(e,t,t.text.length>e.options.maxHighlightLength?sa(e.doc.mode,r):r);t.stateAfter=r,t.styles=i.styles,i.classes?t.styleClasses=i.classes:t.styleClasses&&(t.styleClasses=null),n===e.doc.frontier&&e.doc.frontier++}return t.styles}function Hr(e,t,n,r){var i=e.doc.mode,o=new ma(t,e.options.tabSize);for(o.start=o.pos=r||0,""==t&&Er(i,n);!o.eol();)Or(i,o,n),o.start=o.pos}function Wr(e,t){if(!e||/^\s*$/.test(e))return null;var n=t.addModeClass?ka:wa;return n[e]||(n[e]=e.replace(/\S+/g,"cm-$&"))}function Br(e,t){var n=ji("span",null,null,wo?"padding-right: .1px":null),r={pre:ji("pre",[n],"CodeMirror-line"),content:n,col:0,pos:0,cm:e,splitSpaces:(xo||wo)&&e.getOption("lineWrapping")};t.measure={};for(var i=0;i<=(t.rest?t.rest.length:0);i++){var o,a=i?t.rest[i-1]:t.line;r.pos=0,r.addToken=Fr,Ji(e.display.measure)&&(o=ii(a))&&(r.addToken=jr(r.addToken,o)),r.map=[];var l=t!=e.display.externalMeasured&&ti(a);qr(a,r,Dr(e,a,l)),a.styleClasses&&(a.styleClasses.bgClass&&(r.bgClass=$i(a.styleClasses.bgClass,r.bgClass||"")),a.styleClasses.textClass&&(r.textClass=$i(a.styleClasses.textClass,r.textClass||""))),0==r.map.length&&r.map.push(0,0,r.content.appendChild(Zi(e.display.measure))),0==i?(t.measure.map=r.map,t.measure.cache={}):((t.measure.maps||(t.measure.maps=[])).push(r.map),(t.measure.caches||(t.measure.caches=[])).push({}))}if(wo){var s=r.content.lastChild;(/\bcm-tab\b/.test(s.className)||s.querySelector&&s.querySelector(".cm-tab"))&&(r.content.className="cm-tab-wrap-hack")}return Pa(e,"renderLine",e,t.line,r.pre),r.pre.className&&(r.textClass=$i(r.pre.className,r.textClass||"")),r}function _r(e){var t=ji("span","•","cm-invalidchar");return t.title="\\u"+e.charCodeAt(0).toString(16),t.setAttribute("aria-label",t.title),t}function Fr(e,t,n,r,i,o,a){if(t){var l=e.splitSpaces?t.replace(/ {3,}/g,zr):t,s=e.cm.state.specialChars,c=!1;if(s.test(t))for(var u=document.createDocumentFragment(),f=0;;){s.lastIndex=f;var h=s.exec(t),d=h?h.index-f:t.length-f;if(d){var p=document.createTextNode(l.slice(f,f+d));xo&&9>bo?u.appendChild(ji("span",[p])):u.appendChild(p),e.map.push(e.pos,e.pos+d,p),e.col+=d,e.pos+=d}if(!h)break;if(f+=d+1,"	"==h[0]){var m=e.cm.options.tabSize,g=m-e.col%m,p=u.appendChild(ji("span",Oi(g),"cm-tab"));p.setAttribute("role","presentation"),p.setAttribute("cm-text","	"),e.col+=g}else if("\r"==h[0]||"\n"==h[0]){var p=u.appendChild(ji("span","\r"==h[0]?"␍":"␤","cm-invalidchar"));p.setAttribute("cm-text",h[0]),e.col+=1}else{var p=e.cm.options.specialCharPlaceholder(h[0]);p.setAttribute("cm-text",h[0]),xo&&9>bo?u.appendChild(ji("span",[p])):u.appendChild(p),e.col+=1}e.map.push(e.pos,e.pos+1,p),e.pos++}else{e.col+=t.length;var u=document.createTextNode(l);e.map.push(e.pos,e.pos+t.length,u),xo&&9>bo&&(c=!0),e.pos+=t.length}if(n||r||i||c||a){var v=n||"";r&&(v+=r),i&&(v+=i);var y=ji("span",[u],v,a);return o&&(y.title=o),e.content.appendChild(y)}e.content.appendChild(u)}}function zr(e){for(var t=" ",n=0;n<e.length-2;++n)t+=n%2?" ":" ";return t+=" "}function jr(e,t){return function(n,r,i,o,a,l,s){i=i?i+" cm-force-border":"cm-force-border";for(var c=n.pos,u=c+r.length;;){for(var f=0;f<t.length;f++){var h=t[f];if(h.to>c&&h.from<=c)break}if(h.to>=u)return e(n,r,i,o,a,l,s);e(n,r.slice(0,h.to-c),i,o,null,l,s),o=null,r=r.slice(h.to-c),c=h.to}}}function Ur(e,t,n,r){var i=!r&&n.widgetNode;i&&e.map.push(e.pos,e.pos+t,i),!r&&e.cm.display.input.needsContentAttribute&&(i||(i=e.content.appendChild(document.createElement("span"))),i.setAttribute("cm-marker",n.id)),i&&(e.cm.display.input.setUneditable(i),e.content.appendChild(i)),e.pos+=t}function qr(e,t,n){var r=e.markedSpans,i=e.text,o=0;if(r)for(var a,l,s,c,u,f,h,d=i.length,p=0,m=1,g="",v=0;;){if(v==p){s=c=u=f=l="",h=null,v=1/0;for(var y,x=[],b=0;b<r.length;++b){var w=r[b],k=w.marker;"bookmark"==k.type&&w.from==p&&k.widgetNode?x.push(k):w.from<=p&&(null==w.to||w.to>p||k.collapsed&&w.to==p&&w.from==p)?(null!=w.to&&w.to!=p&&v>w.to&&(v=w.to,c=""),k.className&&(s+=" "+k.className),k.css&&(l=(l?l+";":"")+k.css),k.startStyle&&w.from==p&&(u+=" "+k.startStyle),k.endStyle&&w.to==v&&(y||(y=[])).push(k.endStyle,w.to),k.title&&!f&&(f=k.title),k.collapsed&&(!h||dr(h.marker,k)<0)&&(h=w)):w.from>p&&v>w.from&&(v=w.from)}if(y)for(var b=0;b<y.length;b+=2)y[b+1]==v&&(c+=" "+y[b]);if(!h||h.from==p)for(var b=0;b<x.length;++b)Ur(t,0,x[b]);if(h&&(h.from||0)==p){if(Ur(t,(null==h.to?d+1:h.to)-p,h.marker,null==h.from),null==h.to)return;h.to==p&&(h=!1)}}if(p>=d)break;for(var S=Math.min(d,v);;){if(g){var C=p+g.length;if(!h){var L=C>S?g.slice(0,S-p):g;t.addToken(t,L,a?a+s:s,u,p+L.length==v?c:"",f,l)}if(C>=S){g=g.slice(S-p),p=S;break}p=C,u=""}g=i.slice(o,o=n[m++]),a=Wr(n[m++],t.cm.options)}}else for(var m=1;m<n.length;m+=2)t.addToken(t,i.slice(o,o=n[m]),Wr(n[m+1],t.cm.options))}function Gr(e,t){return 0==t.from.ch&&0==t.to.ch&&""==Ii(t.text)&&(!e.cm||e.cm.options.wholeLineUpdateBefore)}function Yr(e,t,n,r){function i(e){return n?n[e]:null}function o(e,n,i){Mr(e,n,i,r),Ci(e,"change",e,t)}function a(e,t){for(var n=e,o=[];t>n;++n)o.push(new ba(c[n],i(n),r));return o}var l=t.from,s=t.to,c=t.text,u=Zr(e,l.line),f=Zr(e,s.line),h=Ii(c),d=i(c.length-1),p=s.line-l.line;if(t.full)e.insert(0,a(0,c.length)),e.remove(c.length,e.size-c.length);else if(Gr(e,t)){var m=a(0,c.length-1);o(f,f.text,d),p&&e.remove(l.line,p),m.length&&e.insert(l.line,m)}else if(u==f)if(1==c.length)o(u,u.text.slice(0,l.ch)+h+u.text.slice(s.ch),d);else{var m=a(1,c.length-1);m.push(new ba(h+u.text.slice(s.ch),d,r)),o(u,u.text.slice(0,l.ch)+c[0],i(0)),e.insert(l.line+1,m)}else if(1==c.length)o(u,u.text.slice(0,l.ch)+c[0]+f.text.slice(s.ch),i(0)),e.remove(l.line+1,p);else{o(u,u.text.slice(0,l.ch)+c[0],i(0)),o(f,h+f.text.slice(s.ch),d);var m=a(1,c.length-1);p>1&&e.remove(l.line+1,p-1),e.insert(l.line+1,m)}Ci(e,"change",e,t)}function $r(e){this.lines=e,this.parent=null;for(var t=0,n=0;t<e.length;++t)e[t].parent=this,n+=e[t].height;this.height=n}function Vr(e){this.children=e;for(var t=0,n=0,r=0;r<e.length;++r){var i=e[r];t+=i.chunkSize(),n+=i.height,i.parent=this}this.size=t,this.height=n,this.parent=null}function Kr(e,t,n){function r(e,i,o){if(e.linked)for(var a=0;a<e.linked.length;++a){var l=e.linked[a];if(l.doc!=i){var s=o&&l.sharedHist;n&&!s||(t(l.doc,s),r(l.doc,e,s))}}}r(e,null,!0)}function Xr(e,t){if(t.cm)throw new Error("This document is already in use.");e.doc=t,t.cm=e,a(e),n(e),e.options.lineWrapping||h(e),e.options.mode=t.modeOption,Dt(e)}function Zr(e,t){if(t-=e.first,0>t||t>=e.size)throw new Error("There is no line "+(t+e.first)+" in the document.");for(var n=e;!n.lines;)for(var r=0;;++r){var i=n.children[r],o=i.chunkSize();if(o>t){n=i;break}t-=o}return n.lines[t]}function Jr(e,t,n){var r=[],i=t.line;return e.iter(t.line,n.line+1,function(e){var o=e.text;i==n.line&&(o=o.slice(0,n.ch)),i==t.line&&(o=o.slice(t.ch)),r.push(o),++i}),r}function Qr(e,t,n){var r=[];return e.iter(t,n,function(e){r.push(e.text)}),r}function ei(e,t){var n=t-e.height;if(n)for(var r=e;r;r=r.parent)r.height+=n}function ti(e){if(null==e.parent)return null;for(var t=e.parent,n=Pi(t.lines,e),r=t.parent;r;t=r,r=r.parent)for(var i=0;r.children[i]!=t;++i)n+=r.children[i].chunkSize();return n+t.first}function ni(e,t){var n=e.first;e:do{for(var r=0;r<e.children.length;++r){var i=e.children[r],o=i.height;if(o>t){e=i;continue e}t-=o,n+=i.chunkSize()}return n}while(!e.lines);for(var r=0;r<e.lines.length;++r){var a=e.lines[r],l=a.height;if(l>t)break;t-=l}return n+r}function ri(e){e=yr(e);for(var t=0,n=e.parent,r=0;r<n.lines.length;++r){var i=n.lines[r];if(i==e)break;t+=i.height}for(var o=n.parent;o;n=o,o=n.parent)for(var r=0;r<o.children.length;++r){var a=o.children[r];if(a==n)break;t+=a.height}return t}function ii(e){var t=e.order;return null==t&&(t=e.order=ll(e.text)),t}function oi(e){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=e||1}function ai(e,t){var n={from:$(t.from),to:Qo(t),text:Jr(e,t.from,t.to)};return di(e,n,t.from.line,t.to.line+1),Kr(e,function(e){di(e,n,t.from.line,t.to.line+1)},!0),n}function li(e){for(;e.length;){var t=Ii(e);if(!t.ranges)break;e.pop()}}function si(e,t){return t?(li(e.done),Ii(e.done)):e.done.length&&!Ii(e.done).ranges?Ii(e.done):e.done.length>1&&!e.done[e.done.length-2].ranges?(e.done.pop(),Ii(e.done)):void 0}function ci(e,t,n,r){var i=e.history;i.undone.length=0;var o,a=+new Date;if((i.lastOp==r||i.lastOrigin==t.origin&&t.origin&&("+"==t.origin.charAt(0)&&e.cm&&i.lastModTime>a-e.cm.options.historyEventDelay||"*"==t.origin.charAt(0)))&&(o=si(i,i.lastOp==r))){var l=Ii(o.changes);0==_o(t.from,t.to)&&0==_o(t.from,l.to)?l.to=Qo(t):o.changes.push(ai(e,t))}else{var s=Ii(i.done);for(s&&s.ranges||hi(e.sel,i.done),o={changes:[ai(e,t)],generation:i.generation},i.done.push(o);i.done.length>i.undoDepth;)i.done.shift(),i.done[0].ranges||i.done.shift()}i.done.push(n),i.generation=++i.maxGeneration,i.lastModTime=i.lastSelTime=a,i.lastOp=i.lastSelOp=r,i.lastOrigin=i.lastSelOrigin=t.origin,l||Pa(e,"historyAdded")}function ui(e,t,n,r){var i=t.charAt(0);return"*"==i||"+"==i&&n.ranges.length==r.ranges.length&&n.somethingSelected()==r.somethingSelected()&&new Date-e.history.lastSelTime<=(e.cm?e.cm.options.historyEventDelay:500)}function fi(e,t,n,r){var i=e.history,o=r&&r.origin;n==i.lastSelOp||o&&i.lastSelOrigin==o&&(i.lastModTime==i.lastSelTime&&i.lastOrigin==o||ui(e,o,Ii(i.done),t))?i.done[i.done.length-1]=t:hi(t,i.done),i.lastSelTime=+new Date,i.lastSelOrigin=o,i.lastSelOp=n,r&&r.clearRedo!==!1&&li(i.undone)}function hi(e,t){var n=Ii(t);n&&n.ranges&&n.equals(e)||t.push(e)}function di(e,t,n,r){var i=t["spans_"+e.id],o=0;e.iter(Math.max(e.first,n),Math.min(e.first+e.size,r),function(n){n.markedSpans&&((i||(i=t["spans_"+e.id]={}))[o]=n.markedSpans),++o})}function pi(e){if(!e)return null;for(var t,n=0;n<e.length;++n)e[n].marker.explicitlyCleared?t||(t=e.slice(0,n)):t&&t.push(e[n]);return t?t.length?t:null:e}function mi(e,t){var n=t["spans_"+e.id];if(!n)return null;for(var r=0,i=[];r<t.text.length;++r)i.push(pi(n[r]));return i}function gi(e,t,n){for(var r=0,i=[];r<e.length;++r){var o=e[r];if(o.ranges)i.push(n?ue.prototype.deepCopy.call(o):o);else{var a=o.changes,l=[];i.push({changes:l});for(var s=0;s<a.length;++s){var c,u=a[s];if(l.push({from:u.from,to:u.to,text:u.text}),t)for(var f in u)(c=f.match(/^spans_(\d+)$/))&&Pi(t,Number(c[1]))>-1&&(Ii(l)[f]=u[f],delete u[f])}}}return i}function vi(e,t,n,r){n<e.line?e.line+=r:t<e.line&&(e.line=t,e.ch=0)}function yi(e,t,n,r){for(var i=0;i<e.length;++i){var o=e[i],a=!0;if(o.ranges){o.copied||(o=e[i]=o.deepCopy(),o.copied=!0);for(var l=0;l<o.ranges.length;l++)vi(o.ranges[l].anchor,t,n,r),vi(o.ranges[l].head,t,n,r)}else{for(var l=0;l<o.changes.length;++l){var s=o.changes[l];if(n<s.from.line)s.from=Bo(s.from.line+r,s.from.ch),s.to=Bo(s.to.line+r,s.to.ch);else if(t<=s.to.line){a=!1;break}}a||(e.splice(0,i+1),i=0)}}}function xi(e,t){var n=t.from.line,r=t.to.line,i=t.text.length-(r-n)-1;yi(e.done,n,r,i),yi(e.undone,n,r,i)}function bi(e){return null!=e.defaultPrevented?e.defaultPrevented:0==e.returnValue}function wi(e){return e.target||e.srcElement}function ki(e){var t=e.which;return null==t&&(1&e.button?t=1:2&e.button?t=3:4&e.button&&(t=2)),Eo&&e.ctrlKey&&1==t&&(t=3),t}function Si(e,t,n){var r=e._handlers&&e._handlers[t];return n?r&&r.length>0?r.slice():Oa:r||Oa}function Ci(e,t){function n(e){return function(){e.apply(null,o)}}var r=Si(e,t,!1);if(r.length){var i,o=Array.prototype.slice.call(arguments,2);Go?i=Go.delayedCallbacks:Ra?i=Ra:(i=Ra=[],setTimeout(Li,0));for(var a=0;a<r.length;++a)i.push(n(r[a]))}}function Li(){var e=Ra;Ra=null;for(var t=0;t<e.length;++t)e[t]()}function Ti(e,t,n){return"string"==typeof t&&(t={type:t,preventDefault:function(){this.defaultPrevented=!0}}),Pa(e,n||t.type,e,t),bi(t)||t.codemirrorIgnore}function Mi(e){var t=e._handlers&&e._handlers.cursorActivity;if(t)for(var n=e.curOp.cursorActivityHandlers||(e.curOp.cursorActivityHandlers=[]),r=0;r<t.length;++r)-1==Pi(n,t[r])&&n.push(t[r])}function Ni(e,t){return Si(e,t).length>0}function Ai(e){e.prototype.on=function(e,t){Ea(this,e,t)},e.prototype.off=function(e,t){Ia(this,e,t)}}function Ei(){this.id=null}function Oi(e){for(;ja.length<=e;)ja.push(Ii(ja)+" ");return ja[e]}function Ii(e){return e[e.length-1]}function Pi(e,t){for(var n=0;n<e.length;++n)if(e[n]==t)return n;return-1}function Ri(e,t){for(var n=[],r=0;r<e.length;r++)n[r]=t(e[r],r);return n}function Di(){}function Hi(e,t){var n;return Object.create?n=Object.create(e):(Di.prototype=e,n=new Di),t&&Wi(t,n),n}function Wi(e,t,n){t||(t={});for(var r in e)!e.hasOwnProperty(r)||n===!1&&t.hasOwnProperty(r)||(t[r]=e[r]);return t}function Bi(e){var t=Array.prototype.slice.call(arguments,1);return function(){return e.apply(null,t)}}function _i(e,t){return t?t.source.indexOf("\\w")>-1&&Ya(e)?!0:t.test(e):Ya(e)}function Fi(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t])return!1;return!0}function zi(e){return e.charCodeAt(0)>=768&&$a.test(e)}function ji(e,t,n,r){var i=document.createElement(e);if(n&&(i.className=n),r&&(i.style.cssText=r),"string"==typeof t)i.appendChild(document.createTextNode(t));else if(t)for(var o=0;o<t.length;++o)i.appendChild(t[o]);return i}function Ui(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild);return e}function qi(e,t){return Ui(e).appendChild(t)}function Gi(){for(var e=document.activeElement;e&&e.root&&e.root.activeElement;)e=e.root.activeElement;return e}function Yi(e){return new RegExp("(^|\\s)"+e+"(?:$|\\s)\\s*")}function $i(e,t){for(var n=e.split(" "),r=0;r<n.length;r++)n[r]&&!Yi(n[r]).test(t)&&(t+=" "+n[r]);return t}function Vi(e){if(document.body.getElementsByClassName)for(var t=document.body.getElementsByClassName("CodeMirror"),n=0;n<t.length;n++){var r=t[n].CodeMirror;r&&e(r)}}function Ki(){Qa||(Xi(),Qa=!0)}function Xi(){var e;Ea(window,"resize",function(){null==e&&(e=setTimeout(function(){e=null,Vi(qt)},100))}),Ea(window,"blur",function(){Vi(yn)})}function Zi(e){if(null==Ka){var t=ji("span","​");qi(e,ji("span",[t,document.createTextNode("x")])),0!=e.firstChild.offsetHeight&&(Ka=t.offsetWidth<=1&&t.offsetHeight>2&&!(xo&&8>bo))}var n=Ka?ji("span","​"):ji("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return n.setAttribute("cm-text",""),n}function Ji(e){if(null!=Xa)return Xa;var t=qi(e,document.createTextNode("AخA")),n=qa(t,0,1).getBoundingClientRect();if(!n||n.left==n.right)return!1;var r=qa(t,1,2).getBoundingClientRect();return Xa=r.right-n.right<3}function Qi(e){if(null!=il)return il;var t=qi(e,ji("span","x")),n=t.getBoundingClientRect(),r=qa(t,0,1).getBoundingClientRect();return il=Math.abs(n.left-r.left)>1}function eo(e,t,n,r){if(!e)return r(t,n,"ltr");for(var i=!1,o=0;o<e.length;++o){var a=e[o];(a.from<n&&a.to>t||t==n&&a.to==t)&&(r(Math.max(a.from,t),Math.min(a.to,n),1==a.level?"rtl":"ltr"),i=!0)}i||r(t,n,"ltr")}function to(e){return e.level%2?e.to:e.from}function no(e){return e.level%2?e.from:e.to}function ro(e){var t=ii(e);return t?to(t[0]):0}function io(e){var t=ii(e);return t?no(Ii(t)):e.text.length}function oo(e,t){var n=Zr(e.doc,t),r=yr(n);r!=n&&(t=ti(r));var i=ii(r),o=i?i[0].level%2?io(r):ro(r):0;return Bo(t,o)}function ao(e,t){for(var n,r=Zr(e.doc,t);n=gr(r);)r=n.find(1,!0).line,t=null;var i=ii(r),o=i?i[0].level%2?ro(r):io(r):r.text.length;return Bo(null==t?ti(r):t,o)}function lo(e,t){var n=oo(e,t.line),r=Zr(e.doc,n.line),i=ii(r);if(!i||0==i[0].level){var o=Math.max(0,r.text.search(/\S/)),a=t.line==n.line&&t.ch<=o&&t.ch;return Bo(n.line,a?0:o)}return n}function so(e,t,n){var r=e[0].level;return t==r?!0:n==r?!1:n>t}function co(e,t){al=null;for(var n,r=0;r<e.length;++r){var i=e[r];if(i.from<t&&i.to>t)return r;if(i.from==t||i.to==t){if(null!=n)return so(e,i.level,e[n].level)?(i.from!=i.to&&(al=n),r):(i.from!=i.to&&(al=r),n);n=r}}return n}function uo(e,t,n,r){if(!r)return t+n;do t+=n;while(t>0&&zi(e.text.charAt(t)));return t}function fo(e,t,n,r){var i=ii(e);if(!i)return ho(e,t,n,r);for(var o=co(i,t),a=i[o],l=uo(e,t,a.level%2?-n:n,r);;){if(l>a.from&&l<a.to)return l;if(l==a.from||l==a.to)return co(i,l)==o?l:(a=i[o+=n],n>0==a.level%2?a.to:a.from);if(a=i[o+=n],!a)return null;l=n>0==a.level%2?uo(e,a.to,-1,r):uo(e,a.from,1,r)}}function ho(e,t,n,r){var i=t+n;if(r)for(;i>0&&zi(e.text.charAt(i));)i+=n;return 0>i||i>e.text.length?null:i}var po=navigator.userAgent,mo=navigator.platform,go=/gecko\/\d/i.test(po),vo=/MSIE \d/.test(po),yo=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(po),xo=vo||yo,bo=xo&&(vo?document.documentMode||6:yo[1]),wo=/WebKit\//.test(po),ko=wo&&/Qt\/\d+\.\d+/.test(po),So=/Chrome\//.test(po),Co=/Opera\//.test(po),Lo=/Apple Computer/.test(navigator.vendor),To=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(po),Mo=/PhantomJS/.test(po),No=/AppleWebKit/.test(po)&&/Mobile\/\w+/.test(po),Ao=No||/Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(po),Eo=No||/Mac/.test(mo),Oo=/\bCrOS\b/.test(po),Io=/win/i.test(mo),Po=Co&&po.match(/Version\/(\d*\.\d*)/);Po&&(Po=Number(Po[1])),Po&&Po>=15&&(Co=!1,wo=!0);var Ro=Eo&&(ko||Co&&(null==Po||12.11>Po)),Do=go||xo&&bo>=9,Ho=!1,Wo=!1;m.prototype=Wi({update:function(e){var t=e.scrollWidth>e.clientWidth+1,n=e.scrollHeight>e.clientHeight+1,r=e.nativeBarWidth;if(n){this.vert.style.display="block",this.vert.style.bottom=t?r+"px":"0";var i=e.viewHeight-(t?r:0);this.vert.firstChild.style.height=Math.max(0,e.scrollHeight-e.clientHeight+i)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0";if(t){this.horiz.style.display="block",this.horiz.style.right=n?r+"px":"0",this.horiz.style.left=e.barLeft+"px";var o=e.viewWidth-e.barLeft-(n?r:0);this.horiz.firstChild.style.width=e.scrollWidth-e.clientWidth+o+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&e.clientHeight>0&&(0==r&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:n?r:0,bottom:t?r:0}},setScrollLeft:function(e){this.horiz.scrollLeft!=e&&(this.horiz.scrollLeft=e),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz)},setScrollTop:function(e){this.vert.scrollTop!=e&&(this.vert.scrollTop=e),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert)},zeroWidthHack:function(){var e=Eo&&!To?"12px":"18px";this.horiz.style.height=this.vert.style.width=e,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new Ei,this.disableVert=new Ei},enableZeroWidthBar:function(e,t){function n(){var r=e.getBoundingClientRect(),i=document.elementFromPoint(r.left+1,r.bottom-1);i!=e?e.style.pointerEvents="none":t.set(1e3,n)}e.style.pointerEvents="auto",t.set(1e3,n)},clear:function(){var e=this.horiz.parentNode;e.removeChild(this.horiz),e.removeChild(this.vert)}},m.prototype),g.prototype=Wi({update:function(){return{bottom:0,right:0}},setScrollLeft:function(){},setScrollTop:function(){},clear:function(){}},g.prototype),e.scrollbarModel={"native":m,"null":g},L.prototype.signal=function(e,t){Ni(e,t)&&this.events.push(arguments)},L.prototype.finish=function(){for(var e=0;e<this.events.length;e++)Pa.apply(null,this.events[e])};var Bo=e.Pos=function(e,t){return this instanceof Bo?(this.line=e,void(this.ch=t)):new Bo(e,t)},_o=e.cmpPos=function(e,t){return e.line-t.line||e.ch-t.ch},Fo=null;ne.prototype=Wi({init:function(e){function t(e){if(!Ti(r,e)){if(r.somethingSelected())Fo={lineWise:!1,text:r.getSelections()},n.inaccurateSelection&&(n.prevInput="",n.inaccurateSelection=!1,o.value=Fo.text.join("\n"),Ua(o));else{if(!r.options.lineWiseCopyCut)return;var t=ee(r);Fo={lineWise:!0,text:t.text},"cut"==e.type?r.setSelections(t.ranges,null,Wa):(n.prevInput="",o.value=t.text.join("\n"),Ua(o))}"cut"==e.type&&(r.state.cutIncoming=!0)}}var n=this,r=this.cm,i=this.wrapper=re(),o=this.textarea=i.firstChild;e.wrapper.insertBefore(i,e.wrapper.firstChild),No&&(o.style.width="0px"),Ea(o,"input",function(){xo&&bo>=9&&n.hasSelection&&(n.hasSelection=null),n.poll()}),Ea(o,"paste",function(e){Ti(r,e)||J(e,r)||(r.state.pasteIncoming=!0,n.fastPoll())}),Ea(o,"cut",t),Ea(o,"copy",t),Ea(e.scroller,"paste",function(t){Gt(e,t)||Ti(r,t)||(r.state.pasteIncoming=!0,n.focus())}),Ea(e.lineSpace,"selectstart",function(t){Gt(e,t)||Ma(t)}),Ea(o,"compositionstart",function(){var e=r.getCursor("from");n.composing&&n.composing.range.clear(),n.composing={start:e,range:r.markText(e,r.getCursor("to"),{className:"CodeMirror-composing"})}}),Ea(o,"compositionend",function(){n.composing&&(n.poll(),n.composing.range.clear(),n.composing=null)})},prepareSelection:function(){var e=this.cm,t=e.display,n=e.doc,r=De(e);if(e.options.moveInputWithCursor){var i=dt(e,n.sel.primary().head,"div"),o=t.wrapper.getBoundingClientRect(),a=t.lineDiv.getBoundingClientRect();r.teTop=Math.max(0,Math.min(t.wrapper.clientHeight-10,i.top+a.top-o.top)),r.teLeft=Math.max(0,Math.min(t.wrapper.clientWidth-10,i.left+a.left-o.left))}return r},showSelection:function(e){var t=this.cm,n=t.display;qi(n.cursorDiv,e.cursors),qi(n.selectionDiv,e.selection),null!=e.teTop&&(this.wrapper.style.top=e.teTop+"px",this.wrapper.style.left=e.teLeft+"px")},reset:function(e){if(!this.contextMenuPending){var t,n,r=this.cm,i=r.doc;if(r.somethingSelected()){this.prevInput="";var o=i.sel.primary();t=rl&&(o.to().line-o.from().line>100||(n=r.getSelection()).length>1e3);var a=t?"-":n||r.getSelection();this.textarea.value=a,r.state.focused&&Ua(this.textarea),xo&&bo>=9&&(this.hasSelection=a)}else e||(this.prevInput=this.textarea.value="",xo&&bo>=9&&(this.hasSelection=null));this.inaccurateSelection=t}},getField:function(){return this.textarea},supportsTouch:function(){return!1},focus:function(){if("nocursor"!=this.cm.options.readOnly&&(!Ao||Gi()!=this.textarea))try{this.textarea.focus()}catch(e){}},blur:function(){this.textarea.blur()},resetPosition:function(){this.wrapper.style.top=this.wrapper.style.left=0;
+},receivedFocus:function(){this.slowPoll()},slowPoll:function(){var e=this;e.pollingFast||e.polling.set(this.cm.options.pollInterval,function(){e.poll(),e.cm.state.focused&&e.slowPoll()})},fastPoll:function(){function e(){var r=n.poll();r||t?(n.pollingFast=!1,n.slowPoll()):(t=!0,n.polling.set(60,e))}var t=!1,n=this;n.pollingFast=!0,n.polling.set(20,e)},poll:function(){var e=this.cm,t=this.textarea,n=this.prevInput;if(this.contextMenuPending||!e.state.focused||nl(t)&&!n&&!this.composing||e.isReadOnly()||e.options.disableInput||e.state.keySeq)return!1;var r=t.value;if(r==n&&!e.somethingSelected())return!1;if(xo&&bo>=9&&this.hasSelection===r||Eo&&/[\uf700-\uf7ff]/.test(r))return e.display.input.reset(),!1;if(e.doc.sel==e.display.selForContextMenu){var i=r.charCodeAt(0);if(8203!=i||n||(n="​"),8666==i)return this.reset(),this.cm.execCommand("undo")}for(var o=0,a=Math.min(n.length,r.length);a>o&&n.charCodeAt(o)==r.charCodeAt(o);)++o;var l=this;return At(e,function(){Z(e,r.slice(o),n.length-o,null,l.composing?"*compose":null),r.length>1e3||r.indexOf("\n")>-1?t.value=l.prevInput="":l.prevInput=r,l.composing&&(l.composing.range.clear(),l.composing.range=e.markText(l.composing.start,e.getCursor("to"),{className:"CodeMirror-composing"}))}),!0},ensurePolled:function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},onKeyPress:function(){xo&&bo>=9&&(this.hasSelection=null),this.fastPoll()},onContextMenu:function(e){function t(){if(null!=a.selectionStart){var e=i.somethingSelected(),t="​"+(e?a.value:"");a.value="⇚",a.value=t,r.prevInput=e?"":"​",a.selectionStart=1,a.selectionEnd=t.length,o.selForContextMenu=i.doc.sel}}function n(){if(r.contextMenuPending=!1,r.wrapper.style.cssText=f,a.style.cssText=u,xo&&9>bo&&o.scrollbars.setScrollTop(o.scroller.scrollTop=s),null!=a.selectionStart){(!xo||xo&&9>bo)&&t();var e=0,n=function(){o.selForContextMenu==i.doc.sel&&0==a.selectionStart&&a.selectionEnd>0&&"​"==r.prevInput?Et(i,ua.selectAll)(i):e++<10?o.detectingSelectAll=setTimeout(n,500):o.input.reset()};o.detectingSelectAll=setTimeout(n,200)}}var r=this,i=r.cm,o=i.display,a=r.textarea,l=Yt(i,e),s=o.scroller.scrollTop;if(l&&!Co){var c=i.options.resetSelectionOnContextMenu;c&&-1==i.doc.sel.contains(l)&&Et(i,Te)(i.doc,de(l),Wa);var u=a.style.cssText,f=r.wrapper.style.cssText;r.wrapper.style.cssText="position: absolute";var h=r.wrapper.getBoundingClientRect();if(a.style.cssText="position: absolute; width: 30px; height: 30px; top: "+(e.clientY-h.top-5)+"px; left: "+(e.clientX-h.left-5)+"px; z-index: 1000; background: "+(xo?"rgba(255, 255, 255, .05)":"transparent")+"; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);",wo)var d=window.scrollY;if(o.input.focus(),wo&&window.scrollTo(null,d),o.input.reset(),i.somethingSelected()||(a.value=r.prevInput=" "),r.contextMenuPending=!0,o.selForContextMenu=i.doc.sel,clearTimeout(o.detectingSelectAll),xo&&bo>=9&&t(),Do){Aa(e);var p=function(){Ia(window,"mouseup",p),setTimeout(n,20)};Ea(window,"mouseup",p)}else setTimeout(n,50)}},readOnlyChanged:function(e){e||this.reset()},setUneditable:Di,needsContentAttribute:!1},ne.prototype),ie.prototype=Wi({init:function(e){function t(e){if(!Ti(r,e)){if(r.somethingSelected())Fo={lineWise:!1,text:r.getSelections()},"cut"==e.type&&r.replaceSelection("",null,"cut");else{if(!r.options.lineWiseCopyCut)return;var t=ee(r);Fo={lineWise:!0,text:t.text},"cut"==e.type&&r.operation(function(){r.setSelections(t.ranges,0,Wa),r.replaceSelection("",null,"cut")})}if(e.clipboardData&&!No)e.preventDefault(),e.clipboardData.clearData(),e.clipboardData.setData("text/plain",Fo.text.join("\n"));else{var n=re(),i=n.firstChild;r.display.lineSpace.insertBefore(n,r.display.lineSpace.firstChild),i.value=Fo.text.join("\n");var o=document.activeElement;Ua(i),setTimeout(function(){r.display.lineSpace.removeChild(n),o.focus()},50)}}}var n=this,r=n.cm,i=n.div=e.lineDiv;te(i),Ea(i,"paste",function(e){Ti(r,e)||J(e,r)}),Ea(i,"compositionstart",function(e){var t=e.data;if(n.composing={sel:r.doc.sel,data:t,startData:t},t){var i=r.doc.sel.primary(),o=r.getLine(i.head.line),a=o.indexOf(t,Math.max(0,i.head.ch-t.length));a>-1&&a<=i.head.ch&&(n.composing.sel=de(Bo(i.head.line,a),Bo(i.head.line,a+t.length)))}}),Ea(i,"compositionupdate",function(e){n.composing.data=e.data}),Ea(i,"compositionend",function(e){var t=n.composing;t&&(e.data==t.startData||/\u200b/.test(e.data)||(t.data=e.data),setTimeout(function(){t.handled||n.applyComposition(t),n.composing==t&&(n.composing=null)},50))}),Ea(i,"touchstart",function(){n.forceCompositionEnd()}),Ea(i,"input",function(){n.composing||!r.isReadOnly()&&n.pollContent()||At(n.cm,function(){Dt(r)})}),Ea(i,"copy",t),Ea(i,"cut",t)},prepareSelection:function(){var e=De(this.cm,!1);return e.focus=this.cm.state.focused,e},showSelection:function(e,t){e&&this.cm.display.view.length&&((e.focus||t)&&this.showPrimarySelection(),this.showMultipleSelections(e))},showPrimarySelection:function(){var e=window.getSelection(),t=this.cm.doc.sel.primary(),n=le(this.cm,e.anchorNode,e.anchorOffset),r=le(this.cm,e.focusNode,e.focusOffset);if(!n||n.bad||!r||r.bad||0!=_o(K(n,r),t.from())||0!=_o(V(n,r),t.to())){var i=oe(this.cm,t.from()),o=oe(this.cm,t.to());if(i||o){var a=this.cm.display.view,l=e.rangeCount&&e.getRangeAt(0);if(i){if(!o){var s=a[a.length-1].measure,c=s.maps?s.maps[s.maps.length-1]:s.map;o={node:c[c.length-1],offset:c[c.length-2]-c[c.length-3]}}}else i={node:a[0].measure.map[2],offset:0};try{var u=qa(i.node,i.offset,o.offset,o.node)}catch(f){}u&&(!go&&this.cm.state.focused?(e.collapse(i.node,i.offset),u.collapsed||e.addRange(u)):(e.removeAllRanges(),e.addRange(u)),l&&null==e.anchorNode?e.addRange(l):go&&this.startGracePeriod()),this.rememberSelection()}}},startGracePeriod:function(){var e=this;clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout(function(){e.gracePeriod=!1,e.selectionChanged()&&e.cm.operation(function(){e.cm.curOp.selectionChanged=!0})},20)},showMultipleSelections:function(e){qi(this.cm.display.cursorDiv,e.cursors),qi(this.cm.display.selectionDiv,e.selection)},rememberSelection:function(){var e=window.getSelection();this.lastAnchorNode=e.anchorNode,this.lastAnchorOffset=e.anchorOffset,this.lastFocusNode=e.focusNode,this.lastFocusOffset=e.focusOffset},selectionInEditor:function(){var e=window.getSelection();if(!e.rangeCount)return!1;var t=e.getRangeAt(0).commonAncestorContainer;return Va(this.div,t)},focus:function(){"nocursor"!=this.cm.options.readOnly&&this.div.focus()},blur:function(){this.div.blur()},getField:function(){return this.div},supportsTouch:function(){return!0},receivedFocus:function(){function e(){t.cm.state.focused&&(t.pollSelection(),t.polling.set(t.cm.options.pollInterval,e))}var t=this;this.selectionInEditor()?this.pollSelection():At(this.cm,function(){t.cm.curOp.selectionChanged=!0}),this.polling.set(this.cm.options.pollInterval,e)},selectionChanged:function(){var e=window.getSelection();return e.anchorNode!=this.lastAnchorNode||e.anchorOffset!=this.lastAnchorOffset||e.focusNode!=this.lastFocusNode||e.focusOffset!=this.lastFocusOffset},pollSelection:function(){if(!this.composing&&!this.gracePeriod&&this.selectionChanged()){var e=window.getSelection(),t=this.cm;this.rememberSelection();var n=le(t,e.anchorNode,e.anchorOffset),r=le(t,e.focusNode,e.focusOffset);n&&r&&At(t,function(){Te(t.doc,de(n,r),Wa),(n.bad||r.bad)&&(t.curOp.selectionChanged=!0)})}},pollContent:function(){var e=this.cm,t=e.display,n=e.doc.sel.primary(),r=n.from(),i=n.to();if(r.line<t.viewFrom||i.line>t.viewTo-1)return!1;var o;if(r.line==t.viewFrom||0==(o=Bt(e,r.line)))var a=ti(t.view[0].line),l=t.view[0].node;else var a=ti(t.view[o].line),l=t.view[o-1].node.nextSibling;var s=Bt(e,i.line);if(s==t.view.length-1)var c=t.viewTo-1,u=t.lineDiv.lastChild;else var c=ti(t.view[s+1].line)-1,u=t.view[s+1].node.previousSibling;for(var f=e.doc.splitLines(ce(e,l,u,a,c)),h=Jr(e.doc,Bo(a,0),Bo(c,Zr(e.doc,c).text.length));f.length>1&&h.length>1;)if(Ii(f)==Ii(h))f.pop(),h.pop(),c--;else{if(f[0]!=h[0])break;f.shift(),h.shift(),a++}for(var d=0,p=0,m=f[0],g=h[0],v=Math.min(m.length,g.length);v>d&&m.charCodeAt(d)==g.charCodeAt(d);)++d;for(var y=Ii(f),x=Ii(h),b=Math.min(y.length-(1==f.length?d:0),x.length-(1==h.length?d:0));b>p&&y.charCodeAt(y.length-p-1)==x.charCodeAt(x.length-p-1);)++p;f[f.length-1]=y.slice(0,y.length-p),f[0]=f[0].slice(d);var w=Bo(a,d),k=Bo(c,h.length?Ii(h).length-p:0);return f.length>1||f[0]||_o(w,k)?(In(e.doc,f,w,k,"+input"),!0):void 0},ensurePolled:function(){this.forceCompositionEnd()},reset:function(){this.forceCompositionEnd()},forceCompositionEnd:function(){this.composing&&!this.composing.handled&&(this.applyComposition(this.composing),this.composing.handled=!0,this.div.blur(),this.div.focus())},applyComposition:function(e){this.cm.isReadOnly()?Et(this.cm,Dt)(this.cm):e.data&&e.data!=e.startData&&Et(this.cm,Z)(this.cm,e.data,0,e.sel)},setUneditable:function(e){e.contentEditable="false"},onKeyPress:function(e){e.preventDefault(),this.cm.isReadOnly()||Et(this.cm,Z)(this.cm,String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),0)},readOnlyChanged:function(e){this.div.contentEditable=String("nocursor"!=e)},onContextMenu:Di,resetPosition:Di,needsContentAttribute:!0},ie.prototype),e.inputStyles={textarea:ne,contenteditable:ie},ue.prototype={primary:function(){return this.ranges[this.primIndex]},equals:function(e){if(e==this)return!0;if(e.primIndex!=this.primIndex||e.ranges.length!=this.ranges.length)return!1;for(var t=0;t<this.ranges.length;t++){var n=this.ranges[t],r=e.ranges[t];if(0!=_o(n.anchor,r.anchor)||0!=_o(n.head,r.head))return!1}return!0},deepCopy:function(){for(var e=[],t=0;t<this.ranges.length;t++)e[t]=new fe($(this.ranges[t].anchor),$(this.ranges[t].head));return new ue(e,this.primIndex)},somethingSelected:function(){for(var e=0;e<this.ranges.length;e++)if(!this.ranges[e].empty())return!0;return!1},contains:function(e,t){t||(t=e);for(var n=0;n<this.ranges.length;n++){var r=this.ranges[n];if(_o(t,r.from())>=0&&_o(e,r.to())<=0)return n}return-1}},fe.prototype={from:function(){return K(this.anchor,this.head)},to:function(){return V(this.anchor,this.head)},empty:function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch}};var zo,jo,Uo,qo={left:0,right:0,top:0,bottom:0},Go=null,Yo=0,$o=0,Vo=0,Ko=null;xo?Ko=-.53:go?Ko=15:So?Ko=-.7:Lo&&(Ko=-1/3);var Xo=function(e){var t=e.wheelDeltaX,n=e.wheelDeltaY;return null==t&&e.detail&&e.axis==e.HORIZONTAL_AXIS&&(t=e.detail),null==n&&e.detail&&e.axis==e.VERTICAL_AXIS?n=e.detail:null==n&&(n=e.wheelDelta),{x:t,y:n}};e.wheelEventPixels=function(e){var t=Xo(e);return t.x*=Ko,t.y*=Ko,t};var Zo=new Ei,Jo=null,Qo=e.changeEnd=function(e){return e.text?Bo(e.from.line+e.text.length-1,Ii(e.text).length+(1==e.text.length?e.from.ch:0)):e.to};e.prototype={constructor:e,focus:function(){window.focus(),this.display.input.focus()},setOption:function(e,t){var n=this.options,r=n[e];n[e]==t&&"mode"!=e||(n[e]=t,ta.hasOwnProperty(e)&&Et(this,ta[e])(this,t,r))},getOption:function(e){return this.options[e]},getDoc:function(){return this.doc},addKeyMap:function(e,t){this.state.keyMaps[t?"push":"unshift"]($n(e))},removeKeyMap:function(e){for(var t=this.state.keyMaps,n=0;n<t.length;++n)if(t[n]==e||t[n].name==e)return t.splice(n,1),!0},addOverlay:Ot(function(t,n){var r=t.token?t:e.getMode(this.options,t);if(r.startState)throw new Error("Overlays may not be stateful.");this.state.overlays.push({mode:r,modeSpec:t,opaque:n&&n.opaque}),this.state.modeGen++,Dt(this)}),removeOverlay:Ot(function(e){for(var t=this.state.overlays,n=0;n<t.length;++n){var r=t[n].modeSpec;if(r==e||"string"==typeof e&&r.name==e)return t.splice(n,1),this.state.modeGen++,void Dt(this)}}),indentLine:Ot(function(e,t,n){"string"!=typeof t&&"number"!=typeof t&&(t=null==t?this.options.smartIndent?"smart":"prev":t?"add":"subtract"),ve(this.doc,e)&&Fn(this,e,t,n)}),indentSelection:Ot(function(e){for(var t=this.doc.sel.ranges,n=-1,r=0;r<t.length;r++){var i=t[r];if(i.empty())i.head.line>n&&(Fn(this,i.head.line,e,!0),n=i.head.line,r==this.doc.sel.primIndex&&Bn(this));else{var o=i.from(),a=i.to(),l=Math.max(n,o.line);n=Math.min(this.lastLine(),a.line-(a.ch?0:1))+1;for(var s=l;n>s;++s)Fn(this,s,e);var c=this.doc.sel.ranges;0==o.ch&&t.length==c.length&&c[r].from().ch>0&&ke(this.doc,r,new fe(o,c[r].to()),Wa)}}}),getTokenAt:function(e,t){return Ir(this,e,t)},getLineTokens:function(e,t){return Ir(this,Bo(e),t,!0)},getTokenTypeAt:function(e){e=me(this.doc,e);var t,n=Dr(this,Zr(this.doc,e.line)),r=0,i=(n.length-1)/2,o=e.ch;if(0==o)t=n[2];else for(;;){var a=r+i>>1;if((a?n[2*a-1]:0)>=o)i=a;else{if(!(n[2*a+1]<o)){t=n[2*a+2];break}r=a+1}}var l=t?t.indexOf("cm-overlay "):-1;return 0>l?t:0==l?null:t.slice(0,l-1)},getModeAt:function(t){var n=this.doc.mode;return n.innerMode?e.innerMode(n,this.getTokenAt(t).state).mode:n},getHelper:function(e,t){return this.getHelpers(e,t)[0]},getHelpers:function(e,t){var n=[];if(!la.hasOwnProperty(t))return n;var r=la[t],i=this.getModeAt(e);if("string"==typeof i[t])r[i[t]]&&n.push(r[i[t]]);else if(i[t])for(var o=0;o<i[t].length;o++){var a=r[i[t][o]];a&&n.push(a)}else i.helperType&&r[i.helperType]?n.push(r[i.helperType]):r[i.name]&&n.push(r[i.name]);for(var o=0;o<r._global.length;o++){var l=r._global[o];l.pred(i,this)&&-1==Pi(n,l.val)&&n.push(l.val)}return n},getStateAfter:function(e,t){var n=this.doc;return e=pe(n,null==e?n.first+n.size-1:e),je(this,e+1,t)},cursorCoords:function(e,t){var n,r=this.doc.sel.primary();return n=null==e?r.head:"object"==typeof e?me(this.doc,e):e?r.from():r.to(),dt(this,n,t||"page")},charCoords:function(e,t){return ht(this,me(this.doc,e),t||"page")},coordsChar:function(e,t){return e=ft(this,e,t||"page"),gt(this,e.left,e.top)},lineAtHeight:function(e,t){return e=ft(this,{top:e,left:0},t||"page").top,ni(this.doc,e+this.display.viewOffset)},heightAtLine:function(e,t){var n,r=!1;if("number"==typeof e){var i=this.doc.first+this.doc.size-1;e<this.doc.first?e=this.doc.first:e>i&&(e=i,r=!0),n=Zr(this.doc,e)}else n=e;return ut(this,n,{top:0,left:0},t||"page").top+(r?this.doc.height-ri(n):0)},defaultTextHeight:function(){return yt(this.display)},defaultCharWidth:function(){return xt(this.display)},setGutterMarker:Ot(function(e,t,n){return zn(this.doc,e,"gutter",function(e){var r=e.gutterMarkers||(e.gutterMarkers={});return r[t]=n,!n&&Fi(r)&&(e.gutterMarkers=null),!0})}),clearGutter:Ot(function(e){var t=this,n=t.doc,r=n.first;n.iter(function(n){n.gutterMarkers&&n.gutterMarkers[e]&&(n.gutterMarkers[e]=null,Ht(t,r,"gutter"),Fi(n.gutterMarkers)&&(n.gutterMarkers=null)),++r})}),lineInfo:function(e){if("number"==typeof e){if(!ve(this.doc,e))return null;var t=e;if(e=Zr(this.doc,e),!e)return null}else{var t=ti(e);if(null==t)return null}return{line:t,handle:e,text:e.text,gutterMarkers:e.gutterMarkers,textClass:e.textClass,bgClass:e.bgClass,wrapClass:e.wrapClass,widgets:e.widgets}},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(e,t,n,r,i){var o=this.display;e=dt(this,me(this.doc,e));var a=e.bottom,l=e.left;if(t.style.position="absolute",t.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(t),o.sizer.appendChild(t),"over"==r)a=e.top;else if("above"==r||"near"==r){var s=Math.max(o.wrapper.clientHeight,this.doc.height),c=Math.max(o.sizer.clientWidth,o.lineSpace.clientWidth);("above"==r||e.bottom+t.offsetHeight>s)&&e.top>t.offsetHeight?a=e.top-t.offsetHeight:e.bottom+t.offsetHeight<=s&&(a=e.bottom),l+t.offsetWidth>c&&(l=c-t.offsetWidth)}t.style.top=a+"px",t.style.left=t.style.right="","right"==i?(l=o.sizer.clientWidth-t.offsetWidth,t.style.right="0px"):("left"==i?l=0:"middle"==i&&(l=(o.sizer.clientWidth-t.offsetWidth)/2),t.style.left=l+"px"),n&&Dn(this,l,a,l+t.offsetWidth,a+t.offsetHeight)},triggerOnKeyDown:Ot(hn),triggerOnKeyPress:Ot(mn),triggerOnKeyUp:pn,execCommand:function(e){return ua.hasOwnProperty(e)?ua[e].call(null,this):void 0},triggerElectric:Ot(function(e){Q(this,e)}),findPosH:function(e,t,n,r){var i=1;0>t&&(i=-1,t=-t);for(var o=0,a=me(this.doc,e);t>o&&(a=Un(this.doc,a,i,n,r),!a.hitSide);++o);return a},moveH:Ot(function(e,t){var n=this;n.extendSelectionsBy(function(r){return n.display.shift||n.doc.extend||r.empty()?Un(n.doc,r.head,e,t,n.options.rtlMoveVisually):0>e?r.from():r.to()},_a)}),deleteH:Ot(function(e,t){var n=this.doc.sel,r=this.doc;n.somethingSelected()?r.replaceSelection("",null,"+delete"):jn(this,function(n){var i=Un(r,n.head,e,t,!1);return 0>e?{from:i,to:n.head}:{from:n.head,to:i}})}),findPosV:function(e,t,n,r){var i=1,o=r;0>t&&(i=-1,t=-t);for(var a=0,l=me(this.doc,e);t>a;++a){var s=dt(this,l,"div");if(null==o?o=s.left:s.left=o,l=qn(this,s,i,n),l.hitSide)break}return l},moveV:Ot(function(e,t){var n=this,r=this.doc,i=[],o=!n.display.shift&&!r.extend&&r.sel.somethingSelected();if(r.extendSelectionsBy(function(a){if(o)return 0>e?a.from():a.to();var l=dt(n,a.head,"div");null!=a.goalColumn&&(l.left=a.goalColumn),i.push(l.left);var s=qn(n,l,e,t);return"page"==t&&a==r.sel.primary()&&Wn(n,null,ht(n,s,"div").top-l.top),s},_a),i.length)for(var a=0;a<r.sel.ranges.length;a++)r.sel.ranges[a].goalColumn=i[a]}),findWordAt:function(e){var t=this.doc,n=Zr(t,e.line).text,r=e.ch,i=e.ch;if(n){var o=this.getHelper(e,"wordChars");(e.xRel<0||i==n.length)&&r?--r:++i;for(var a=n.charAt(r),l=_i(a,o)?function(e){return _i(e,o)}:/\s/.test(a)?function(e){return/\s/.test(e)}:function(e){return!/\s/.test(e)&&!_i(e)};r>0&&l(n.charAt(r-1));)--r;for(;i<n.length&&l(n.charAt(i));)++i}return new fe(Bo(e.line,r),Bo(e.line,i))},toggleOverwrite:function(e){null!=e&&e==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?Ja(this.display.cursorDiv,"CodeMirror-overwrite"):Za(this.display.cursorDiv,"CodeMirror-overwrite"),Pa(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==Gi()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:Ot(function(e,t){null==e&&null==t||_n(this),null!=e&&(this.curOp.scrollLeft=e),null!=t&&(this.curOp.scrollTop=t)}),getScrollInfo:function(){var e=this.display.scroller;return{left:e.scrollLeft,top:e.scrollTop,height:e.scrollHeight-Ye(this)-this.display.barHeight,width:e.scrollWidth-Ye(this)-this.display.barWidth,clientHeight:Ve(this),clientWidth:$e(this)}},scrollIntoView:Ot(function(e,t){if(null==e?(e={from:this.doc.sel.primary().head,to:null},null==t&&(t=this.options.cursorScrollMargin)):"number"==typeof e?e={from:Bo(e,0),to:null}:null==e.from&&(e={from:e,to:null}),e.to||(e.to=e.from),e.margin=t||0,null!=e.from.line)_n(this),this.curOp.scrollToPos=e;else{var n=Hn(this,Math.min(e.from.left,e.to.left),Math.min(e.from.top,e.to.top)-e.margin,Math.max(e.from.right,e.to.right),Math.max(e.from.bottom,e.to.bottom)+e.margin);this.scrollTo(n.scrollLeft,n.scrollTop)}}),setSize:Ot(function(e,t){function n(e){return"number"==typeof e||/^\d+$/.test(String(e))?e+"px":e}var r=this;null!=e&&(r.display.wrapper.style.width=n(e)),null!=t&&(r.display.wrapper.style.height=n(t)),r.options.lineWrapping&&at(this);var i=r.display.viewFrom;r.doc.iter(i,r.display.viewTo,function(e){if(e.widgets)for(var t=0;t<e.widgets.length;t++)if(e.widgets[t].noHScroll){Ht(r,i,"widget");break}++i}),r.curOp.forceUpdate=!0,Pa(r,"refresh",this)}),operation:function(e){return At(this,e)},refresh:Ot(function(){var e=this.display.cachedTextHeight;Dt(this),this.curOp.forceUpdate=!0,lt(this),this.scrollTo(this.doc.scrollLeft,this.doc.scrollTop),u(this),(null==e||Math.abs(e-yt(this.display))>.5)&&a(this),Pa(this,"refresh",this)}),swapDoc:Ot(function(e){var t=this.doc;return t.cm=null,Xr(this,e),lt(this),this.display.input.reset(),this.scrollTo(e.scrollLeft,e.scrollTop),this.curOp.forceScroll=!0,Ci(this,"swapDoc",this,t),t}),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},Ai(e);var ea=e.defaults={},ta=e.optionHandlers={},na=e.Init={toString:function(){return"CodeMirror.Init"}};Gn("value","",function(e,t){e.setValue(t)},!0),Gn("mode",null,function(e,t){e.doc.modeOption=t,n(e)},!0),Gn("indentUnit",2,n,!0),Gn("indentWithTabs",!1),Gn("smartIndent",!0),Gn("tabSize",4,function(e){r(e),lt(e),Dt(e)},!0),Gn("lineSeparator",null,function(e,t){if(e.doc.lineSep=t,t){var n=[],r=e.doc.first;e.doc.iter(function(e){for(var i=0;;){var o=e.text.indexOf(t,i);if(-1==o)break;i=o+t.length,n.push(Bo(r,o))}r++});for(var i=n.length-1;i>=0;i--)In(e.doc,t,n[i],Bo(n[i].line,n[i].ch+t.length))}}),Gn("specialChars",/[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g,function(t,n,r){t.state.specialChars=new RegExp(n.source+(n.test("	")?"":"|	"),"g"),r!=e.Init&&t.refresh()}),Gn("specialCharPlaceholder",_r,function(e){e.refresh()},!0),Gn("electricChars",!0),Gn("inputStyle",Ao?"contenteditable":"textarea",function(){throw new Error("inputStyle can not (yet) be changed in a running editor")},!0),Gn("rtlMoveVisually",!Io),Gn("wholeLineUpdateBefore",!0),Gn("theme","default",function(e){l(e),s(e)},!0),Gn("keyMap","default",function(t,n,r){var i=$n(n),o=r!=e.Init&&$n(r);o&&o.detach&&o.detach(t,i),i.attach&&i.attach(t,o||null)}),Gn("extraKeys",null),Gn("lineWrapping",!1,i,!0),Gn("gutters",[],function(e){d(e.options),s(e)},!0),Gn("fixedGutter",!0,function(e,t){e.display.gutters.style.left=t?C(e.display)+"px":"0",e.refresh()},!0),Gn("coverGutterNextToScrollbar",!1,function(e){y(e)},!0),Gn("scrollbarStyle","native",function(e){v(e),y(e),e.display.scrollbars.setScrollTop(e.doc.scrollTop),e.display.scrollbars.setScrollLeft(e.doc.scrollLeft)},!0),Gn("lineNumbers",!1,function(e){d(e.options),s(e)},!0),Gn("firstLineNumber",1,s,!0),Gn("lineNumberFormatter",function(e){return e},s,!0),Gn("showCursorWhenSelecting",!1,Re,!0),Gn("resetSelectionOnContextMenu",!0),Gn("lineWiseCopyCut",!0),Gn("readOnly",!1,function(e,t){"nocursor"==t?(yn(e),e.display.input.blur(),e.display.disabled=!0):e.display.disabled=!1,e.display.input.readOnlyChanged(t)}),Gn("disableInput",!1,function(e,t){t||e.display.input.reset()},!0),Gn("dragDrop",!0,Ut),Gn("allowDropFileTypes",null),Gn("cursorBlinkRate",530),Gn("cursorScrollMargin",0),Gn("cursorHeight",1,Re,!0),Gn("singleCursorHeightPerLine",!0,Re,!0),Gn("workTime",100),Gn("workDelay",100),Gn("flattenSpans",!0,r,!0),Gn("addModeClass",!1,r,!0),Gn("pollInterval",100),Gn("undoDepth",200,function(e,t){e.doc.history.undoDepth=t}),Gn("historyEventDelay",1250),Gn("viewportMargin",10,function(e){e.refresh()},!0),Gn("maxHighlightLength",1e4,r,!0),Gn("moveInputWithCursor",!0,function(e,t){t||e.display.input.resetPosition()}),Gn("tabindex",null,function(e,t){e.display.input.getField().tabIndex=t||""}),Gn("autofocus",null);var ra=e.modes={},ia=e.mimeModes={};e.defineMode=function(t,n){e.defaults.mode||"null"==t||(e.defaults.mode=t),arguments.length>2&&(n.dependencies=Array.prototype.slice.call(arguments,2)),ra[t]=n},e.defineMIME=function(e,t){ia[e]=t},e.resolveMode=function(t){if("string"==typeof t&&ia.hasOwnProperty(t))t=ia[t];else if(t&&"string"==typeof t.name&&ia.hasOwnProperty(t.name)){var n=ia[t.name];"string"==typeof n&&(n={name:n}),t=Hi(n,t),t.name=n.name}else if("string"==typeof t&&/^[\w\-]+\/[\w\-]+\+xml$/.test(t))return e.resolveMode("application/xml");return"string"==typeof t?{name:t}:t||{name:"null"}},e.getMode=function(t,n){var n=e.resolveMode(n),r=ra[n.name];if(!r)return e.getMode(t,"text/plain");var i=r(t,n);if(oa.hasOwnProperty(n.name)){var o=oa[n.name];for(var a in o)o.hasOwnProperty(a)&&(i.hasOwnProperty(a)&&(i["_"+a]=i[a]),i[a]=o[a])}if(i.name=n.name,n.helperType&&(i.helperType=n.helperType),n.modeProps)for(var a in n.modeProps)i[a]=n.modeProps[a];return i},e.defineMode("null",function(){return{token:function(e){e.skipToEnd()}}}),e.defineMIME("text/plain","null");var oa=e.modeExtensions={};e.extendMode=function(e,t){var n=oa.hasOwnProperty(e)?oa[e]:oa[e]={};Wi(t,n)},e.defineExtension=function(t,n){e.prototype[t]=n},e.defineDocExtension=function(e,t){Ca.prototype[e]=t},e.defineOption=Gn;var aa=[];e.defineInitHook=function(e){aa.push(e)};var la=e.helpers={};e.registerHelper=function(t,n,r){la.hasOwnProperty(t)||(la[t]=e[t]={_global:[]}),la[t][n]=r},e.registerGlobalHelper=function(t,n,r,i){e.registerHelper(t,n,i),la[t]._global.push({pred:r,val:i})};var sa=e.copyState=function(e,t){if(t===!0)return t;if(e.copyState)return e.copyState(t);var n={};for(var r in t){var i=t[r];i instanceof Array&&(i=i.concat([])),n[r]=i}return n},ca=e.startState=function(e,t,n){return e.startState?e.startState(t,n):!0};e.innerMode=function(e,t){for(;e.innerMode;){var n=e.innerMode(t);if(!n||n.mode==e)break;t=n.state,e=n.mode}return n||{mode:e,state:t}};var ua=e.commands={selectAll:function(e){e.setSelection(Bo(e.firstLine(),0),Bo(e.lastLine()),Wa)},singleSelection:function(e){e.setSelection(e.getCursor("anchor"),e.getCursor("head"),Wa)},killLine:function(e){jn(e,function(t){if(t.empty()){var n=Zr(e.doc,t.head.line).text.length;return t.head.ch==n&&t.head.line<e.lastLine()?{from:t.head,to:Bo(t.head.line+1,0)}:{from:t.head,to:Bo(t.head.line,n)}}return{from:t.from(),to:t.to()}})},deleteLine:function(e){jn(e,function(t){return{from:Bo(t.from().line,0),to:me(e.doc,Bo(t.to().line+1,0))}})},delLineLeft:function(e){jn(e,function(e){return{from:Bo(e.from().line,0),to:e.from()}})},delWrappedLineLeft:function(e){jn(e,function(t){var n=e.charCoords(t.head,"div").top+5,r=e.coordsChar({left:0,top:n},"div");return{from:r,to:t.from()}})},delWrappedLineRight:function(e){jn(e,function(t){var n=e.charCoords(t.head,"div").top+5,r=e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:n},"div");return{from:t.from(),to:r}})},undo:function(e){e.undo()},redo:function(e){e.redo()},undoSelection:function(e){e.undoSelection()},redoSelection:function(e){e.redoSelection()},goDocStart:function(e){e.extendSelection(Bo(e.firstLine(),0))},goDocEnd:function(e){e.extendSelection(Bo(e.lastLine()))},goLineStart:function(e){e.extendSelectionsBy(function(t){return oo(e,t.head.line)},{origin:"+move",bias:1})},goLineStartSmart:function(e){e.extendSelectionsBy(function(t){return lo(e,t.head)},{origin:"+move",bias:1})},goLineEnd:function(e){e.extendSelectionsBy(function(t){return ao(e,t.head.line)},{origin:"+move",bias:-1})},goLineRight:function(e){e.extendSelectionsBy(function(t){var n=e.charCoords(t.head,"div").top+5;return e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:n},"div")},_a)},goLineLeft:function(e){e.extendSelectionsBy(function(t){var n=e.charCoords(t.head,"div").top+5;return e.coordsChar({left:0,top:n},"div")},_a)},goLineLeftSmart:function(e){e.extendSelectionsBy(function(t){var n=e.charCoords(t.head,"div").top+5,r=e.coordsChar({left:0,top:n},"div");return r.ch<e.getLine(r.line).search(/\S/)?lo(e,t.head):r},_a)},goLineUp:function(e){e.moveV(-1,"line")},goLineDown:function(e){e.moveV(1,"line")},goPageUp:function(e){e.moveV(-1,"page")},goPageDown:function(e){e.moveV(1,"page")},goCharLeft:function(e){e.moveH(-1,"char")},goCharRight:function(e){e.moveH(1,"char")},goColumnLeft:function(e){e.moveH(-1,"column")},goColumnRight:function(e){e.moveH(1,"column")},goWordLeft:function(e){e.moveH(-1,"word")},goGroupRight:function(e){e.moveH(1,"group")},goGroupLeft:function(e){e.moveH(-1,"group")},goWordRight:function(e){e.moveH(1,"word")},delCharBefore:function(e){e.deleteH(-1,"char")},delCharAfter:function(e){e.deleteH(1,"char")},delWordBefore:function(e){e.deleteH(-1,"word")},delWordAfter:function(e){e.deleteH(1,"word")},delGroupBefore:function(e){e.deleteH(-1,"group")},delGroupAfter:function(e){e.deleteH(1,"group")},indentAuto:function(e){e.indentSelection("smart")},indentMore:function(e){e.indentSelection("add")},indentLess:function(e){e.indentSelection("subtract")},insertTab:function(e){e.replaceSelection("	")},insertSoftTab:function(e){for(var t=[],n=e.listSelections(),r=e.options.tabSize,i=0;i<n.length;i++){var o=n[i].from(),a=Fa(e.getLine(o.line),o.ch,r);t.push(Oi(r-a%r))}e.replaceSelections(t)},defaultTab:function(e){e.somethingSelected()?e.indentSelection("add"):e.execCommand("insertTab")},transposeChars:function(e){At(e,function(){for(var t=e.listSelections(),n=[],r=0;r<t.length;r++){var i=t[r].head,o=Zr(e.doc,i.line).text;if(o)if(i.ch==o.length&&(i=new Bo(i.line,i.ch-1)),i.ch>0)i=new Bo(i.line,i.ch+1),e.replaceRange(o.charAt(i.ch-1)+o.charAt(i.ch-2),Bo(i.line,i.ch-2),i,"+transpose");else if(i.line>e.doc.first){var a=Zr(e.doc,i.line-1).text;a&&e.replaceRange(o.charAt(0)+e.doc.lineSeparator()+a.charAt(a.length-1),Bo(i.line-1,a.length-1),Bo(i.line,1),"+transpose")}n.push(new fe(i,i))}e.setSelections(n)})},newlineAndIndent:function(e){At(e,function(){for(var t=e.listSelections().length,n=0;t>n;n++){var r=e.listSelections()[n];e.replaceRange(e.doc.lineSeparator(),r.anchor,r.head,"+input"),e.indentLine(r.from().line+1,null,!0)}Bn(e)})},openLine:function(e){e.replaceSelection("\n","start")},toggleOverwrite:function(e){e.toggleOverwrite()}},fa=e.keyMap={};fa.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},fa.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},fa.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},fa.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},fa["default"]=Eo?fa.macDefault:fa.pcDefault,e.normalizeKeyMap=function(e){var t={};for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];if(/^(name|fallthrough|(de|at)tach)$/.test(n))continue;if("..."==r){delete e[n];continue}for(var i=Ri(n.split(" "),Yn),o=0;o<i.length;o++){var a,l;o==i.length-1?(l=i.join(" "),a=r):(l=i.slice(0,o+1).join(" "),a="...");var s=t[l];if(s){if(s!=a)throw new Error("Inconsistent bindings for "+l)}else t[l]=a}delete e[n]}for(var c in t)e[c]=t[c];return e};var ha=e.lookupKey=function(e,t,n,r){t=$n(t);var i=t.call?t.call(e,r):t[e];if(i===!1)return"nothing";if("..."===i)return"multi";if(null!=i&&n(i))return"handled";if(t.fallthrough){if("[object Array]"!=Object.prototype.toString.call(t.fallthrough))return ha(e,t.fallthrough,n,r);for(var o=0;o<t.fallthrough.length;o++){var a=ha(e,t.fallthrough[o],n,r);
+if(a)return a}}},da=e.isModifierKey=function(e){var t="string"==typeof e?e:ol[e.keyCode];return"Ctrl"==t||"Alt"==t||"Shift"==t||"Mod"==t},pa=e.keyName=function(e,t){if(Co&&34==e.keyCode&&e["char"])return!1;var n=ol[e.keyCode],r=n;return null==r||e.altGraphKey?!1:(e.altKey&&"Alt"!=n&&(r="Alt-"+r),(Ro?e.metaKey:e.ctrlKey)&&"Ctrl"!=n&&(r="Ctrl-"+r),(Ro?e.ctrlKey:e.metaKey)&&"Cmd"!=n&&(r="Cmd-"+r),!t&&e.shiftKey&&"Shift"!=n&&(r="Shift-"+r),r)};e.fromTextArea=function(t,n){function r(){t.value=c.getValue()}if(n=n?Wi(n):{},n.value=t.value,!n.tabindex&&t.tabIndex&&(n.tabindex=t.tabIndex),!n.placeholder&&t.placeholder&&(n.placeholder=t.placeholder),null==n.autofocus){var i=Gi();n.autofocus=i==t||null!=t.getAttribute("autofocus")&&i==document.body}if(t.form&&(Ea(t.form,"submit",r),!n.leaveSubmitMethodAlone)){var o=t.form,a=o.submit;try{var l=o.submit=function(){r(),o.submit=a,o.submit(),o.submit=l}}catch(s){}}n.finishInit=function(e){e.save=r,e.getTextArea=function(){return t},e.toTextArea=function(){e.toTextArea=isNaN,r(),t.parentNode.removeChild(e.getWrapperElement()),t.style.display="",t.form&&(Ia(t.form,"submit",r),"function"==typeof t.form.submit&&(t.form.submit=a))}},t.style.display="none";var c=e(function(e){t.parentNode.insertBefore(e,t.nextSibling)},n);return c};var ma=e.StringStream=function(e,t){this.pos=this.start=0,this.string=e,this.tabSize=t||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0};ma.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){return this.pos<this.string.length?this.string.charAt(this.pos++):void 0},eat:function(e){var t=this.string.charAt(this.pos);if("string"==typeof e)var n=t==e;else var n=t&&(e.test?e.test(t):e(t));return n?(++this.pos,t):void 0},eatWhile:function(e){for(var t=this.pos;this.eat(e););return this.pos>t},eatSpace:function(){for(var e=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>e},skipToEnd:function(){this.pos=this.string.length},skipTo:function(e){var t=this.string.indexOf(e,this.pos);return t>-1?(this.pos=t,!0):void 0},backUp:function(e){this.pos-=e},column:function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=Fa(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?Fa(this.string,this.lineStart,this.tabSize):0)},indentation:function(){return Fa(this.string,null,this.tabSize)-(this.lineStart?Fa(this.string,this.lineStart,this.tabSize):0)},match:function(e,t,n){if("string"!=typeof e){var r=this.string.slice(this.pos).match(e);return r&&r.index>0?null:(r&&t!==!1&&(this.pos+=r[0].length),r)}var i=function(e){return n?e.toLowerCase():e},o=this.string.substr(this.pos,e.length);return i(o)==i(e)?(t!==!1&&(this.pos+=e.length),!0):void 0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(e,t){this.lineStart+=e;try{return t()}finally{this.lineStart-=e}}};var ga=0,va=e.TextMarker=function(e,t){this.lines=[],this.type=t,this.doc=e,this.id=++ga};Ai(va),va.prototype.clear=function(){if(!this.explicitlyCleared){var e=this.doc.cm,t=e&&!e.curOp;if(t&&bt(e),Ni(this,"clear")){var n=this.find();n&&Ci(this,"clear",n.from,n.to)}for(var r=null,i=null,o=0;o<this.lines.length;++o){var a=this.lines[o],l=er(a.markedSpans,this);e&&!this.collapsed?Ht(e,ti(a),"text"):e&&(null!=l.to&&(i=ti(a)),null!=l.from&&(r=ti(a))),a.markedSpans=tr(a.markedSpans,l),null==l.from&&this.collapsed&&!kr(this.doc,a)&&e&&ei(a,yt(e.display))}if(e&&this.collapsed&&!e.options.lineWrapping)for(var o=0;o<this.lines.length;++o){var s=yr(this.lines[o]),c=f(s);c>e.display.maxLineLength&&(e.display.maxLine=s,e.display.maxLineLength=c,e.display.maxLineChanged=!0)}null!=r&&e&&this.collapsed&&Dt(e,r,i+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,e&&Ae(e.doc)),e&&Ci(e,"markerCleared",e,this),t&&kt(e),this.parent&&this.parent.clear()}},va.prototype.find=function(e,t){null==e&&"bookmark"==this.type&&(e=1);for(var n,r,i=0;i<this.lines.length;++i){var o=this.lines[i],a=er(o.markedSpans,this);if(null!=a.from&&(n=Bo(t?o:ti(o),a.from),-1==e))return n;if(null!=a.to&&(r=Bo(t?o:ti(o),a.to),1==e))return r}return n&&{from:n,to:r}},va.prototype.changed=function(){var e=this.find(-1,!0),t=this,n=this.doc.cm;e&&n&&At(n,function(){var r=e.line,i=ti(e.line),o=Qe(n,i);if(o&&(ot(o),n.curOp.selectionChanged=n.curOp.forceUpdate=!0),n.curOp.updateMaxLine=!0,!kr(t.doc,r)&&null!=t.height){var a=t.height;t.height=null;var l=Lr(t)-a;l&&ei(r,r.height+l)}})},va.prototype.attachLine=function(e){if(!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;t.maybeHiddenMarkers&&-1!=Pi(t.maybeHiddenMarkers,this)||(t.maybeUnhiddenMarkers||(t.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(e)},va.prototype.detachLine=function(e){if(this.lines.splice(Pi(this.lines,e),1),!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;(t.maybeHiddenMarkers||(t.maybeHiddenMarkers=[])).push(this)}};var ga=0,ya=e.SharedTextMarker=function(e,t){this.markers=e,this.primary=t;for(var n=0;n<e.length;++n)e[n].parent=this};Ai(ya),ya.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var e=0;e<this.markers.length;++e)this.markers[e].clear();Ci(this,"clear")}},ya.prototype.find=function(e,t){return this.primary.find(e,t)};var xa=e.LineWidget=function(e,t,n){if(n)for(var r in n)n.hasOwnProperty(r)&&(this[r]=n[r]);this.doc=e,this.node=t};Ai(xa),xa.prototype.clear=function(){var e=this.doc.cm,t=this.line.widgets,n=this.line,r=ti(n);if(null!=r&&t){for(var i=0;i<t.length;++i)t[i]==this&&t.splice(i--,1);t.length||(n.widgets=null);var o=Lr(this);ei(n,Math.max(0,n.height-o)),e&&At(e,function(){Cr(e,n,-o),Ht(e,r,"widget")})}},xa.prototype.changed=function(){var e=this.height,t=this.doc.cm,n=this.line;this.height=null;var r=Lr(this)-e;r&&(ei(n,n.height+r),t&&At(t,function(){t.curOp.forceUpdate=!0,Cr(t,n,r)}))};var ba=e.Line=function(e,t,n){this.text=e,ur(this,t),this.height=n?n(this):1};Ai(ba),ba.prototype.lineNo=function(){return ti(this)};var wa={},ka={};$r.prototype={chunkSize:function(){return this.lines.length},removeInner:function(e,t){for(var n=e,r=e+t;r>n;++n){var i=this.lines[n];this.height-=i.height,Nr(i),Ci(i,"delete")}this.lines.splice(e,t)},collapse:function(e){e.push.apply(e,this.lines)},insertInner:function(e,t,n){this.height+=n,this.lines=this.lines.slice(0,e).concat(t).concat(this.lines.slice(e));for(var r=0;r<t.length;++r)t[r].parent=this},iterN:function(e,t,n){for(var r=e+t;r>e;++e)if(n(this.lines[e]))return!0}},Vr.prototype={chunkSize:function(){return this.size},removeInner:function(e,t){this.size-=t;for(var n=0;n<this.children.length;++n){var r=this.children[n],i=r.chunkSize();if(i>e){var o=Math.min(t,i-e),a=r.height;if(r.removeInner(e,o),this.height-=a-r.height,i==o&&(this.children.splice(n--,1),r.parent=null),0==(t-=o))break;e=0}else e-=i}if(this.size-t<25&&(this.children.length>1||!(this.children[0]instanceof $r))){var l=[];this.collapse(l),this.children=[new $r(l)],this.children[0].parent=this}},collapse:function(e){for(var t=0;t<this.children.length;++t)this.children[t].collapse(e)},insertInner:function(e,t,n){this.size+=t.length,this.height+=n;for(var r=0;r<this.children.length;++r){var i=this.children[r],o=i.chunkSize();if(o>=e){if(i.insertInner(e,t,n),i.lines&&i.lines.length>50){for(var a=i.lines.length%25+25,l=a;l<i.lines.length;){var s=new $r(i.lines.slice(l,l+=25));i.height-=s.height,this.children.splice(++r,0,s),s.parent=this}i.lines=i.lines.slice(0,a),this.maybeSpill()}break}e-=o}},maybeSpill:function(){if(!(this.children.length<=10)){var e=this;do{var t=e.children.splice(e.children.length-5,5),n=new Vr(t);if(e.parent){e.size-=n.size,e.height-=n.height;var r=Pi(e.parent.children,e);e.parent.children.splice(r+1,0,n)}else{var i=new Vr(e.children);i.parent=e,e.children=[i,n],e=i}n.parent=e.parent}while(e.children.length>10);e.parent.maybeSpill()}},iterN:function(e,t,n){for(var r=0;r<this.children.length;++r){var i=this.children[r],o=i.chunkSize();if(o>e){var a=Math.min(t,o-e);if(i.iterN(e,a,n))return!0;if(0==(t-=a))break;e=0}else e-=o}}};var Sa=0,Ca=e.Doc=function(e,t,n,r){if(!(this instanceof Ca))return new Ca(e,t,n,r);null==n&&(n=0),Vr.call(this,[new $r([new ba("",null)])]),this.first=n,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.frontier=n;var i=Bo(n,0);this.sel=de(i),this.history=new oi(null),this.id=++Sa,this.modeOption=t,this.lineSep=r,this.extend=!1,"string"==typeof e&&(e=this.splitLines(e)),Yr(this,{from:i,to:i,text:e}),Te(this,de(i),Wa)};Ca.prototype=Hi(Vr.prototype,{constructor:Ca,iter:function(e,t,n){n?this.iterN(e-this.first,t-e,n):this.iterN(this.first,this.first+this.size,e)},insert:function(e,t){for(var n=0,r=0;r<t.length;++r)n+=t[r].height;this.insertInner(e-this.first,t,n)},remove:function(e,t){this.removeInner(e-this.first,t)},getValue:function(e){var t=Qr(this,this.first,this.first+this.size);return e===!1?t:t.join(e||this.lineSeparator())},setValue:It(function(e){var t=Bo(this.first,0),n=this.first+this.size-1;Tn(this,{from:t,to:Bo(n,Zr(this,n).text.length),text:this.splitLines(e),origin:"setValue",full:!0},!0),Te(this,de(t))}),replaceRange:function(e,t,n,r){t=me(this,t),n=n?me(this,n):t,In(this,e,t,n,r)},getRange:function(e,t,n){var r=Jr(this,me(this,e),me(this,t));return n===!1?r:r.join(n||this.lineSeparator())},getLine:function(e){var t=this.getLineHandle(e);return t&&t.text},getLineHandle:function(e){return ve(this,e)?Zr(this,e):void 0},getLineNumber:function(e){return ti(e)},getLineHandleVisualStart:function(e){return"number"==typeof e&&(e=Zr(this,e)),yr(e)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(e){return me(this,e)},getCursor:function(e){var t,n=this.sel.primary();return t=null==e||"head"==e?n.head:"anchor"==e?n.anchor:"end"==e||"to"==e||e===!1?n.to():n.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:It(function(e,t,n){Se(this,me(this,"number"==typeof e?Bo(e,t||0):e),null,n)}),setSelection:It(function(e,t,n){Se(this,me(this,e),me(this,t||e),n)}),extendSelection:It(function(e,t,n){be(this,me(this,e),t&&me(this,t),n)}),extendSelections:It(function(e,t){we(this,ye(this,e),t)}),extendSelectionsBy:It(function(e,t){var n=Ri(this.sel.ranges,e);we(this,ye(this,n),t)}),setSelections:It(function(e,t,n){if(e.length){for(var r=0,i=[];r<e.length;r++)i[r]=new fe(me(this,e[r].anchor),me(this,e[r].head));null==t&&(t=Math.min(e.length-1,this.sel.primIndex)),Te(this,he(i,t),n)}}),addSelection:It(function(e,t,n){var r=this.sel.ranges.slice(0);r.push(new fe(me(this,e),me(this,t||e))),Te(this,he(r,r.length-1),n)}),getSelection:function(e){for(var t,n=this.sel.ranges,r=0;r<n.length;r++){var i=Jr(this,n[r].from(),n[r].to());t=t?t.concat(i):i}return e===!1?t:t.join(e||this.lineSeparator())},getSelections:function(e){for(var t=[],n=this.sel.ranges,r=0;r<n.length;r++){var i=Jr(this,n[r].from(),n[r].to());e!==!1&&(i=i.join(e||this.lineSeparator())),t[r]=i}return t},replaceSelection:function(e,t,n){for(var r=[],i=0;i<this.sel.ranges.length;i++)r[i]=e;this.replaceSelections(r,t,n||"+input")},replaceSelections:It(function(e,t,n){for(var r=[],i=this.sel,o=0;o<i.ranges.length;o++){var a=i.ranges[o];r[o]={from:a.from(),to:a.to(),text:this.splitLines(e[o]),origin:n}}for(var l=t&&"end"!=t&&Cn(this,r,t),o=r.length-1;o>=0;o--)Tn(this,r[o]);l?Le(this,l):this.cm&&Bn(this.cm)}),undo:It(function(){Nn(this,"undo")}),redo:It(function(){Nn(this,"redo")}),undoSelection:It(function(){Nn(this,"undo",!0)}),redoSelection:It(function(){Nn(this,"redo",!0)}),setExtending:function(e){this.extend=e},getExtending:function(){return this.extend},historySize:function(){for(var e=this.history,t=0,n=0,r=0;r<e.done.length;r++)e.done[r].ranges||++t;for(var r=0;r<e.undone.length;r++)e.undone[r].ranges||++n;return{undo:t,redo:n}},clearHistory:function(){this.history=new oi(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(e){return e&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(e){return this.history.generation==(e||this.cleanGeneration)},getHistory:function(){return{done:gi(this.history.done),undone:gi(this.history.undone)}},setHistory:function(e){var t=this.history=new oi(this.history.maxGeneration);t.done=gi(e.done.slice(0),null,!0),t.undone=gi(e.undone.slice(0),null,!0)},addLineClass:It(function(e,t,n){return zn(this,e,"gutter"==t?"gutter":"class",function(e){var r="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass";if(e[r]){if(Yi(n).test(e[r]))return!1;e[r]+=" "+n}else e[r]=n;return!0})}),removeLineClass:It(function(e,t,n){return zn(this,e,"gutter"==t?"gutter":"class",function(e){var r="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass",i=e[r];if(!i)return!1;if(null==n)e[r]=null;else{var o=i.match(Yi(n));if(!o)return!1;var a=o.index+o[0].length;e[r]=i.slice(0,o.index)+(o.index&&a!=i.length?" ":"")+i.slice(a)||null}return!0})}),addLineWidget:It(function(e,t,n){return Tr(this,e,t,n)}),removeLineWidget:function(e){e.clear()},markText:function(e,t,n){return Vn(this,me(this,e),me(this,t),n,n&&n.type||"range")},setBookmark:function(e,t){var n={replacedWith:t&&(null==t.nodeType?t.widget:t),insertLeft:t&&t.insertLeft,clearWhenEmpty:!1,shared:t&&t.shared,handleMouseEvents:t&&t.handleMouseEvents};return e=me(this,e),Vn(this,e,e,n,"bookmark")},findMarksAt:function(e){e=me(this,e);var t=[],n=Zr(this,e.line).markedSpans;if(n)for(var r=0;r<n.length;++r){var i=n[r];(null==i.from||i.from<=e.ch)&&(null==i.to||i.to>=e.ch)&&t.push(i.marker.parent||i.marker)}return t},findMarks:function(e,t,n){e=me(this,e),t=me(this,t);var r=[],i=e.line;return this.iter(e.line,t.line+1,function(o){var a=o.markedSpans;if(a)for(var l=0;l<a.length;l++){var s=a[l];null!=s.to&&i==e.line&&e.ch>=s.to||null==s.from&&i!=e.line||null!=s.from&&i==t.line&&s.from>=t.ch||n&&!n(s.marker)||r.push(s.marker.parent||s.marker)}++i}),r},getAllMarks:function(){var e=[];return this.iter(function(t){var n=t.markedSpans;if(n)for(var r=0;r<n.length;++r)null!=n[r].from&&e.push(n[r].marker)}),e},posFromIndex:function(e){var t,n=this.first,r=this.lineSeparator().length;return this.iter(function(i){var o=i.text.length+r;return o>e?(t=e,!0):(e-=o,void++n)}),me(this,Bo(n,t))},indexFromPos:function(e){e=me(this,e);var t=e.ch;if(e.line<this.first||e.ch<0)return 0;var n=this.lineSeparator().length;return this.iter(this.first,e.line,function(e){t+=e.text.length+n}),t},copy:function(e){var t=new Ca(Qr(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep);return t.scrollTop=this.scrollTop,t.scrollLeft=this.scrollLeft,t.sel=this.sel,t.extend=!1,e&&(t.history.undoDepth=this.history.undoDepth,t.setHistory(this.getHistory())),t},linkedDoc:function(e){e||(e={});var t=this.first,n=this.first+this.size;null!=e.from&&e.from>t&&(t=e.from),null!=e.to&&e.to<n&&(n=e.to);var r=new Ca(Qr(this,t,n),e.mode||this.modeOption,t,this.lineSep);return e.sharedHist&&(r.history=this.history),(this.linked||(this.linked=[])).push({doc:r,sharedHist:e.sharedHist}),r.linked=[{doc:this,isParent:!0,sharedHist:e.sharedHist}],Zn(r,Xn(this)),r},unlinkDoc:function(t){if(t instanceof e&&(t=t.doc),this.linked)for(var n=0;n<this.linked.length;++n){var r=this.linked[n];if(r.doc==t){this.linked.splice(n,1),t.unlinkDoc(this),Jn(Xn(this));break}}if(t.history==this.history){var i=[t.id];Kr(t,function(e){i.push(e.id)},!0),t.history=new oi(null),t.history.done=gi(this.history.done,i),t.history.undone=gi(this.history.undone,i)}},iterLinkedDocs:function(e){Kr(this,e)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(e){return this.lineSep?e.split(this.lineSep):tl(e)},lineSeparator:function(){return this.lineSep||"\n"}}),Ca.prototype.eachLine=Ca.prototype.iter;var La="iter insert remove copy getEditor constructor".split(" ");for(var Ta in Ca.prototype)Ca.prototype.hasOwnProperty(Ta)&&Pi(La,Ta)<0&&(e.prototype[Ta]=function(e){return function(){return e.apply(this.doc,arguments)}}(Ca.prototype[Ta]));Ai(Ca);var Ma=e.e_preventDefault=function(e){e.preventDefault?e.preventDefault():e.returnValue=!1},Na=e.e_stopPropagation=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},Aa=e.e_stop=function(e){Ma(e),Na(e)},Ea=e.on=function(e,t,n){if(e.addEventListener)e.addEventListener(t,n,!1);else if(e.attachEvent)e.attachEvent("on"+t,n);else{var r=e._handlers||(e._handlers={}),i=r[t]||(r[t]=[]);i.push(n)}},Oa=[],Ia=e.off=function(e,t,n){if(e.removeEventListener)e.removeEventListener(t,n,!1);else if(e.detachEvent)e.detachEvent("on"+t,n);else for(var r=Si(e,t,!1),i=0;i<r.length;++i)if(r[i]==n){r.splice(i,1);break}},Pa=e.signal=function(e,t){var n=Si(e,t,!0);if(n.length)for(var r=Array.prototype.slice.call(arguments,2),i=0;i<n.length;++i)n[i].apply(null,r)},Ra=null,Da=30,Ha=e.Pass={toString:function(){return"CodeMirror.Pass"}},Wa={scroll:!1},Ba={origin:"*mouse"},_a={origin:"+move"};Ei.prototype.set=function(e,t){clearTimeout(this.id),this.id=setTimeout(t,e)};var Fa=e.countColumn=function(e,t,n,r,i){null==t&&(t=e.search(/[^\s\u00a0]/),-1==t&&(t=e.length));for(var o=r||0,a=i||0;;){var l=e.indexOf("	",o);if(0>l||l>=t)return a+(t-o);a+=l-o,a+=n-a%n,o=l+1}},za=e.findColumn=function(e,t,n){for(var r=0,i=0;;){var o=e.indexOf("	",r);-1==o&&(o=e.length);var a=o-r;if(o==e.length||i+a>=t)return r+Math.min(a,t-i);if(i+=o-r,i+=n-i%n,r=o+1,i>=t)return r}},ja=[""],Ua=function(e){e.select()};No?Ua=function(e){e.selectionStart=0,e.selectionEnd=e.value.length}:xo&&(Ua=function(e){try{e.select()}catch(t){}});var qa,Ga=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/,Ya=e.isWordChar=function(e){return/\w/.test(e)||e>"€"&&(e.toUpperCase()!=e.toLowerCase()||Ga.test(e))},$a=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;qa=document.createRange?function(e,t,n,r){var i=document.createRange();return i.setEnd(r||e,n),i.setStart(e,t),i}:function(e,t,n){var r=document.body.createTextRange();try{r.moveToElementText(e.parentNode)}catch(i){return r}return r.collapse(!0),r.moveEnd("character",n),r.moveStart("character",t),r};var Va=e.contains=function(e,t){if(3==t.nodeType&&(t=t.parentNode),e.contains)return e.contains(t);do if(11==t.nodeType&&(t=t.host),t==e)return!0;while(t=t.parentNode)};xo&&11>bo&&(Gi=function(){try{return document.activeElement}catch(e){return document.body}});var Ka,Xa,Za=e.rmClass=function(e,t){var n=e.className,r=Yi(t).exec(n);if(r){var i=n.slice(r.index+r[0].length);e.className=n.slice(0,r.index)+(i?r[1]+i:"")}},Ja=e.addClass=function(e,t){var n=e.className;Yi(t).test(n)||(e.className+=(n?" ":"")+t)},Qa=!1,el=function(){if(xo&&9>bo)return!1;var e=ji("div");return"draggable"in e||"dragDrop"in e}(),tl=e.splitLines=3!="\n\nb".split(/\n/).length?function(e){for(var t=0,n=[],r=e.length;r>=t;){var i=e.indexOf("\n",t);-1==i&&(i=e.length);var o=e.slice(t,"\r"==e.charAt(i-1)?i-1:i),a=o.indexOf("\r");-1!=a?(n.push(o.slice(0,a)),t+=a+1):(n.push(o),t=i+1)}return n}:function(e){return e.split(/\r\n?|\n/)},nl=window.getSelection?function(e){try{return e.selectionStart!=e.selectionEnd}catch(t){return!1}}:function(e){try{var t=e.ownerDocument.selection.createRange()}catch(n){}return t&&t.parentElement()==e?0!=t.compareEndPoints("StartToEnd",t):!1},rl=function(){var e=ji("div");return"oncopy"in e?!0:(e.setAttribute("oncopy","return;"),"function"==typeof e.oncopy)}(),il=null,ol=e.keyNames={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",127:"Delete",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"};!function(){for(var e=0;10>e;e++)ol[e+48]=ol[e+96]=String(e);for(var e=65;90>=e;e++)ol[e]=String.fromCharCode(e);for(var e=1;12>=e;e++)ol[e+111]=ol[e+63235]="F"+e}();var al,ll=function(){function e(e){return 247>=e?n.charAt(e):e>=1424&&1524>=e?"R":e>=1536&&1773>=e?r.charAt(e-1536):e>=1774&&2220>=e?"r":e>=8192&&8203>=e?"w":8204==e?"b":"L"}function t(e,t,n){this.level=e,this.from=t,this.to=n}var n="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN",r="rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm",i=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,o=/[stwN]/,a=/[LRr]/,l=/[Lb1n]/,s=/[1n]/,c="L";return function(n){if(!i.test(n))return!1;for(var r,u=n.length,f=[],h=0;u>h;++h)f.push(r=e(n.charCodeAt(h)));for(var h=0,d=c;u>h;++h){var r=f[h];"m"==r?f[h]=d:d=r}for(var h=0,p=c;u>h;++h){var r=f[h];"1"==r&&"r"==p?f[h]="n":a.test(r)&&(p=r,"r"==r&&(f[h]="R"))}for(var h=1,d=f[0];u-1>h;++h){var r=f[h];"+"==r&&"1"==d&&"1"==f[h+1]?f[h]="1":","!=r||d!=f[h+1]||"1"!=d&&"n"!=d||(f[h]=d),d=r}for(var h=0;u>h;++h){var r=f[h];if(","==r)f[h]="N";else if("%"==r){for(var m=h+1;u>m&&"%"==f[m];++m);for(var g=h&&"!"==f[h-1]||u>m&&"1"==f[m]?"1":"N",v=h;m>v;++v)f[v]=g;h=m-1}}for(var h=0,p=c;u>h;++h){var r=f[h];"L"==p&&"1"==r?f[h]="L":a.test(r)&&(p=r)}for(var h=0;u>h;++h)if(o.test(f[h])){for(var m=h+1;u>m&&o.test(f[m]);++m);for(var y="L"==(h?f[h-1]:c),x="L"==(u>m?f[m]:c),g=y||x?"L":"R",v=h;m>v;++v)f[v]=g;h=m-1}for(var b,w=[],h=0;u>h;)if(l.test(f[h])){var k=h;for(++h;u>h&&l.test(f[h]);++h);w.push(new t(0,k,h))}else{var S=h,C=w.length;for(++h;u>h&&"L"!=f[h];++h);for(var v=S;h>v;)if(s.test(f[v])){v>S&&w.splice(C,0,new t(1,S,v));var L=v;for(++v;h>v&&s.test(f[v]);++v);w.splice(C,0,new t(2,L,v)),S=v}else++v;h>S&&w.splice(C,0,new t(1,S,h))}return 1==w[0].level&&(b=n.match(/^\s+/))&&(w[0].from=b[0].length,w.unshift(new t(0,0,b[0].length))),1==Ii(w).level&&(b=n.match(/\s+$/))&&(Ii(w).to-=b[0].length,w.push(new t(0,u-b[0].length,u))),2==w[0].level&&w.unshift(new t(1,w[0].to,w[0].to)),w[0].level!=Ii(w).level&&w.push(new t(w[0].level,u,u)),w}}();return e.version="5.15.2",e})},{}],11:[function(t,n,r){!function(i){"object"==typeof r&&"object"==typeof n?i(t("../../lib/codemirror"),t("../markdown/markdown"),t("../../addon/mode/overlay")):"function"==typeof e&&e.amd?e(["../../lib/codemirror","../markdown/markdown","../../addon/mode/overlay"],i):i(CodeMirror)}(function(e){"use strict";var t=/^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i;e.defineMode("gfm",function(n,r){function i(e){return e.code=!1,null}var o=0,a={startState:function(){return{code:!1,codeBlock:!1,ateSpace:!1}},copyState:function(e){return{code:e.code,codeBlock:e.codeBlock,ateSpace:e.ateSpace}},token:function(e,n){if(n.combineTokens=null,n.codeBlock)return e.match(/^```+/)?(n.codeBlock=!1,null):(e.skipToEnd(),null);if(e.sol()&&(n.code=!1),e.sol()&&e.match(/^```+/))return e.skipToEnd(),n.codeBlock=!0,null;if("`"===e.peek()){e.next();var i=e.pos;e.eatWhile("`");var a=1+e.pos-i;return n.code?a===o&&(n.code=!1):(o=a,n.code=!0),null}if(n.code)return e.next(),null;if(e.eatSpace())return n.ateSpace=!0,null;if((e.sol()||n.ateSpace)&&(n.ateSpace=!1,r.gitHubSpice!==!1)){if(e.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/))return n.combineTokens=!0,"link";if(e.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/))return n.combineTokens=!0,"link"}return e.match(t)&&"]("!=e.string.slice(e.start-2,e.start)&&(0==e.start||/\W/.test(e.string.charAt(e.start-1)))?(n.combineTokens=!0,"link"):(e.next(),null)},blankLine:i},l={underscoresBreakWords:!1,taskLists:!0,fencedCodeBlocks:"```",strikethrough:!0};for(var s in r)l[s]=r[s];return l.name="markdown",e.overlayMode(e.getMode(n,l),a)},"markdown"),e.defineMIME("text/x-gfm","gfm")})},{"../../addon/mode/overlay":8,"../../lib/codemirror":10,"../markdown/markdown":12}],12:[function(t,n,r){!function(i){"object"==typeof r&&"object"==typeof n?i(t("../../lib/codemirror"),t("../xml/xml"),t("../meta")):"function"==typeof e&&e.amd?e(["../../lib/codemirror","../xml/xml","../meta"],i):i(CodeMirror)}(function(e){"use strict";e.defineMode("markdown",function(t,n){function r(n){if(e.findModeByName){var r=e.findModeByName(n);r&&(n=r.mime||r.mimes[0])}var i=e.getMode(t,n);return"null"==i.name?null:i}function i(e,t,n){return t.f=t.inline=n,n(e,t)}function o(e,t,n){return t.f=t.block=n,n(e,t)}function a(e){return!e||!/\S/.test(e.string)}function l(e){return e.linkTitle=!1,e.em=!1,e.strong=!1,e.strikethrough=!1,e.quote=0,e.indentedCode=!1,k&&e.f==c&&(e.f=p,e.block=s),e.trailingSpace=0,e.trailingSpaceNewLine=!1,e.prevLine=e.thisLine,e.thisLine=null,null}function s(t,o){var l=t.sol(),s=o.list!==!1,c=o.indentedCode;o.indentedCode=!1,s&&(o.indentationDiff>=0?(o.indentationDiff<4&&(o.indentation-=o.indentationDiff),o.list=null):o.indentation>0?o.list=null:o.list=!1);var f=null;if(o.indentationDiff>=4)return t.skipToEnd(),c||a(o.prevLine)?(o.indentation-=4,o.indentedCode=!0,S.code):null;if(t.eatSpace())return null;if((f=t.match(A))&&f[1].length<=6)return o.header=f[1].length,n.highlightFormatting&&(o.formatting="header"),o.f=o.inline,h(o);if(!(a(o.prevLine)||o.quote||s||c)&&(f=t.match(E)))return o.header="="==f[0].charAt(0)?1:2,n.highlightFormatting&&(o.formatting="header"),o.f=o.inline,h(o);if(t.eat(">"))return o.quote=l?1:o.quote+1,n.highlightFormatting&&(o.formatting="quote"),t.eatSpace(),h(o);if("["===t.peek())return i(t,o,y);if(t.match(L,!0))return o.hr=!0,S.hr;if((a(o.prevLine)||s)&&(t.match(T,!1)||t.match(M,!1))){var d=null;for(t.match(T,!0)?d="ul":(t.match(M,!0),d="ol"),o.indentation=t.column()+t.current().length,o.list=!0;o.listStack&&t.column()<o.listStack[o.listStack.length-1];)o.listStack.pop();return o.listStack.push(o.indentation),n.taskLists&&t.match(N,!1)&&(o.taskList=!0),o.f=o.inline,n.highlightFormatting&&(o.formatting=["list","list-"+d]),h(o)}return n.fencedCodeBlocks&&(f=t.match(I,!0))?(o.fencedChars=f[1],o.localMode=r(f[2]),o.localMode&&(o.localState=e.startState(o.localMode)),o.f=o.block=u,n.highlightFormatting&&(o.formatting="code-block"),o.code=-1,h(o)):i(t,o,o.inline)}function c(t,n){var r=w.token(t,n.htmlState);if(!k){var i=e.innerMode(w,n.htmlState);("xml"==i.mode.name&&null===i.state.tagStart&&!i.state.context&&i.state.tokenize.isInText||n.md_inside&&t.current().indexOf(">")>-1)&&(n.f=p,n.block=s,n.htmlState=null)}return r}function u(e,t){return t.fencedChars&&e.match(t.fencedChars,!1)?(t.localMode=t.localState=null,t.f=t.block=f,null):t.localMode?t.localMode.token(e,t.localState):(e.skipToEnd(),S.code)}function f(e,t){e.match(t.fencedChars),t.block=s,t.f=p,t.fencedChars=null,n.highlightFormatting&&(t.formatting="code-block"),t.code=1;var r=h(t);return t.code=0,r}function h(e){var t=[];if(e.formatting){t.push(S.formatting),"string"==typeof e.formatting&&(e.formatting=[e.formatting]);for(var r=0;r<e.formatting.length;r++)t.push(S.formatting+"-"+e.formatting[r]),"header"===e.formatting[r]&&t.push(S.formatting+"-"+e.formatting[r]+"-"+e.header),"quote"===e.formatting[r]&&(!n.maxBlockquoteDepth||n.maxBlockquoteDepth>=e.quote?t.push(S.formatting+"-"+e.formatting[r]+"-"+e.quote):t.push("error"))}if(e.taskOpen)return t.push("meta"),t.length?t.join(" "):null;if(e.taskClosed)return t.push("property"),t.length?t.join(" "):null;if(e.linkHref?t.push(S.linkHref,"url"):(e.strong&&t.push(S.strong),e.em&&t.push(S.em),e.strikethrough&&t.push(S.strikethrough),e.linkText&&t.push(S.linkText),e.code&&t.push(S.code)),e.header&&t.push(S.header,S.header+"-"+e.header),e.quote&&(t.push(S.quote),!n.maxBlockquoteDepth||n.maxBlockquoteDepth>=e.quote?t.push(S.quote+"-"+e.quote):t.push(S.quote+"-"+n.maxBlockquoteDepth)),e.list!==!1){var i=(e.listStack.length-1)%3;i?1===i?t.push(S.list2):t.push(S.list3):t.push(S.list1)}return e.trailingSpaceNewLine?t.push("trailing-space-new-line"):e.trailingSpace&&t.push("trailing-space-"+(e.trailingSpace%2?"a":"b")),t.length?t.join(" "):null}function d(e,t){return e.match(O,!0)?h(t):void 0}function p(t,r){var i=r.text(t,r);if("undefined"!=typeof i)return i;if(r.list)return r.list=null,h(r);if(r.taskList){var a="x"!==t.match(N,!0)[1];return a?r.taskOpen=!0:r.taskClosed=!0,n.highlightFormatting&&(r.formatting="task"),r.taskList=!1,h(r)}if(r.taskOpen=!1,r.taskClosed=!1,r.header&&t.match(/^#+$/,!0))return n.highlightFormatting&&(r.formatting="header"),
+h(r);var l=t.sol(),s=t.next();if(r.linkTitle){r.linkTitle=!1;var u=s;"("===s&&(u=")"),u=(u+"").replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1");var f="^\\s*(?:[^"+u+"\\\\]+|\\\\\\\\|\\\\.)"+u;if(t.match(new RegExp(f),!0))return S.linkHref}if("`"===s){var d=r.formatting;n.highlightFormatting&&(r.formatting="code"),t.eatWhile("`");var p=t.current().length;if(0==r.code)return r.code=p,h(r);if(p==r.code){var v=h(r);return r.code=0,v}return r.formatting=d,h(r)}if(r.code)return h(r);if("\\"===s&&(t.next(),n.highlightFormatting)){var y=h(r),x=S.formatting+"-escape";return y?y+" "+x:x}if("!"===s&&t.match(/\[[^\]]*\] ?(?:\(|\[)/,!1))return t.match(/\[[^\]]*\]/),r.inline=r.f=g,S.image;if("["===s&&t.match(/[^\]]*\](\(.*\)| ?\[.*?\])/,!1))return r.linkText=!0,n.highlightFormatting&&(r.formatting="link"),h(r);if("]"===s&&r.linkText&&t.match(/\(.*?\)| ?\[.*?\]/,!1)){n.highlightFormatting&&(r.formatting="link");var y=h(r);return r.linkText=!1,r.inline=r.f=g,y}if("<"===s&&t.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/,!1)){r.f=r.inline=m,n.highlightFormatting&&(r.formatting="link");var y=h(r);return y?y+=" ":y="",y+S.linkInline}if("<"===s&&t.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/,!1)){r.f=r.inline=m,n.highlightFormatting&&(r.formatting="link");var y=h(r);return y?y+=" ":y="",y+S.linkEmail}if("<"===s&&t.match(/^(!--|\w)/,!1)){var b=t.string.indexOf(">",t.pos);if(-1!=b){var k=t.string.substring(t.start,b);/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(k)&&(r.md_inside=!0)}return t.backUp(1),r.htmlState=e.startState(w),o(t,r,c)}if("<"===s&&t.match(/^\/\w*?>/))return r.md_inside=!1,"tag";var C=!1;if(!n.underscoresBreakWords&&"_"===s&&"_"!==t.peek()&&t.match(/(\w)/,!1)){var L=t.pos-2;if(L>=0){var T=t.string.charAt(L);"_"!==T&&T.match(/(\w)/,!1)&&(C=!0)}}if("*"===s||"_"===s&&!C)if(l&&" "===t.peek());else{if(r.strong===s&&t.eat(s)){n.highlightFormatting&&(r.formatting="strong");var v=h(r);return r.strong=!1,v}if(!r.strong&&t.eat(s))return r.strong=s,n.highlightFormatting&&(r.formatting="strong"),h(r);if(r.em===s){n.highlightFormatting&&(r.formatting="em");var v=h(r);return r.em=!1,v}if(!r.em)return r.em=s,n.highlightFormatting&&(r.formatting="em"),h(r)}else if(" "===s&&(t.eat("*")||t.eat("_"))){if(" "===t.peek())return h(r);t.backUp(1)}if(n.strikethrough)if("~"===s&&t.eatWhile(s)){if(r.strikethrough){n.highlightFormatting&&(r.formatting="strikethrough");var v=h(r);return r.strikethrough=!1,v}if(t.match(/^[^\s]/,!1))return r.strikethrough=!0,n.highlightFormatting&&(r.formatting="strikethrough"),h(r)}else if(" "===s&&t.match(/^~~/,!0)){if(" "===t.peek())return h(r);t.backUp(2)}return" "===s&&(t.match(/ +$/,!1)?r.trailingSpace++:r.trailingSpace&&(r.trailingSpaceNewLine=!0)),h(r)}function m(e,t){var r=e.next();if(">"===r){t.f=t.inline=p,n.highlightFormatting&&(t.formatting="link");var i=h(t);return i?i+=" ":i="",i+S.linkInline}return e.match(/^[^>]+/,!0),S.linkInline}function g(e,t){if(e.eatSpace())return null;var r=e.next();return"("===r||"["===r?(t.f=t.inline=v("("===r?")":"]",0),n.highlightFormatting&&(t.formatting="link-string"),t.linkHref=!0,h(t)):"error"}function v(e){return function(t,r){var i=t.next();if(i===e){r.f=r.inline=p,n.highlightFormatting&&(r.formatting="link-string");var o=h(r);return r.linkHref=!1,o}return t.match(P[e]),r.linkHref=!0,h(r)}}function y(e,t){return e.match(/^([^\]\\]|\\.)*\]:/,!1)?(t.f=x,e.next(),n.highlightFormatting&&(t.formatting="link"),t.linkText=!0,h(t)):i(e,t,p)}function x(e,t){if(e.match(/^\]:/,!0)){t.f=t.inline=b,n.highlightFormatting&&(t.formatting="link");var r=h(t);return t.linkText=!1,r}return e.match(/^([^\]\\]|\\.)+/,!0),S.linkText}function b(e,t){return e.eatSpace()?null:(e.match(/^[^\s]+/,!0),void 0===e.peek()?t.linkTitle=!0:e.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/,!0),t.f=t.inline=p,S.linkHref+" url")}var w=e.getMode(t,"text/html"),k="null"==w.name;void 0===n.highlightFormatting&&(n.highlightFormatting=!1),void 0===n.maxBlockquoteDepth&&(n.maxBlockquoteDepth=0),void 0===n.underscoresBreakWords&&(n.underscoresBreakWords=!0),void 0===n.taskLists&&(n.taskLists=!1),void 0===n.strikethrough&&(n.strikethrough=!1),void 0===n.tokenTypeOverrides&&(n.tokenTypeOverrides={});var S={header:"header",code:"comment",quote:"quote",list1:"variable-2",list2:"variable-3",list3:"keyword",hr:"hr",image:"tag",formatting:"formatting",linkInline:"link",linkEmail:"link",linkText:"link",linkHref:"string",em:"em",strong:"strong",strikethrough:"strikethrough"};for(var C in S)S.hasOwnProperty(C)&&n.tokenTypeOverrides[C]&&(S[C]=n.tokenTypeOverrides[C]);var L=/^([*\-_])(?:\s*\1){2,}\s*$/,T=/^[*\-+]\s+/,M=/^[0-9]+([.)])\s+/,N=/^\[(x| )\](?=\s)/,A=n.allowAtxHeaderWithoutSpace?/^(#+)/:/^(#+)(?: |$)/,E=/^ *(?:\={1,}|-{1,})\s*$/,O=/^[^#!\[\]*_\\<>` "'(~]+/,I=new RegExp("^("+(n.fencedCodeBlocks===!0?"~~~+|```+":n.fencedCodeBlocks)+")[ \\t]*([\\w+#-]*)"),P={")":/^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,"]":/^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\\]]|\\.)*\])*?(?=\])/},R={startState:function(){return{f:s,prevLine:null,thisLine:null,block:s,htmlState:null,indentation:0,inline:p,text:d,formatting:!1,linkText:!1,linkHref:!1,linkTitle:!1,code:0,em:!1,strong:!1,header:0,hr:!1,taskList:!1,list:!1,listStack:[],quote:0,trailingSpace:0,trailingSpaceNewLine:!1,strikethrough:!1,fencedChars:null}},copyState:function(t){return{f:t.f,prevLine:t.prevLine,thisLine:t.thisLine,block:t.block,htmlState:t.htmlState&&e.copyState(w,t.htmlState),indentation:t.indentation,localMode:t.localMode,localState:t.localMode?e.copyState(t.localMode,t.localState):null,inline:t.inline,text:t.text,formatting:!1,linkTitle:t.linkTitle,code:t.code,em:t.em,strong:t.strong,strikethrough:t.strikethrough,header:t.header,hr:t.hr,taskList:t.taskList,list:t.list,listStack:t.listStack.slice(0),quote:t.quote,indentedCode:t.indentedCode,trailingSpace:t.trailingSpace,trailingSpaceNewLine:t.trailingSpaceNewLine,md_inside:t.md_inside,fencedChars:t.fencedChars}},token:function(e,t){if(t.formatting=!1,e!=t.thisLine){var n=t.header||t.hr;if(t.header=0,t.hr=!1,e.match(/^\s*$/,!0)||n){if(l(t),!n)return null;t.prevLine=null}t.prevLine=t.thisLine,t.thisLine=e,t.taskList=!1,t.trailingSpace=0,t.trailingSpaceNewLine=!1,t.f=t.block;var r=e.match(/^\s*/,!0)[0].replace(/\t/g,"    ").length;if(t.indentationDiff=Math.min(r-t.indentation,4),t.indentation=t.indentation+t.indentationDiff,r>0)return null}return t.f(e,t)},innerMode:function(e){return e.block==c?{state:e.htmlState,mode:w}:e.localState?{state:e.localState,mode:e.localMode}:{state:e,mode:R}},blankLine:l,getType:h,fold:"markdown"};return R},"xml"),e.defineMIME("text/x-markdown","markdown")})},{"../../lib/codemirror":10,"../meta":13,"../xml/xml":14}],13:[function(t,n,r){!function(i){"object"==typeof r&&"object"==typeof n?i(t("../lib/codemirror")):"function"==typeof e&&e.amd?e(["../lib/codemirror"],i):i(CodeMirror)}(function(e){"use strict";e.modeInfo=[{name:"APL",mime:"text/apl",mode:"apl",ext:["dyalog","apl"]},{name:"PGP",mimes:["application/pgp","application/pgp-keys","application/pgp-signature"],mode:"asciiarmor",ext:["pgp"]},{name:"ASN.1",mime:"text/x-ttcn-asn",mode:"asn.1",ext:["asn","asn1"]},{name:"Asterisk",mime:"text/x-asterisk",mode:"asterisk",file:/^extensions\.conf$/i},{name:"Brainfuck",mime:"text/x-brainfuck",mode:"brainfuck",ext:["b","bf"]},{name:"C",mime:"text/x-csrc",mode:"clike",ext:["c","h"]},{name:"C++",mime:"text/x-c++src",mode:"clike",ext:["cpp","c++","cc","cxx","hpp","h++","hh","hxx"],alias:["cpp"]},{name:"Cobol",mime:"text/x-cobol",mode:"cobol",ext:["cob","cpy"]},{name:"C#",mime:"text/x-csharp",mode:"clike",ext:["cs"],alias:["csharp"]},{name:"Clojure",mime:"text/x-clojure",mode:"clojure",ext:["clj","cljc","cljx"]},{name:"ClojureScript",mime:"text/x-clojurescript",mode:"clojure",ext:["cljs"]},{name:"Closure Stylesheets (GSS)",mime:"text/x-gss",mode:"css",ext:["gss"]},{name:"CMake",mime:"text/x-cmake",mode:"cmake",ext:["cmake","cmake.in"],file:/^CMakeLists.txt$/},{name:"CoffeeScript",mime:"text/x-coffeescript",mode:"coffeescript",ext:["coffee"],alias:["coffee","coffee-script"]},{name:"Common Lisp",mime:"text/x-common-lisp",mode:"commonlisp",ext:["cl","lisp","el"],alias:["lisp"]},{name:"Cypher",mime:"application/x-cypher-query",mode:"cypher",ext:["cyp","cypher"]},{name:"Cython",mime:"text/x-cython",mode:"python",ext:["pyx","pxd","pxi"]},{name:"Crystal",mime:"text/x-crystal",mode:"crystal",ext:["cr"]},{name:"CSS",mime:"text/css",mode:"css",ext:["css"]},{name:"CQL",mime:"text/x-cassandra",mode:"sql",ext:["cql"]},{name:"D",mime:"text/x-d",mode:"d",ext:["d"]},{name:"Dart",mimes:["application/dart","text/x-dart"],mode:"dart",ext:["dart"]},{name:"diff",mime:"text/x-diff",mode:"diff",ext:["diff","patch"]},{name:"Django",mime:"text/x-django",mode:"django"},{name:"Dockerfile",mime:"text/x-dockerfile",mode:"dockerfile",file:/^Dockerfile$/},{name:"DTD",mime:"application/xml-dtd",mode:"dtd",ext:["dtd"]},{name:"Dylan",mime:"text/x-dylan",mode:"dylan",ext:["dylan","dyl","intr"]},{name:"EBNF",mime:"text/x-ebnf",mode:"ebnf"},{name:"ECL",mime:"text/x-ecl",mode:"ecl",ext:["ecl"]},{name:"edn",mime:"application/edn",mode:"clojure",ext:["edn"]},{name:"Eiffel",mime:"text/x-eiffel",mode:"eiffel",ext:["e"]},{name:"Elm",mime:"text/x-elm",mode:"elm",ext:["elm"]},{name:"Embedded Javascript",mime:"application/x-ejs",mode:"htmlembedded",ext:["ejs"]},{name:"Embedded Ruby",mime:"application/x-erb",mode:"htmlembedded",ext:["erb"]},{name:"Erlang",mime:"text/x-erlang",mode:"erlang",ext:["erl"]},{name:"Factor",mime:"text/x-factor",mode:"factor",ext:["factor"]},{name:"FCL",mime:"text/x-fcl",mode:"fcl"},{name:"Forth",mime:"text/x-forth",mode:"forth",ext:["forth","fth","4th"]},{name:"Fortran",mime:"text/x-fortran",mode:"fortran",ext:["f","for","f77","f90"]},{name:"F#",mime:"text/x-fsharp",mode:"mllike",ext:["fs"],alias:["fsharp"]},{name:"Gas",mime:"text/x-gas",mode:"gas",ext:["s"]},{name:"Gherkin",mime:"text/x-feature",mode:"gherkin",ext:["feature"]},{name:"GitHub Flavored Markdown",mime:"text/x-gfm",mode:"gfm",file:/^(readme|contributing|history).md$/i},{name:"Go",mime:"text/x-go",mode:"go",ext:["go"]},{name:"Groovy",mime:"text/x-groovy",mode:"groovy",ext:["groovy","gradle"]},{name:"HAML",mime:"text/x-haml",mode:"haml",ext:["haml"]},{name:"Haskell",mime:"text/x-haskell",mode:"haskell",ext:["hs"]},{name:"Haskell (Literate)",mime:"text/x-literate-haskell",mode:"haskell-literate",ext:["lhs"]},{name:"Haxe",mime:"text/x-haxe",mode:"haxe",ext:["hx"]},{name:"HXML",mime:"text/x-hxml",mode:"haxe",ext:["hxml"]},{name:"ASP.NET",mime:"application/x-aspx",mode:"htmlembedded",ext:["aspx"],alias:["asp","aspx"]},{name:"HTML",mime:"text/html",mode:"htmlmixed",ext:["html","htm"],alias:["xhtml"]},{name:"HTTP",mime:"message/http",mode:"http"},{name:"IDL",mime:"text/x-idl",mode:"idl",ext:["pro"]},{name:"Jade",mime:"text/x-jade",mode:"jade",ext:["jade"]},{name:"Java",mime:"text/x-java",mode:"clike",ext:["java"]},{name:"Java Server Pages",mime:"application/x-jsp",mode:"htmlembedded",ext:["jsp"],alias:["jsp"]},{name:"JavaScript",mimes:["text/javascript","text/ecmascript","application/javascript","application/x-javascript","application/ecmascript"],mode:"javascript",ext:["js"],alias:["ecmascript","js","node"]},{name:"JSON",mimes:["application/json","application/x-json"],mode:"javascript",ext:["json","map"],alias:["json5"]},{name:"JSON-LD",mime:"application/ld+json",mode:"javascript",ext:["jsonld"],alias:["jsonld"]},{name:"JSX",mime:"text/jsx",mode:"jsx",ext:["jsx"]},{name:"Jinja2",mime:"null",mode:"jinja2"},{name:"Julia",mime:"text/x-julia",mode:"julia",ext:["jl"]},{name:"Kotlin",mime:"text/x-kotlin",mode:"clike",ext:["kt"]},{name:"LESS",mime:"text/x-less",mode:"css",ext:["less"]},{name:"LiveScript",mime:"text/x-livescript",mode:"livescript",ext:["ls"],alias:["ls"]},{name:"Lua",mime:"text/x-lua",mode:"lua",ext:["lua"]},{name:"Markdown",mime:"text/x-markdown",mode:"markdown",ext:["markdown","md","mkd"]},{name:"mIRC",mime:"text/mirc",mode:"mirc"},{name:"MariaDB SQL",mime:"text/x-mariadb",mode:"sql"},{name:"Mathematica",mime:"text/x-mathematica",mode:"mathematica",ext:["m","nb"]},{name:"Modelica",mime:"text/x-modelica",mode:"modelica",ext:["mo"]},{name:"MUMPS",mime:"text/x-mumps",mode:"mumps",ext:["mps"]},{name:"MS SQL",mime:"text/x-mssql",mode:"sql"},{name:"mbox",mime:"application/mbox",mode:"mbox",ext:["mbox"]},{name:"MySQL",mime:"text/x-mysql",mode:"sql"},{name:"Nginx",mime:"text/x-nginx-conf",mode:"nginx",file:/nginx.*\.conf$/i},{name:"NSIS",mime:"text/x-nsis",mode:"nsis",ext:["nsh","nsi"]},{name:"NTriples",mime:"text/n-triples",mode:"ntriples",ext:["nt"]},{name:"Objective C",mime:"text/x-objectivec",mode:"clike",ext:["m","mm"],alias:["objective-c","objc"]},{name:"OCaml",mime:"text/x-ocaml",mode:"mllike",ext:["ml","mli","mll","mly"]},{name:"Octave",mime:"text/x-octave",mode:"octave",ext:["m"]},{name:"Oz",mime:"text/x-oz",mode:"oz",ext:["oz"]},{name:"Pascal",mime:"text/x-pascal",mode:"pascal",ext:["p","pas"]},{name:"PEG.js",mime:"null",mode:"pegjs",ext:["jsonld"]},{name:"Perl",mime:"text/x-perl",mode:"perl",ext:["pl","pm"]},{name:"PHP",mime:"application/x-httpd-php",mode:"php",ext:["php","php3","php4","php5","phtml"]},{name:"Pig",mime:"text/x-pig",mode:"pig",ext:["pig"]},{name:"Plain Text",mime:"text/plain",mode:"null",ext:["txt","text","conf","def","list","log"]},{name:"PLSQL",mime:"text/x-plsql",mode:"sql",ext:["pls"]},{name:"PowerShell",mime:"application/x-powershell",mode:"powershell",ext:["ps1","psd1","psm1"]},{name:"Properties files",mime:"text/x-properties",mode:"properties",ext:["properties","ini","in"],alias:["ini","properties"]},{name:"ProtoBuf",mime:"text/x-protobuf",mode:"protobuf",ext:["proto"]},{name:"Python",mime:"text/x-python",mode:"python",ext:["BUILD","bzl","py","pyw"],file:/^(BUCK|BUILD)$/},{name:"Puppet",mime:"text/x-puppet",mode:"puppet",ext:["pp"]},{name:"Q",mime:"text/x-q",mode:"q",ext:["q"]},{name:"R",mime:"text/x-rsrc",mode:"r",ext:["r"],alias:["rscript"]},{name:"reStructuredText",mime:"text/x-rst",mode:"rst",ext:["rst"],alias:["rst"]},{name:"RPM Changes",mime:"text/x-rpm-changes",mode:"rpm"},{name:"RPM Spec",mime:"text/x-rpm-spec",mode:"rpm",ext:["spec"]},{name:"Ruby",mime:"text/x-ruby",mode:"ruby",ext:["rb"],alias:["jruby","macruby","rake","rb","rbx"]},{name:"Rust",mime:"text/x-rustsrc",mode:"rust",ext:["rs"]},{name:"SAS",mime:"text/x-sas",mode:"sas",ext:["sas"]},{name:"Sass",mime:"text/x-sass",mode:"sass",ext:["sass"]},{name:"Scala",mime:"text/x-scala",mode:"clike",ext:["scala"]},{name:"Scheme",mime:"text/x-scheme",mode:"scheme",ext:["scm","ss"]},{name:"SCSS",mime:"text/x-scss",mode:"css",ext:["scss"]},{name:"Shell",mime:"text/x-sh",mode:"shell",ext:["sh","ksh","bash"],alias:["bash","sh","zsh"],file:/^PKGBUILD$/},{name:"Sieve",mime:"application/sieve",mode:"sieve",ext:["siv","sieve"]},{name:"Slim",mimes:["text/x-slim","application/x-slim"],mode:"slim",ext:["slim"]},{name:"Smalltalk",mime:"text/x-stsrc",mode:"smalltalk",ext:["st"]},{name:"Smarty",mime:"text/x-smarty",mode:"smarty",ext:["tpl"]},{name:"Solr",mime:"text/x-solr",mode:"solr"},{name:"Soy",mime:"text/x-soy",mode:"soy",ext:["soy"],alias:["closure template"]},{name:"SPARQL",mime:"application/sparql-query",mode:"sparql",ext:["rq","sparql"],alias:["sparul"]},{name:"Spreadsheet",mime:"text/x-spreadsheet",mode:"spreadsheet",alias:["excel","formula"]},{name:"SQL",mime:"text/x-sql",mode:"sql",ext:["sql"]},{name:"Squirrel",mime:"text/x-squirrel",mode:"clike",ext:["nut"]},{name:"Swift",mime:"text/x-swift",mode:"swift",ext:["swift"]},{name:"sTeX",mime:"text/x-stex",mode:"stex"},{name:"LaTeX",mime:"text/x-latex",mode:"stex",ext:["text","ltx"],alias:["tex"]},{name:"SystemVerilog",mime:"text/x-systemverilog",mode:"verilog",ext:["v"]},{name:"Tcl",mime:"text/x-tcl",mode:"tcl",ext:["tcl"]},{name:"Textile",mime:"text/x-textile",mode:"textile",ext:["textile"]},{name:"TiddlyWiki ",mime:"text/x-tiddlywiki",mode:"tiddlywiki"},{name:"Tiki wiki",mime:"text/tiki",mode:"tiki"},{name:"TOML",mime:"text/x-toml",mode:"toml",ext:["toml"]},{name:"Tornado",mime:"text/x-tornado",mode:"tornado"},{name:"troff",mime:"text/troff",mode:"troff",ext:["1","2","3","4","5","6","7","8","9"]},{name:"TTCN",mime:"text/x-ttcn",mode:"ttcn",ext:["ttcn","ttcn3","ttcnpp"]},{name:"TTCN_CFG",mime:"text/x-ttcn-cfg",mode:"ttcn-cfg",ext:["cfg"]},{name:"Turtle",mime:"text/turtle",mode:"turtle",ext:["ttl"]},{name:"TypeScript",mime:"application/typescript",mode:"javascript",ext:["ts"],alias:["ts"]},{name:"Twig",mime:"text/x-twig",mode:"twig"},{name:"Web IDL",mime:"text/x-webidl",mode:"webidl",ext:["webidl"]},{name:"VB.NET",mime:"text/x-vb",mode:"vb",ext:["vb"]},{name:"VBScript",mime:"text/vbscript",mode:"vbscript",ext:["vbs"]},{name:"Velocity",mime:"text/velocity",mode:"velocity",ext:["vtl"]},{name:"Verilog",mime:"text/x-verilog",mode:"verilog",ext:["v"]},{name:"VHDL",mime:"text/x-vhdl",mode:"vhdl",ext:["vhd","vhdl"]},{name:"XML",mimes:["application/xml","text/xml"],mode:"xml",ext:["xml","xsl","xsd"],alias:["rss","wsdl","xsd"]},{name:"XQuery",mime:"application/xquery",mode:"xquery",ext:["xy","xquery"]},{name:"Yacas",mime:"text/x-yacas",mode:"yacas",ext:["ys"]},{name:"YAML",mime:"text/x-yaml",mode:"yaml",ext:["yaml","yml"],alias:["yml"]},{name:"Z80",mime:"text/x-z80",mode:"z80",ext:["z80"]},{name:"mscgen",mime:"text/x-mscgen",mode:"mscgen",ext:["mscgen","mscin","msc"]},{name:"xu",mime:"text/x-xu",mode:"mscgen",ext:["xu"]},{name:"msgenny",mime:"text/x-msgenny",mode:"mscgen",ext:["msgenny"]}];for(var t=0;t<e.modeInfo.length;t++){var n=e.modeInfo[t];n.mimes&&(n.mime=n.mimes[0])}e.findModeByMIME=function(t){t=t.toLowerCase();for(var n=0;n<e.modeInfo.length;n++){var r=e.modeInfo[n];if(r.mime==t)return r;if(r.mimes)for(var i=0;i<r.mimes.length;i++)if(r.mimes[i]==t)return r}},e.findModeByExtension=function(t){for(var n=0;n<e.modeInfo.length;n++){var r=e.modeInfo[n];if(r.ext)for(var i=0;i<r.ext.length;i++)if(r.ext[i]==t)return r}},e.findModeByFileName=function(t){for(var n=0;n<e.modeInfo.length;n++){var r=e.modeInfo[n];if(r.file&&r.file.test(t))return r}var i=t.lastIndexOf("."),o=i>-1&&t.substring(i+1,t.length);return o?e.findModeByExtension(o):void 0},e.findModeByName=function(t){t=t.toLowerCase();for(var n=0;n<e.modeInfo.length;n++){var r=e.modeInfo[n];if(r.name.toLowerCase()==t)return r;if(r.alias)for(var i=0;i<r.alias.length;i++)if(r.alias[i].toLowerCase()==t)return r}}})},{"../lib/codemirror":10}],14:[function(t,n,r){!function(i){"object"==typeof r&&"object"==typeof n?i(t("../../lib/codemirror")):"function"==typeof e&&e.amd?e(["../../lib/codemirror"],i):i(CodeMirror)}(function(e){"use strict";var t={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,caseFold:!0},n={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,caseFold:!1};e.defineMode("xml",function(r,i){function o(e,t){function n(n){return t.tokenize=n,n(e,t)}var r=e.next();if("<"==r)return e.eat("!")?e.eat("[")?e.match("CDATA[")?n(s("atom","]]>")):null:e.match("--")?n(s("comment","-->")):e.match("DOCTYPE",!0,!0)?(e.eatWhile(/[\w\._\-]/),n(c(1))):null:e.eat("?")?(e.eatWhile(/[\w\._\-]/),t.tokenize=s("meta","?>"),"meta"):(T=e.eat("/")?"closeTag":"openTag",t.tokenize=a,"tag bracket");if("&"==r){var i;return i=e.eat("#")?e.eat("x")?e.eatWhile(/[a-fA-F\d]/)&&e.eat(";"):e.eatWhile(/[\d]/)&&e.eat(";"):e.eatWhile(/[\w\.\-:]/)&&e.eat(";"),i?"atom":"error"}return e.eatWhile(/[^&<]/),null}function a(e,t){var n=e.next();if(">"==n||"/"==n&&e.eat(">"))return t.tokenize=o,T=">"==n?"endTag":"selfcloseTag","tag bracket";if("="==n)return T="equals",null;if("<"==n){t.tokenize=o,t.state=d,t.tagName=t.tagStart=null;var r=t.tokenize(e,t);return r?r+" tag error":"tag error"}return/[\'\"]/.test(n)?(t.tokenize=l(n),t.stringStartCol=e.column(),t.tokenize(e,t)):(e.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function l(e){var t=function(t,n){for(;!t.eol();)if(t.next()==e){n.tokenize=a;break}return"string"};return t.isInAttribute=!0,t}function s(e,t){return function(n,r){for(;!n.eol();){if(n.match(t)){r.tokenize=o;break}n.next()}return e}}function c(e){return function(t,n){for(var r;null!=(r=t.next());){if("<"==r)return n.tokenize=c(e+1),n.tokenize(t,n);if(">"==r){if(1==e){n.tokenize=o;break}return n.tokenize=c(e-1),n.tokenize(t,n)}}return"meta"}}function u(e,t,n){this.prev=e.context,this.tagName=t,this.indent=e.indented,this.startOfLine=n,(S.doNotIndent.hasOwnProperty(t)||e.context&&e.context.noIndent)&&(this.noIndent=!0)}function f(e){e.context&&(e.context=e.context.prev)}function h(e,t){for(var n;;){if(!e.context)return;if(n=e.context.tagName,!S.contextGrabbers.hasOwnProperty(n)||!S.contextGrabbers[n].hasOwnProperty(t))return;f(e)}}function d(e,t,n){return"openTag"==e?(n.tagStart=t.column(),p):"closeTag"==e?m:d}function p(e,t,n){return"word"==e?(n.tagName=t.current(),M="tag",y):(M="error",p)}function m(e,t,n){if("word"==e){var r=t.current();return n.context&&n.context.tagName!=r&&S.implicitlyClosed.hasOwnProperty(n.context.tagName)&&f(n),n.context&&n.context.tagName==r||S.matchClosing===!1?(M="tag",g):(M="tag error",v)}return M="error",v}function g(e,t,n){return"endTag"!=e?(M="error",g):(f(n),d)}function v(e,t,n){return M="error",g(e,t,n)}function y(e,t,n){if("word"==e)return M="attribute",x;if("endTag"==e||"selfcloseTag"==e){var r=n.tagName,i=n.tagStart;return n.tagName=n.tagStart=null,"selfcloseTag"==e||S.autoSelfClosers.hasOwnProperty(r)?h(n,r):(h(n,r),n.context=new u(n,r,i==n.indented)),d}return M="error",y}function x(e,t,n){return"equals"==e?b:(S.allowMissing||(M="error"),y(e,t,n))}function b(e,t,n){return"string"==e?w:"word"==e&&S.allowUnquoted?(M="string",y):(M="error",y(e,t,n))}function w(e,t,n){return"string"==e?w:y(e,t,n)}var k=r.indentUnit,S={},C=i.htmlMode?t:n;for(var L in C)S[L]=C[L];for(var L in i)S[L]=i[L];var T,M;return o.isInText=!0,{startState:function(e){var t={tokenize:o,state:d,indented:e||0,tagName:null,tagStart:null,context:null};return null!=e&&(t.baseIndent=e),t},token:function(e,t){if(!t.tagName&&e.sol()&&(t.indented=e.indentation()),e.eatSpace())return null;T=null;var n=t.tokenize(e,t);return(n||T)&&"comment"!=n&&(M=null,t.state=t.state(T||n,e,t),M&&(n="error"==M?n+" error":M)),n},indent:function(t,n,r){var i=t.context;if(t.tokenize.isInAttribute)return t.tagStart==t.indented?t.stringStartCol+1:t.indented+k;if(i&&i.noIndent)return e.Pass;if(t.tokenize!=a&&t.tokenize!=o)return r?r.match(/^(\s*)/)[0].length:0;if(t.tagName)return S.multilineTagIndentPastTag!==!1?t.tagStart+t.tagName.length+2:t.tagStart+k*(S.multilineTagIndentFactor||1);if(S.alignCDATA&&/<!\[CDATA\[/.test(n))return 0;var l=n&&/^<(\/)?([\w_:\.-]*)/.exec(n);if(l&&l[1])for(;i;){if(i.tagName==l[2]){i=i.prev;break}if(!S.implicitlyClosed.hasOwnProperty(i.tagName))break;i=i.prev}else if(l)for(;i;){var s=S.contextGrabbers[i.tagName];if(!s||!s.hasOwnProperty(l[2]))break;i=i.prev}for(;i&&i.prev&&!i.startOfLine;)i=i.prev;return i?i.indent+k:t.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"<!--",blockCommentEnd:"-->",configuration:S.htmlMode?"html":"xml",helperType:S.htmlMode?"html":"xml",skipAttribute:function(e){e.state==b&&(e.state=y)}}}),e.defineMIME("text/xml","xml"),e.defineMIME("application/xml","xml"),e.mimeModes.hasOwnProperty("text/html")||e.defineMIME("text/html",{name:"xml",htmlMode:!0})})},{"../../lib/codemirror":10}],15:[function(e,t,n){n.read=function(e,t,n,r,i){var o,a,l=8*i-r-1,s=(1<<l)-1,c=s>>1,u=-7,f=n?i-1:0,h=n?-1:1,d=e[t+f];for(f+=h,o=d&(1<<-u)-1,d>>=-u,u+=l;u>0;o=256*o+e[t+f],f+=h,u-=8);for(a=o&(1<<-u)-1,o>>=-u,u+=r;u>0;a=256*a+e[t+f],f+=h,u-=8);if(0===o)o=1-c;else{if(o===s)return a?NaN:(d?-1:1)*(1/0);a+=Math.pow(2,r),o-=c}return(d?-1:1)*a*Math.pow(2,o-r)},n.write=function(e,t,n,r,i,o){var a,l,s,c=8*o-i-1,u=(1<<c)-1,f=u>>1,h=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,d=r?0:o-1,p=r?1:-1,m=0>t||0===t&&0>1/t?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(l=isNaN(t)?1:0,a=u):(a=Math.floor(Math.log(t)/Math.LN2),t*(s=Math.pow(2,-a))<1&&(a--,s*=2),t+=a+f>=1?h/s:h*Math.pow(2,1-f),t*s>=2&&(a++,s/=2),a+f>=u?(l=0,a=u):a+f>=1?(l=(t*s-1)*Math.pow(2,i),a+=f):(l=t*Math.pow(2,f-1)*Math.pow(2,i),a=0));i>=8;e[n+d]=255&l,d+=p,l/=256,i-=8);for(a=a<<i|l,c+=i;c>0;e[n+d]=255&a,d+=p,a/=256,c-=8);e[n+d-p]|=128*m}},{}],16:[function(e,t,n){var r={}.toString;t.exports=Array.isArray||function(e){return"[object Array]"==r.call(e)}},{}],17:[function(t,n,r){(function(t){(function(){function t(e){this.tokens=[],this.tokens.links={},this.options=e||h.defaults,this.rules=d.normal,this.options.gfm&&(this.options.tables?this.rules=d.tables:this.rules=d.gfm)}function i(e,t){if(this.options=t||h.defaults,this.links=e,this.rules=p.normal,this.renderer=this.options.renderer||new o,this.renderer.options=this.options,!this.links)throw new Error("Tokens array requires a `links` property.");this.options.gfm?this.options.breaks?this.rules=p.breaks:this.rules=p.gfm:this.options.pedantic&&(this.rules=p.pedantic)}function o(e){this.options=e||{}}function a(e){this.tokens=[],this.token=null,this.options=e||h.defaults,this.options.renderer=this.options.renderer||new o,this.renderer=this.options.renderer,this.renderer.options=this.options}function l(e,t){return e.replace(t?/&/g:/&(?!#?\w+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function s(e){return e.replace(/&([#\w]+);/g,function(e,t){return t=t.toLowerCase(),"colon"===t?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}function c(e,t){return e=e.source,t=t||"",function n(r,i){return r?(i=i.source||i,i=i.replace(/(^|[^\[])\^/g,"$1"),e=e.replace(r,i),n):new RegExp(e,t)}}function u(){}function f(e){for(var t,n,r=1;r<arguments.length;r++){t=arguments[r];for(n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e}function h(e,n,r){if(r||"function"==typeof n){r||(r=n,n=null),n=f({},h.defaults,n||{});var i,o,s=n.highlight,c=0;try{i=t.lex(e,n)}catch(u){return r(u)}o=i.length;var d=function(e){if(e)return n.highlight=s,r(e);var t;try{t=a.parse(i,n)}catch(o){e=o}return n.highlight=s,e?r(e):r(null,t)};if(!s||s.length<3)return d();if(delete n.highlight,!o)return d();for(;c<i.length;c++)!function(e){return"code"!==e.type?--o||d():s(e.text,e.lang,function(t,n){return t?d(t):null==n||n===e.text?--o||d():(e.text=n,e.escaped=!0,void(--o||d()))})}(i[c])}else try{return n&&(n=f({},h.defaults,n)),a.parse(t.lex(e,n),n)}catch(u){if(u.message+="\nPlease report this to https://github.com/chjj/marked.",(n||h.defaults).silent)return"<p>An error occured:</p><pre>"+l(u.message+"",!0)+"</pre>";throw u}}var d={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:u,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:u,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:u,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};d.bullet=/(?:[*+-]|\d+\.)/,d.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,d.item=c(d.item,"gm")(/bull/g,d.bullet)(),d.list=c(d.list)(/bull/g,d.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+d.def.source+")")(),d.blockquote=c(d.blockquote)("def",d.def)(),d._tag="(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b",d.html=c(d.html)("comment",/<!--[\s\S]*?-->/)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)(/tag/g,d._tag)(),d.paragraph=c(d.paragraph)("hr",d.hr)("heading",d.heading)("lheading",d.lheading)("blockquote",d.blockquote)("tag","<"+d._tag)("def",d.def)(),d.normal=f({},d),d.gfm=f({},d.normal,{fences:/^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\s*\1 *(?:\n+|$)/,paragraph:/^/,heading:/^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/}),d.gfm.paragraph=c(d.paragraph)("(?!","(?!"+d.gfm.fences.source.replace("\\1","\\2")+"|"+d.list.source.replace("\\1","\\3")+"|")(),d.tables=f({},d.gfm,{nptable:/^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/}),t.rules=d,t.lex=function(e,n){var r=new t(n);return r.lex(e)},t.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},t.prototype.token=function(e,t,n){for(var r,i,o,a,l,s,c,u,f,e=e.replace(/^ +$/gm,"");e;)if((o=this.rules.newline.exec(e))&&(e=e.substring(o[0].length),o[0].length>1&&this.tokens.push({type:"space"})),o=this.rules.code.exec(e))e=e.substring(o[0].length),o=o[0].replace(/^ {4}/gm,""),this.tokens.push({type:"code",text:this.options.pedantic?o:o.replace(/\n+$/,"")});else if(o=this.rules.fences.exec(e))e=e.substring(o[0].length),this.tokens.push({type:"code",lang:o[2],text:o[3]||""});else if(o=this.rules.heading.exec(e))e=e.substring(o[0].length),this.tokens.push({type:"heading",depth:o[1].length,text:o[2]});else if(t&&(o=this.rules.nptable.exec(e))){for(e=e.substring(o[0].length),s={type:"table",header:o[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:o[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:o[3].replace(/\n$/,"").split("\n")},u=0;u<s.align.length;u++)/^ *-+: *$/.test(s.align[u])?s.align[u]="right":/^ *:-+: *$/.test(s.align[u])?s.align[u]="center":/^ *:-+ *$/.test(s.align[u])?s.align[u]="left":s.align[u]=null;for(u=0;u<s.cells.length;u++)s.cells[u]=s.cells[u].split(/ *\| */);this.tokens.push(s)}else if(o=this.rules.lheading.exec(e))e=e.substring(o[0].length),this.tokens.push({type:"heading",depth:"="===o[2]?1:2,text:o[1]});else if(o=this.rules.hr.exec(e))e=e.substring(o[0].length),this.tokens.push({type:"hr"});else if(o=this.rules.blockquote.exec(e))e=e.substring(o[0].length),this.tokens.push({type:"blockquote_start"}),o=o[0].replace(/^ *> ?/gm,""),this.token(o,t,!0),this.tokens.push({type:"blockquote_end"});else if(o=this.rules.list.exec(e)){for(e=e.substring(o[0].length),a=o[2],this.tokens.push({type:"list_start",ordered:a.length>1}),o=o[0].match(this.rules.item),r=!1,f=o.length,u=0;f>u;u++)s=o[u],c=s.length,s=s.replace(/^ *([*+-]|\d+\.) +/,""),~s.indexOf("\n ")&&(c-=s.length,s=this.options.pedantic?s.replace(/^ {1,4}/gm,""):s.replace(new RegExp("^ {1,"+c+"}","gm"),"")),this.options.smartLists&&u!==f-1&&(l=d.bullet.exec(o[u+1])[0],a===l||a.length>1&&l.length>1||(e=o.slice(u+1).join("\n")+e,u=f-1)),i=r||/\n\n(?!\s*$)/.test(s),u!==f-1&&(r="\n"===s.charAt(s.length-1),i||(i=r)),this.tokens.push({type:i?"loose_item_start":"list_item_start"}),this.token(s,!1,n),this.tokens.push({type:"list_item_end"});this.tokens.push({type:"list_end"})}else if(o=this.rules.html.exec(e))e=e.substring(o[0].length),this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:!this.options.sanitizer&&("pre"===o[1]||"script"===o[1]||"style"===o[1]),text:o[0]});else if(!n&&t&&(o=this.rules.def.exec(e)))e=e.substring(o[0].length),this.tokens.links[o[1].toLowerCase()]={href:o[2],title:o[3]};else if(t&&(o=this.rules.table.exec(e))){for(e=e.substring(o[0].length),s={type:"table",
+header:o[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:o[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:o[3].replace(/(?: *\| *)?\n$/,"").split("\n")},u=0;u<s.align.length;u++)/^ *-+: *$/.test(s.align[u])?s.align[u]="right":/^ *:-+: *$/.test(s.align[u])?s.align[u]="center":/^ *:-+ *$/.test(s.align[u])?s.align[u]="left":s.align[u]=null;for(u=0;u<s.cells.length;u++)s.cells[u]=s.cells[u].replace(/^ *\| *| *\| *$/g,"").split(/ *\| */);this.tokens.push(s)}else if(t&&(o=this.rules.paragraph.exec(e)))e=e.substring(o[0].length),this.tokens.push({type:"paragraph",text:"\n"===o[1].charAt(o[1].length-1)?o[1].slice(0,-1):o[1]});else if(o=this.rules.text.exec(e))e=e.substring(o[0].length),this.tokens.push({type:"text",text:o[0]});else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0));return this.tokens};var p={escape:/^\\([\\`*{}\[\]()#+\-.!_>])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:u,tag:/^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:u,text:/^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/};p._inside=/(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/,p._href=/\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/,p.link=c(p.link)("inside",p._inside)("href",p._href)(),p.reflink=c(p.reflink)("inside",p._inside)(),p.normal=f({},p),p.pedantic=f({},p.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/}),p.gfm=f({},p.normal,{escape:c(p.escape)("])","~|])")(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:c(p.text)("]|","~]|")("|","|https?://|")()}),p.breaks=f({},p.gfm,{br:c(p.br)("{2,}","*")(),text:c(p.gfm.text)("{2,}","*")()}),i.rules=p,i.output=function(e,t,n){var r=new i(t,n);return r.output(e)},i.prototype.output=function(e){for(var t,n,r,i,o="";e;)if(i=this.rules.escape.exec(e))e=e.substring(i[0].length),o+=i[1];else if(i=this.rules.autolink.exec(e))e=e.substring(i[0].length),"@"===i[2]?(n=":"===i[1].charAt(6)?this.mangle(i[1].substring(7)):this.mangle(i[1]),r=this.mangle("mailto:")+n):(n=l(i[1]),r=n),o+=this.renderer.link(r,null,n);else if(this.inLink||!(i=this.rules.url.exec(e))){if(i=this.rules.tag.exec(e))!this.inLink&&/^<a /i.test(i[0])?this.inLink=!0:this.inLink&&/^<\/a>/i.test(i[0])&&(this.inLink=!1),e=e.substring(i[0].length),o+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(i[0]):l(i[0]):i[0];else if(i=this.rules.link.exec(e))e=e.substring(i[0].length),this.inLink=!0,o+=this.outputLink(i,{href:i[2],title:i[3]}),this.inLink=!1;else if((i=this.rules.reflink.exec(e))||(i=this.rules.nolink.exec(e))){if(e=e.substring(i[0].length),t=(i[2]||i[1]).replace(/\s+/g," "),t=this.links[t.toLowerCase()],!t||!t.href){o+=i[0].charAt(0),e=i[0].substring(1)+e;continue}this.inLink=!0,o+=this.outputLink(i,t),this.inLink=!1}else if(i=this.rules.strong.exec(e))e=e.substring(i[0].length),o+=this.renderer.strong(this.output(i[2]||i[1]));else if(i=this.rules.em.exec(e))e=e.substring(i[0].length),o+=this.renderer.em(this.output(i[2]||i[1]));else if(i=this.rules.code.exec(e))e=e.substring(i[0].length),o+=this.renderer.codespan(l(i[2],!0));else if(i=this.rules.br.exec(e))e=e.substring(i[0].length),o+=this.renderer.br();else if(i=this.rules.del.exec(e))e=e.substring(i[0].length),o+=this.renderer.del(this.output(i[1]));else if(i=this.rules.text.exec(e))e=e.substring(i[0].length),o+=this.renderer.text(l(this.smartypants(i[0])));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else e=e.substring(i[0].length),n=l(i[1]),r=n,o+=this.renderer.link(r,null,n);return o},i.prototype.outputLink=function(e,t){var n=l(t.href),r=t.title?l(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,l(e[1]))},i.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014\/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014\/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},i.prototype.mangle=function(e){if(!this.options.mangle)return e;for(var t,n="",r=e.length,i=0;r>i;i++)t=e.charCodeAt(i),Math.random()>.5&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},o.prototype.code=function(e,t,n){if(this.options.highlight){var r=this.options.highlight(e,t);null!=r&&r!==e&&(n=!0,e=r)}return t?'<pre><code class="'+this.options.langPrefix+l(t,!0)+'">'+(n?e:l(e,!0))+"\n</code></pre>\n":"<pre><code>"+(n?e:l(e,!0))+"\n</code></pre>"},o.prototype.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},o.prototype.html=function(e){return e},o.prototype.heading=function(e,t,n){return"<h"+t+' id="'+this.options.headerPrefix+n.toLowerCase().replace(/[^\w]+/g,"-")+'">'+e+"</h"+t+">\n"},o.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},o.prototype.list=function(e,t){var n=t?"ol":"ul";return"<"+n+">\n"+e+"</"+n+">\n"},o.prototype.listitem=function(e){return"<li>"+e+"</li>\n"},o.prototype.paragraph=function(e){return"<p>"+e+"</p>\n"},o.prototype.table=function(e,t){return"<table>\n<thead>\n"+e+"</thead>\n<tbody>\n"+t+"</tbody>\n</table>\n"},o.prototype.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},o.prototype.tablecell=function(e,t){var n=t.header?"th":"td",r=t.align?"<"+n+' style="text-align:'+t.align+'">':"<"+n+">";return r+e+"</"+n+">\n"},o.prototype.strong=function(e){return"<strong>"+e+"</strong>"},o.prototype.em=function(e){return"<em>"+e+"</em>"},o.prototype.codespan=function(e){return"<code>"+e+"</code>"},o.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"},o.prototype.del=function(e){return"<del>"+e+"</del>"},o.prototype.link=function(e,t,n){if(this.options.sanitize){try{var r=decodeURIComponent(s(e)).replace(/[^\w:]/g,"").toLowerCase()}catch(i){return""}if(0===r.indexOf("javascript:")||0===r.indexOf("vbscript:"))return""}var o='<a href="'+e+'"';return t&&(o+=' title="'+t+'"'),o+=">"+n+"</a>"},o.prototype.image=function(e,t,n){var r='<img src="'+e+'" alt="'+n+'"';return t&&(r+=' title="'+t+'"'),r+=this.options.xhtml?"/>":">"},o.prototype.text=function(e){return e},a.parse=function(e,t,n){var r=new a(t,n);return r.parse(e)},a.prototype.parse=function(e){this.inline=new i(e.links,this.options,this.renderer),this.tokens=e.reverse();for(var t="";this.next();)t+=this.tok();return t},a.prototype.next=function(){return this.token=this.tokens.pop()},a.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},a.prototype.parseText=function(){for(var e=this.token.text;"text"===this.peek().type;)e+="\n"+this.next().text;return this.inline.output(e)},a.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text);case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var e,t,n,r,i,o="",a="";for(n="",e=0;e<this.token.header.length;e++)r={header:!0,align:this.token.align[e]},n+=this.renderer.tablecell(this.inline.output(this.token.header[e]),{header:!0,align:this.token.align[e]});for(o+=this.renderer.tablerow(n),e=0;e<this.token.cells.length;e++){for(t=this.token.cells[e],n="",i=0;i<t.length;i++)n+=this.renderer.tablecell(this.inline.output(t[i]),{header:!1,align:this.token.align[i]});a+=this.renderer.tablerow(n)}return this.renderer.table(o,a);case"blockquote_start":for(var a="";"blockquote_end"!==this.next().type;)a+=this.tok();return this.renderer.blockquote(a);case"list_start":for(var a="",l=this.token.ordered;"list_end"!==this.next().type;)a+=this.tok();return this.renderer.list(a,l);case"list_item_start":for(var a="";"list_item_end"!==this.next().type;)a+="text"===this.token.type?this.parseText():this.tok();return this.renderer.listitem(a);case"loose_item_start":for(var a="";"list_item_end"!==this.next().type;)a+=this.tok();return this.renderer.listitem(a);case"html":var s=this.token.pre||this.options.pedantic?this.token.text:this.inline.output(this.token.text);return this.renderer.html(s);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText())}},u.exec=u,h.options=h.setOptions=function(e){return f(h.defaults,e),h},h.defaults={gfm:!0,tables:!0,breaks:!1,pedantic:!1,sanitize:!1,sanitizer:null,mangle:!0,smartLists:!1,silent:!1,highlight:null,langPrefix:"lang-",smartypants:!1,headerPrefix:"",renderer:new o,xhtml:!1},h.Parser=a,h.parser=a.parse,h.Renderer=o,h.Lexer=t,h.lexer=t.lex,h.InlineLexer=i,h.inlineLexer=i.output,h.parse=h,"undefined"!=typeof n&&"object"==typeof r?n.exports=h:"function"==typeof e&&e.amd?e(function(){return h}):this.marked=h}).call(function(){return this||("undefined"!=typeof window?window:t)}())}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],18:[function(e,t,n){(function(n,r){"use strict";var i=function(e,t,n,i){if(i=i||{},this.dictionary=null,this.rules={},this.dictionaryTable={},this.compoundRules=[],this.compoundRuleCodes={},this.replacementTable=[],this.flags=i.flags||{},e){if(this.dictionary=e,"undefined"!=typeof window&&"chrome"in window&&"extension"in window.chrome&&"getURL"in window.chrome.extension)t||(t=this._readFile(chrome.extension.getURL("lib/typo/dictionaries/"+e+"/"+e+".aff"))),n||(n=this._readFile(chrome.extension.getURL("lib/typo/dictionaries/"+e+"/"+e+".dic")));else{if(i.dictionaryPath)var o=i.dictionaryPath;else if("undefined"!=typeof r)var o=r+"/dictionaries";else var o="./dictionaries";t||(t=this._readFile(o+"/"+e+"/"+e+".aff")),n||(n=this._readFile(o+"/"+e+"/"+e+".dic"))}this.rules=this._parseAFF(t),this.compoundRuleCodes={};for(var a=0,l=this.compoundRules.length;l>a;a++)for(var s=this.compoundRules[a],c=0,u=s.length;u>c;c++)this.compoundRuleCodes[s[c]]=[];"ONLYINCOMPOUND"in this.flags&&(this.compoundRuleCodes[this.flags.ONLYINCOMPOUND]=[]),this.dictionaryTable=this._parseDIC(n);for(var a in this.compoundRuleCodes)0==this.compoundRuleCodes[a].length&&delete this.compoundRuleCodes[a];for(var a=0,l=this.compoundRules.length;l>a;a++){for(var f=this.compoundRules[a],h="",c=0,u=f.length;u>c;c++){var d=f[c];h+=d in this.compoundRuleCodes?"("+this.compoundRuleCodes[d].join("|")+")":d}this.compoundRules[a]=new RegExp(h,"i")}}return this};i.prototype={load:function(e){for(var t in e)this[t]=e[t];return this},_readFile:function(t,r){if(r||(r="utf8"),"undefined"!=typeof XMLHttpRequest){var i=new XMLHttpRequest;return i.open("GET",t,!1),i.overrideMimeType&&i.overrideMimeType("text/plain; charset="+r),i.send(null),i.responseText}if("undefined"!=typeof e){var o=e("fs");try{if(o.existsSync(t)){var a=o.statSync(t),l=o.openSync(t,"r"),s=new n(a.size);return o.readSync(l,s,0,s.length,null),s.toString(r,0,s.length)}console.log("Path "+t+" does not exist.")}catch(c){return console.log(c),""}}},_parseAFF:function(e){var t={};e=this._removeAffixComments(e);for(var n=e.split("\n"),r=0,i=n.length;i>r;r++){var o=n[r],a=o.split(/\s+/),l=a[0];if("PFX"==l||"SFX"==l){for(var s=a[1],c=a[2],u=parseInt(a[3],10),f=[],h=r+1,d=r+1+u;d>h;h++){var o=n[h],p=o.split(/\s+/),m=p[2],g=p[3].split("/"),v=g[0];"0"===v&&(v="");var y=this.parseRuleCodes(g[1]),x=p[4],b={};b.add=v,y.length>0&&(b.continuationClasses=y),"."!==x&&("SFX"===l?b.match=new RegExp(x+"$"):b.match=new RegExp("^"+x)),"0"!=m&&("SFX"===l?b.remove=new RegExp(m+"$"):b.remove=m),f.push(b)}t[s]={type:l,combineable:"Y"==c,entries:f},r+=u}else if("COMPOUNDRULE"===l){for(var u=parseInt(a[1],10),h=r+1,d=r+1+u;d>h;h++){var o=n[h],p=o.split(/\s+/);this.compoundRules.push(p[1])}r+=u}else if("REP"===l){var p=o.split(/\s+/);3===p.length&&this.replacementTable.push([p[1],p[2]])}else this.flags[l]=a[1]}return t},_removeAffixComments:function(e){return e=e.replace(/#.*$/gm,""),e=e.replace(/^\s\s*/m,"").replace(/\s\s*$/m,""),e=e.replace(/\n{2,}/g,"\n"),e=e.replace(/^\s\s*/,"").replace(/\s\s*$/,"")},_parseDIC:function(e){function t(e,t){e in r&&"object"==typeof r[e]||(r[e]=[]),r[e].push(t)}e=this._removeDicComments(e);for(var n=e.split("\n"),r={},i=1,o=n.length;o>i;i++){var a=n[i],l=a.split("/",2),s=l[0];if(l.length>1){var c=this.parseRuleCodes(l[1]);"NEEDAFFIX"in this.flags&&-1!=c.indexOf(this.flags.NEEDAFFIX)||t(s,c);for(var u=0,f=c.length;f>u;u++){var h=c[u],d=this.rules[h];if(d)for(var p=this._applyRule(s,d),m=0,g=p.length;g>m;m++){var v=p[m];if(t(v,[]),d.combineable)for(var y=u+1;f>y;y++){var x=c[y],b=this.rules[x];if(b&&b.combineable&&d.type!=b.type)for(var w=this._applyRule(v,b),k=0,S=w.length;S>k;k++){var C=w[k];t(C,[])}}}h in this.compoundRuleCodes&&this.compoundRuleCodes[h].push(s)}}else t(s.trim(),[])}return r},_removeDicComments:function(e){return e=e.replace(/^\t.*$/gm,"")},parseRuleCodes:function(e){if(!e)return[];if(!("FLAG"in this.flags))return e.split("");if("long"===this.flags.FLAG){for(var t=[],n=0,r=e.length;r>n;n+=2)t.push(e.substr(n,2));return t}return"num"===this.flags.FLAG?textCode.split(","):void 0},_applyRule:function(e,t){for(var n=t.entries,r=[],i=0,o=n.length;o>i;i++){var a=n[i];if(!a.match||e.match(a.match)){var l=e;if(a.remove&&(l=l.replace(a.remove,"")),"SFX"===t.type?l+=a.add:l=a.add+l,r.push(l),"continuationClasses"in a)for(var s=0,c=a.continuationClasses.length;c>s;s++){var u=this.rules[a.continuationClasses[s]];u&&(r=r.concat(this._applyRule(l,u)))}}}return r},check:function(e){var t=e.replace(/^\s\s*/,"").replace(/\s\s*$/,"");if(this.checkExact(t))return!0;if(t.toUpperCase()===t){var n=t[0]+t.substring(1).toLowerCase();if(this.hasFlag(n,"KEEPCASE"))return!1;if(this.checkExact(n))return!0}var r=t.toLowerCase();if(r!==t){if(this.hasFlag(r,"KEEPCASE"))return!1;if(this.checkExact(r))return!0}return!1},checkExact:function(e){var t=this.dictionaryTable[e];if("undefined"==typeof t){if("COMPOUNDMIN"in this.flags&&e.length>=this.flags.COMPOUNDMIN)for(var n=0,r=this.compoundRules.length;r>n;n++)if(e.match(this.compoundRules[n]))return!0;return!1}if("object"==typeof t){for(var n=0,r=t.length;r>n;n++)if(!this.hasFlag(e,"ONLYINCOMPOUND",t[n]))return!0;return!1}},hasFlag:function(e,t,n){if(t in this.flags){if("undefined"==typeof n)var n=Array.prototype.concat.apply([],this.dictionaryTable[e]);if(n&&-1!==n.indexOf(this.flags[t]))return!0}return!1},alphabet:"",suggest:function(e,t){function n(e){for(var t=[],n=0,r=e.length;r>n;n++){for(var i=e[n],o=[],a=0,l=i.length+1;l>a;a++)o.push([i.substring(0,a),i.substring(a,i.length)]);for(var s=[],a=0,l=o.length;l>a;a++){var u=o[a];u[1]&&s.push(u[0]+u[1].substring(1))}for(var f=[],a=0,l=o.length;l>a;a++){var u=o[a];u[1].length>1&&f.push(u[0]+u[1][1]+u[1][0]+u[1].substring(2))}for(var h=[],a=0,l=o.length;l>a;a++){var u=o[a];if(u[1])for(var d=0,p=c.alphabet.length;p>d;d++)h.push(u[0]+c.alphabet[d]+u[1].substring(1))}for(var m=[],a=0,l=o.length;l>a;a++){var u=o[a];if(u[1])for(var d=0,p=c.alphabet.length;p>d;d++)h.push(u[0]+c.alphabet[d]+u[1])}t=t.concat(s),t=t.concat(f),t=t.concat(h),t=t.concat(m)}return t}function r(e){for(var t=[],n=0;n<e.length;n++)c.check(e[n])&&t.push(e[n]);return t}function i(e){function i(e,t){return e[1]<t[1]?-1:1}for(var o=n([e]),a=n(o),l=r(o).concat(r(a)),s={},u=0,f=l.length;f>u;u++)l[u]in s?s[l[u]]+=1:s[l[u]]=1;var h=[];for(var u in s)h.push([u,s[u]]);h.sort(i).reverse();for(var d=[],u=0,f=Math.min(t,h.length);f>u;u++)c.hasFlag(h[u][0],"NOSUGGEST")||d.push(h[u][0]);return d}if(t||(t=5),this.check(e))return[];for(var o=0,a=this.replacementTable.length;a>o;o++){var l=this.replacementTable[o];if(-1!==e.indexOf(l[0])){var s=e.replace(l[0],l[1]);if(this.check(s))return[s]}}var c=this;return c.alphabet="abcdefghijklmnopqrstuvwxyz",i(e)}},"undefined"!=typeof t&&(t.exports=i)}).call(this,e("buffer").Buffer,"/node_modules/typo-js")},{buffer:3,fs:2}],19:[function(e,t,n){var r=e("codemirror");r.commands.tabAndIndentMarkdownList=function(e){var t=e.listSelections(),n=t[0].head,r=e.getStateAfter(n.line),i=r.list!==!1;if(i)return void e.execCommand("indentMore");if(e.options.indentWithTabs)e.execCommand("insertTab");else{var o=Array(e.options.tabSize+1).join(" ");e.replaceSelection(o)}},r.commands.shiftTabAndUnindentMarkdownList=function(e){var t=e.listSelections(),n=t[0].head,r=e.getStateAfter(n.line),i=r.list!==!1;if(i)return void e.execCommand("indentLess");if(e.options.indentWithTabs)e.execCommand("insertTab");else{var o=Array(e.options.tabSize+1).join(" ");e.replaceSelection(o)}}},{codemirror:10}],20:[function(e,t,n){"use strict";function r(e){return e=U?e.replace("Ctrl","Cmd"):e.replace("Cmd","Ctrl")}function i(e,t,n){e=e||{};var r=document.createElement("a");return t=void 0==t?!0:t,e.title&&t&&(r.title=a(e.title,e.action,n),U&&(r.title=r.title.replace("Ctrl","⌘"),r.title=r.title.replace("Alt","⌥"))),r.tabIndex=-1,r.className=e.className,r}function o(){var e=document.createElement("i");return e.className="separator",e.innerHTML="|",e}function a(e,t,n){var i,o=e;return t&&(i=Y(t),n[i]&&(o+=" ("+r(n[i])+")")),o}function l(e,t){t=t||e.getCursor("start");var n=e.getTokenAt(t);if(!n.type)return{};for(var r,i,o=n.type.split(" "),a={},l=0;l<o.length;l++)r=o[l],"strong"===r?a.bold=!0:"variable-2"===r?(i=e.getLine(t.line),/^\s*\d+\.\s/.test(i)?a["ordered-list"]=!0:a["unordered-list"]=!0):"atom"===r?a.quote=!0:"em"===r?a.italic=!0:"quote"===r?a.quote=!0:"strikethrough"===r?a.strikethrough=!0:"comment"===r?a.code=!0:"link"===r?a.link=!0:"tag"===r?a.image=!0:r.match(/^header(\-[1-6])?$/)&&(a[r.replace("header","heading")]=!0);return a}function s(e){var t=e.codemirror;t.setOption("fullScreen",!t.getOption("fullScreen")),t.getOption("fullScreen")?(V=document.body.style.overflow,document.body.style.overflow="hidden"):document.body.style.overflow=V;var n=t.getWrapperElement();/fullscreen/.test(n.previousSibling.className)?n.previousSibling.className=n.previousSibling.className.replace(/\s*fullscreen\b/,""):n.previousSibling.className+=" fullscreen";var r=e.toolbarElements.fullscreen;/active/.test(r.className)?r.className=r.className.replace(/\s*active\s*/g,""):r.className+=" active";var i=t.getWrapperElement().nextSibling;/editor-preview-active-side/.test(i.className)&&N(e)}function c(e){P(e,"bold",e.options.blockStyles.bold)}function u(e){P(e,"italic",e.options.blockStyles.italic)}function f(e){P(e,"strikethrough","~~")}function h(e){function t(e){if("object"!=typeof e)throw"fencing_line() takes a 'line' object (not a line number, or line text).  Got: "+typeof e+": "+e;return e.styles&&e.styles[2]&&-1!==e.styles[2].indexOf("formatting-code-block")}function n(e){return e.state.base.base||e.state.base}function r(e,r,i,o,a){i=i||e.getLineHandle(r),o=o||e.getTokenAt({line:r,ch:1}),a=a||!!i.text&&e.getTokenAt({line:r,ch:i.text.length-1});var l=o.type?o.type.split(" "):[];return a&&n(a).indentedCode?"indented":-1===l.indexOf("comment")?!1:n(o).fencedChars||n(a).fencedChars||t(i)?"fenced":"single"}function i(e,t,n,r){var i=t.line+1,o=n.line+1,a=t.line!==n.line,l=r+"\n",s="\n"+r;a&&o++,a&&0===n.ch&&(s=r+"\n",o--),E(e,!1,[l,s]),e.setSelection({line:i,ch:0},{line:o,ch:0})}var o,a,l,s=e.options.blockStyles.code,c=e.codemirror,u=c.getCursor("start"),f=c.getCursor("end"),h=c.getTokenAt({line:u.line,ch:u.ch||1}),d=c.getLineHandle(u.line),p=r(c,u.line,d,h);if("single"===p){var m=d.text.slice(0,u.ch).replace("`",""),g=d.text.slice(u.ch).replace("`","");c.replaceRange(m+g,{line:u.line,ch:0},{line:u.line,ch:99999999999999}),u.ch--,u!==f&&f.ch--,c.setSelection(u,f),c.focus()}else if("fenced"===p)if(u.line!==f.line||u.ch!==f.ch){for(o=u.line;o>=0&&(d=c.getLineHandle(o),!t(d));o--);var v,y,x,b,w=c.getTokenAt({line:o,ch:1}),k=n(w).fencedChars;t(c.getLineHandle(u.line))?(v="",y=u.line):t(c.getLineHandle(u.line-1))?(v="",y=u.line-1):(v=k+"\n",y=u.line),t(c.getLineHandle(f.line))?(x="",b=f.line,0===f.ch&&(b+=1)):0!==f.ch&&t(c.getLineHandle(f.line+1))?(x="",b=f.line+1):(x=k+"\n",b=f.line+1),0===f.ch&&(b-=1),c.operation(function(){c.replaceRange(x,{line:b,ch:0},{line:b+(x?0:1),ch:0}),c.replaceRange(v,{line:y,ch:0},{line:y+(v?0:1),ch:0})}),c.setSelection({line:y+(v?1:0),ch:0},{line:b+(v?1:-1),ch:0}),c.focus()}else{var S=u.line;if(t(c.getLineHandle(u.line))&&("fenced"===r(c,u.line+1)?(o=u.line,S=u.line+1):(a=u.line,S=u.line-1)),void 0===o)for(o=S;o>=0&&(d=c.getLineHandle(o),!t(d));o--);if(void 0===a)for(l=c.lineCount(),a=S;l>a&&(d=c.getLineHandle(a),!t(d));a++);c.operation(function(){c.replaceRange("",{line:o,ch:0},{line:o+1,ch:0}),c.replaceRange("",{line:a-1,ch:0},{line:a,ch:0})}),c.focus()}else if("indented"===p){if(u.line!==f.line||u.ch!==f.ch)o=u.line,a=f.line,0===f.ch&&a--;else{for(o=u.line;o>=0;o--)if(d=c.getLineHandle(o),!d.text.match(/^\s*$/)&&"indented"!==r(c,o,d)){o+=1;break}for(l=c.lineCount(),a=u.line;l>a;a++)if(d=c.getLineHandle(a),!d.text.match(/^\s*$/)&&"indented"!==r(c,a,d)){a-=1;break}}var C=c.getLineHandle(a+1),L=C&&c.getTokenAt({line:a+1,ch:C.text.length-1}),T=L&&n(L).indentedCode;T&&c.replaceRange("\n",{line:a+1,ch:0});for(var M=o;a>=M;M++)c.indentLine(M,"subtract");c.focus()}else{var N=u.line===f.line&&u.ch===f.ch&&0===u.ch,A=u.line!==f.line;N||A?i(c,u,f,s):E(c,!1,["`","`"])}}function d(e){var t=e.codemirror;I(t,"quote")}function p(e){var t=e.codemirror;O(t,"smaller")}function m(e){var t=e.codemirror;O(t,"bigger")}function g(e){var t=e.codemirror;O(t,void 0,1)}function v(e){var t=e.codemirror;O(t,void 0,2)}function y(e){var t=e.codemirror;O(t,void 0,3)}function x(e){var t=e.codemirror;I(t,"unordered-list")}function b(e){var t=e.codemirror;I(t,"ordered-list")}function w(e){var t=e.codemirror;R(t)}function k(e){var t=e.codemirror,n=l(t),r=e.options,i="http://";return r.promptURLs&&(i=prompt(r.promptTexts.link),!i)?!1:void E(t,n.link,r.insertTexts.link,i)}function S(e){var t=e.codemirror,n=l(t),r=e.options,i="http://";return r.promptURLs&&(i=prompt(r.promptTexts.image),!i)?!1:void E(t,n.image,r.insertTexts.image,i)}function C(e){var t=e.codemirror,n=l(t),r=e.options;E(t,n.table,r.insertTexts.table)}function L(e){var t=e.codemirror,n=l(t),r=e.options;E(t,n.image,r.insertTexts.horizontalRule)}function T(e){var t=e.codemirror;t.undo(),t.focus()}function M(e){var t=e.codemirror;t.redo(),t.focus()}function N(e){var t=e.codemirror,n=t.getWrapperElement(),r=n.nextSibling,i=e.toolbarElements["side-by-side"],o=!1;/editor-preview-active-side/.test(r.className)?(r.className=r.className.replace(/\s*editor-preview-active-side\s*/g,""),i.className=i.className.replace(/\s*active\s*/g,""),n.className=n.className.replace(/\s*CodeMirror-sided\s*/g," ")):(setTimeout(function(){t.getOption("fullScreen")||s(e),r.className+=" editor-preview-active-side"},1),i.className+=" active",n.className+=" CodeMirror-sided",o=!0);var a=n.lastChild;if(/editor-preview-active/.test(a.className)){a.className=a.className.replace(/\s*editor-preview-active\s*/g,"");var l=e.toolbarElements.preview,c=n.previousSibling;l.className=l.className.replace(/\s*active\s*/g,""),c.className=c.className.replace(/\s*disabled-for-preview*/g,"")}var u=function(){r.innerHTML=e.options.previewRender(e.value(),r)};t.sideBySideRenderingFunction||(t.sideBySideRenderingFunction=u),o?(r.innerHTML=e.options.previewRender(e.value(),r),t.on("update",t.sideBySideRenderingFunction)):t.off("update",t.sideBySideRenderingFunction),t.refresh()}function A(e){var t=e.codemirror,n=t.getWrapperElement(),r=n.previousSibling,i=e.options.toolbar?e.toolbarElements.preview:!1,o=n.lastChild;o&&/editor-preview/.test(o.className)||(o=document.createElement("div"),o.className="editor-preview",n.appendChild(o)),/editor-preview-active/.test(o.className)?(o.className=o.className.replace(/\s*editor-preview-active\s*/g,""),i&&(i.className=i.className.replace(/\s*active\s*/g,""),r.className=r.className.replace(/\s*disabled-for-preview*/g,""))):(setTimeout(function(){o.className+=" editor-preview-active"},1),i&&(i.className+=" active",r.className+=" disabled-for-preview")),o.innerHTML=e.options.previewRender(e.value(),o);var a=t.getWrapperElement().nextSibling;/editor-preview-active-side/.test(a.className)&&N(e)}function E(e,t,n,r){if(!/editor-preview-active/.test(e.getWrapperElement().lastChild.className)){var i,o=n[0],a=n[1],l=e.getCursor("start"),s=e.getCursor("end");r&&(a=a.replace("#url#",r)),t?(i=e.getLine(l.line),o=i.slice(0,l.ch),a=i.slice(l.ch),e.replaceRange(o+a,{line:l.line,ch:0})):(i=e.getSelection(),e.replaceSelection(o+i+a),l.ch+=o.length,l!==s&&(s.ch+=o.length)),e.setSelection(l,s),e.focus()}}function O(e,t,n){if(!/editor-preview-active/.test(e.getWrapperElement().lastChild.className)){for(var r=e.getCursor("start"),i=e.getCursor("end"),o=r.line;o<=i.line;o++)!function(r){var i=e.getLine(r),o=i.search(/[^#]/);i=void 0!==t?0>=o?"bigger"==t?"###### "+i:"# "+i:6==o&&"smaller"==t?i.substr(7):1==o&&"bigger"==t?i.substr(2):"bigger"==t?i.substr(1):"#"+i:1==n?0>=o?"# "+i:o==n?i.substr(o+1):"# "+i.substr(o+1):2==n?0>=o?"## "+i:o==n?i.substr(o+1):"## "+i.substr(o+1):0>=o?"### "+i:o==n?i.substr(o+1):"### "+i.substr(o+1),e.replaceRange(i,{line:r,ch:0},{line:r,ch:99999999999999})}(o);e.focus()}}function I(e,t){if(!/editor-preview-active/.test(e.getWrapperElement().lastChild.className)){for(var n=l(e),r=e.getCursor("start"),i=e.getCursor("end"),o={quote:/^(\s*)\>\s+/,"unordered-list":/^(\s*)(\*|\-|\+)\s+/,"ordered-list":/^(\s*)\d+\.\s+/},a={quote:"> ","unordered-list":"* ","ordered-list":"1. "},s=r.line;s<=i.line;s++)!function(r){var i=e.getLine(r);i=n[t]?i.replace(o[t],"$1"):a[t]+i,e.replaceRange(i,{line:r,ch:0},{line:r,ch:99999999999999})}(s);e.focus()}}function P(e,t,n,r){if(!/editor-preview-active/.test(e.codemirror.getWrapperElement().lastChild.className)){r="undefined"==typeof r?n:r;var i,o=e.codemirror,a=l(o),s=n,c=r,u=o.getCursor("start"),f=o.getCursor("end");a[t]?(i=o.getLine(u.line),s=i.slice(0,u.ch),c=i.slice(u.ch),"bold"==t?(s=s.replace(/(\*\*|__)(?![\s\S]*(\*\*|__))/,""),c=c.replace(/(\*\*|__)/,"")):"italic"==t?(s=s.replace(/(\*|_)(?![\s\S]*(\*|_))/,""),c=c.replace(/(\*|_)/,"")):"strikethrough"==t&&(s=s.replace(/(\*\*|~~)(?![\s\S]*(\*\*|~~))/,""),c=c.replace(/(\*\*|~~)/,"")),o.replaceRange(s+c,{line:u.line,ch:0},{line:u.line,ch:99999999999999}),"bold"==t||"strikethrough"==t?(u.ch-=2,u!==f&&(f.ch-=2)):"italic"==t&&(u.ch-=1,u!==f&&(f.ch-=1))):(i=o.getSelection(),"bold"==t?(i=i.split("**").join(""),i=i.split("__").join("")):"italic"==t?(i=i.split("*").join(""),i=i.split("_").join("")):"strikethrough"==t&&(i=i.split("~~").join("")),o.replaceSelection(s+i+c),u.ch+=n.length,f.ch=u.ch+i.length),o.setSelection(u,f),o.focus()}}function R(e){if(!/editor-preview-active/.test(e.getWrapperElement().lastChild.className))for(var t,n=e.getCursor("start"),r=e.getCursor("end"),i=n.line;i<=r.line;i++)t=e.getLine(i),t=t.replace(/^[ ]*([# ]+|\*|\-|[> ]+|[0-9]+(.|\)))[ ]*/,""),e.replaceRange(t,{line:i,ch:0},{line:i,ch:99999999999999})}function D(e,t){for(var n in t)t.hasOwnProperty(n)&&(t[n]instanceof Array?e[n]=t[n].concat(e[n]instanceof Array?e[n]:[]):null!==t[n]&&"object"==typeof t[n]&&t[n].constructor===Object?e[n]=D(e[n]||{},t[n]):e[n]=t[n]);return e}function H(e){for(var t=1;t<arguments.length;t++)e=D(e,arguments[t]);return e}function W(e){var t=/[a-zA-Z0-9_\u0392-\u03c9\u0410-\u04F9]+|[\u4E00-\u9FFF\u3400-\u4dbf\uf900-\ufaff\u3040-\u309f\uac00-\ud7af]+/g,n=e.match(t),r=0;if(null===n)return r;for(var i=0;i<n.length;i++)r+=n[i].charCodeAt(0)>=19968?n[i].length:1;return r}function B(e){e=e||{},e.parent=this;var t=!0;if(e.autoDownloadFontAwesome===!1&&(t=!1),e.autoDownloadFontAwesome!==!0)for(var n=document.styleSheets,r=0;r<n.length;r++)n[r].href&&n[r].href.indexOf("//maxcdn.bootstrapcdn.com/font-awesome/")>-1&&(t=!1);if(t){var i=document.createElement("link");i.rel="stylesheet",i.href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css",document.getElementsByTagName("head")[0].appendChild(i)}if(e.element)this.element=e.element;else if(null===e.element)return void console.log("SimpleMDE: Error. No element was found.");if(void 0===e.toolbar){e.toolbar=[];for(var o in K)K.hasOwnProperty(o)&&(-1!=o.indexOf("separator-")&&e.toolbar.push("|"),(K[o]["default"]===!0||e.showIcons&&e.showIcons.constructor===Array&&-1!=e.showIcons.indexOf(o))&&e.toolbar.push(o))}e.hasOwnProperty("status")||(e.status=["autosave","lines","words","cursor"]),e.previewRender||(e.previewRender=function(e){return this.parent.markdown(e)}),e.parsingConfig=H({highlightFormatting:!0},e.parsingConfig||{}),e.insertTexts=H({},X,e.insertTexts||{}),e.promptTexts=Z,e.blockStyles=H({},J,e.blockStyles||{}),e.shortcuts=H({},G,e.shortcuts||{}),void 0!=e.autosave&&void 0!=e.autosave.unique_id&&""!=e.autosave.unique_id&&(e.autosave.uniqueId=e.autosave.unique_id),this.options=e,this.render(),!e.initialValue||this.options.autosave&&this.options.autosave.foundSavedValue===!0||this.value(e.initialValue)}function _(){if("object"!=typeof localStorage)return!1;try{localStorage.setItem("smde_localStorage",1),localStorage.removeItem("smde_localStorage")}catch(e){return!1}return!0}var F=e("codemirror");e("codemirror/addon/edit/continuelist.js"),e("./codemirror/tablist"),e("codemirror/addon/display/fullscreen.js"),e("codemirror/mode/markdown/markdown.js"),e("codemirror/addon/mode/overlay.js"),e("codemirror/addon/display/placeholder.js"),e("codemirror/addon/selection/mark-selection.js"),e("codemirror/mode/gfm/gfm.js"),e("codemirror/mode/xml/xml.js");var z=e("codemirror-spell-checker"),j=e("marked"),U=/Mac/.test(navigator.platform),q={toggleBold:c,toggleItalic:u,drawLink:k,toggleHeadingSmaller:p,toggleHeadingBigger:m,drawImage:S,toggleBlockquote:d,toggleOrderedList:b,toggleUnorderedList:x,toggleCodeBlock:h,togglePreview:A,toggleStrikethrough:f,toggleHeading1:g,toggleHeading2:v,toggleHeading3:y,cleanBlock:w,drawTable:C,drawHorizontalRule:L,undo:T,redo:M,toggleSideBySide:N,toggleFullScreen:s},G={toggleBold:"Cmd-B",toggleItalic:"Cmd-I",drawLink:"Cmd-K",toggleHeadingSmaller:"Cmd-H",toggleHeadingBigger:"Shift-Cmd-H",cleanBlock:"Cmd-E",drawImage:"Cmd-Alt-I",toggleBlockquote:"Cmd-'",toggleOrderedList:"Cmd-Alt-L",toggleUnorderedList:"Cmd-L",toggleCodeBlock:"Cmd-Alt-C",togglePreview:"Cmd-P",toggleSideBySide:"F9",toggleFullScreen:"F11"},Y=function(e){for(var t in q)if(q[t]===e)return t;return null},$=function(){var e=!1;return function(t){(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(t)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(t.substr(0,4)))&&(e=!0);
+}(navigator.userAgent||navigator.vendor||window.opera),e},V="",K={bold:{name:"bold",action:c,className:"fa fa-bold",title:"Bold","default":!0},italic:{name:"italic",action:u,className:"fa fa-italic",title:"Italic","default":!0},strikethrough:{name:"strikethrough",action:f,className:"fa fa-strikethrough",title:"Strikethrough"},heading:{name:"heading",action:p,className:"fa fa-header",title:"Heading","default":!0},"heading-smaller":{name:"heading-smaller",action:p,className:"fa fa-header fa-header-x fa-header-smaller",title:"Smaller Heading"},"heading-bigger":{name:"heading-bigger",action:m,className:"fa fa-header fa-header-x fa-header-bigger",title:"Bigger Heading"},"heading-1":{name:"heading-1",action:g,className:"fa fa-header fa-header-x fa-header-1",title:"Big Heading"},"heading-2":{name:"heading-2",action:v,className:"fa fa-header fa-header-x fa-header-2",title:"Medium Heading"},"heading-3":{name:"heading-3",action:y,className:"fa fa-header fa-header-x fa-header-3",title:"Small Heading"},"separator-1":{name:"separator-1"},code:{name:"code",action:h,className:"fa fa-code",title:"Code"},quote:{name:"quote",action:d,className:"fa fa-quote-left",title:"Quote","default":!0},"unordered-list":{name:"unordered-list",action:x,className:"fa fa-list-ul",title:"Generic List","default":!0},"ordered-list":{name:"ordered-list",action:b,className:"fa fa-list-ol",title:"Numbered List","default":!0},"clean-block":{name:"clean-block",action:w,className:"fa fa-eraser fa-clean-block",title:"Clean block"},"separator-2":{name:"separator-2"},link:{name:"link",action:k,className:"fa fa-link",title:"Create Link","default":!0},image:{name:"image",action:S,className:"fa fa-picture-o",title:"Insert Image","default":!0},table:{name:"table",action:C,className:"fa fa-table",title:"Insert Table"},"horizontal-rule":{name:"horizontal-rule",action:L,className:"fa fa-minus",title:"Insert Horizontal Line"},"separator-3":{name:"separator-3"},preview:{name:"preview",action:A,className:"fa fa-eye no-disable",title:"Toggle Preview","default":!0},"side-by-side":{name:"side-by-side",action:N,className:"fa fa-columns no-disable no-mobile",title:"Toggle Side by Side","default":!0},fullscreen:{name:"fullscreen",action:s,className:"fa fa-arrows-alt no-disable no-mobile",title:"Toggle Fullscreen","default":!0},"separator-4":{name:"separator-4"},guide:{name:"guide",action:"https://simplemde.com/markdown-guide",className:"fa fa-question-circle",title:"Markdown Guide","default":!0},"separator-5":{name:"separator-5"},undo:{name:"undo",action:T,className:"fa fa-undo no-disable",title:"Undo"},redo:{name:"redo",action:M,className:"fa fa-repeat no-disable",title:"Redo"}},X={link:["[","](#url#)"],image:["![](","#url#)"],table:["","\n\n| Column 1 | Column 2 | Column 3 |\n| -------- | -------- | -------- |\n| Text     | Text     | Text     |\n\n"],horizontalRule:["","\n\n-----\n\n"]},Z={link:"URL for the link:",image:"URL of the image:"},J={bold:"**",code:"```",italic:"*"};B.prototype.markdown=function(e){if(j){var t={};return this.options&&this.options.renderingConfig&&this.options.renderingConfig.singleLineBreaks===!1?t.breaks=!1:t.breaks=!0,this.options&&this.options.renderingConfig&&this.options.renderingConfig.codeSyntaxHighlighting===!0&&window.hljs&&(t.highlight=function(e){return window.hljs.highlightAuto(e).value}),j.setOptions(t),j(e)}},B.prototype.render=function(e){if(e||(e=this.element||document.getElementsByTagName("textarea")[0]),!this._rendered||this._rendered!==e){this.element=e;var t=this.options,n=this,i={};for(var o in t.shortcuts)null!==t.shortcuts[o]&&null!==q[o]&&!function(e){i[r(t.shortcuts[e])]=function(){q[e](n)}}(o);i.Enter="newlineAndIndentContinueMarkdownList",i.Tab="tabAndIndentMarkdownList",i["Shift-Tab"]="shiftTabAndUnindentMarkdownList",i.Esc=function(e){e.getOption("fullScreen")&&s(n)},document.addEventListener("keydown",function(e){e=e||window.event,27==e.keyCode&&n.codemirror.getOption("fullScreen")&&s(n)},!1);var a,l;if(t.spellChecker!==!1?(a="spell-checker",l=t.parsingConfig,l.name="gfm",l.gitHubSpice=!1,z({codeMirrorInstance:F})):(a=t.parsingConfig,a.name="gfm",a.gitHubSpice=!1),this.codemirror=F.fromTextArea(e,{mode:a,backdrop:l,theme:"paper",tabSize:void 0!=t.tabSize?t.tabSize:2,indentUnit:void 0!=t.tabSize?t.tabSize:2,indentWithTabs:t.indentWithTabs!==!1,lineNumbers:!1,autofocus:t.autofocus===!0,extraKeys:i,lineWrapping:t.lineWrapping!==!1,allowDropFileTypes:["text/plain"],placeholder:t.placeholder||e.getAttribute("placeholder")||"",styleSelectedText:void 0!=t.styleSelectedText?t.styleSelectedText:!0}),t.forceSync===!0){var c=this.codemirror;c.on("change",function(){c.save()})}this.gui={},t.toolbar!==!1&&(this.gui.toolbar=this.createToolbar()),t.status!==!1&&(this.gui.statusbar=this.createStatusbar()),void 0!=t.autosave&&t.autosave.enabled===!0&&this.autosave(),this.gui.sideBySide=this.createSideBySide(),this._rendered=this.element;var u=this.codemirror;setTimeout(function(){u.refresh()}.bind(u),0)}},B.prototype.autosave=function(){if(_()){var e=this;if(void 0==this.options.autosave.uniqueId||""==this.options.autosave.uniqueId)return void console.log("SimpleMDE: You must set a uniqueId to use the autosave feature");null!=e.element.form&&void 0!=e.element.form&&e.element.form.addEventListener("submit",function(){localStorage.removeItem("smde_"+e.options.autosave.uniqueId)}),this.options.autosave.loaded!==!0&&("string"==typeof localStorage.getItem("smde_"+this.options.autosave.uniqueId)&&""!=localStorage.getItem("smde_"+this.options.autosave.uniqueId)&&(this.codemirror.setValue(localStorage.getItem("smde_"+this.options.autosave.uniqueId)),this.options.autosave.foundSavedValue=!0),this.options.autosave.loaded=!0),localStorage.setItem("smde_"+this.options.autosave.uniqueId,e.value());var t=document.getElementById("autosaved");if(null!=t&&void 0!=t&&""!=t){var n=new Date,r=n.getHours(),i=n.getMinutes(),o="am",a=r;a>=12&&(a=r-12,o="pm"),0==a&&(a=12),i=10>i?"0"+i:i,t.innerHTML="Autosaved: "+a+":"+i+" "+o}this.autosaveTimeoutId=setTimeout(function(){e.autosave()},this.options.autosave.delay||1e4)}else console.log("SimpleMDE: localStorage not available, cannot autosave")},B.prototype.clearAutosavedValue=function(){if(_()){if(void 0==this.options.autosave||void 0==this.options.autosave.uniqueId||""==this.options.autosave.uniqueId)return void console.log("SimpleMDE: You must set a uniqueId to clear the autosave value");localStorage.removeItem("smde_"+this.options.autosave.uniqueId)}else console.log("SimpleMDE: localStorage not available, cannot autosave")},B.prototype.createSideBySide=function(){var e=this.codemirror,t=e.getWrapperElement(),n=t.nextSibling;n&&/editor-preview-side/.test(n.className)||(n=document.createElement("div"),n.className="editor-preview-side",t.parentNode.insertBefore(n,t.nextSibling));var r=!1,i=!1;return e.on("scroll",function(e){if(r)return void(r=!1);i=!0;var t=e.getScrollInfo().height-e.getScrollInfo().clientHeight,o=parseFloat(e.getScrollInfo().top)/t,a=(n.scrollHeight-n.clientHeight)*o;n.scrollTop=a}),n.onscroll=function(){if(i)return void(i=!1);r=!0;var t=n.scrollHeight-n.clientHeight,o=parseFloat(n.scrollTop)/t,a=(e.getScrollInfo().height-e.getScrollInfo().clientHeight)*o;e.scrollTo(0,a)},n},B.prototype.createToolbar=function(e){if(e=e||this.options.toolbar,e&&0!==e.length){var t;for(t=0;t<e.length;t++)void 0!=K[e[t]]&&(e[t]=K[e[t]]);var n=document.createElement("div");n.className="editor-toolbar";var r=this,a={};for(r.toolbar=e,t=0;t<e.length;t++)if(("guide"!=e[t].name||r.options.toolbarGuideIcon!==!1)&&!(r.options.hideIcons&&-1!=r.options.hideIcons.indexOf(e[t].name)||("fullscreen"==e[t].name||"side-by-side"==e[t].name)&&$())){if("|"===e[t]){for(var s=!1,c=t+1;c<e.length;c++)"|"===e[c]||r.options.hideIcons&&-1!=r.options.hideIcons.indexOf(e[c].name)||(s=!0);if(!s)continue}!function(e){var t;t="|"===e?o():i(e,r.options.toolbarTips,r.options.shortcuts),e.action&&("function"==typeof e.action?t.onclick=function(t){t.preventDefault(),e.action(r)}:"string"==typeof e.action&&(t.href=e.action,t.target="_blank")),a[e.name||e]=t,n.appendChild(t)}(e[t])}r.toolbarElements=a;var u=this.codemirror;u.on("cursorActivity",function(){var e=l(u);for(var t in a)!function(t){var n=a[t];e[t]?n.className+=" active":"fullscreen"!=t&&"side-by-side"!=t&&(n.className=n.className.replace(/\s*active\s*/g,""))}(t)});var f=u.getWrapperElement();return f.parentNode.insertBefore(n,f),n}},B.prototype.createStatusbar=function(e){e=e||this.options.status;var t=this.options,n=this.codemirror;if(e&&0!==e.length){var r,i,o,a=[];for(r=0;r<e.length;r++)if(i=void 0,o=void 0,"object"==typeof e[r])a.push({className:e[r].className,defaultValue:e[r].defaultValue,onUpdate:e[r].onUpdate});else{var l=e[r];"words"===l?(o=function(e){e.innerHTML=W(n.getValue())},i=function(e){e.innerHTML=W(n.getValue())}):"lines"===l?(o=function(e){e.innerHTML=n.lineCount()},i=function(e){e.innerHTML=n.lineCount()}):"cursor"===l?(o=function(e){e.innerHTML="0:0"},i=function(e){var t=n.getCursor();e.innerHTML=t.line+":"+t.ch}):"autosave"===l&&(o=function(e){void 0!=t.autosave&&t.autosave.enabled===!0&&e.setAttribute("id","autosaved")}),a.push({className:l,defaultValue:o,onUpdate:i})}var s=document.createElement("div");for(s.className="editor-statusbar",r=0;r<a.length;r++){var c=a[r],u=document.createElement("span");u.className=c.className,"function"==typeof c.defaultValue&&c.defaultValue(u),"function"==typeof c.onUpdate&&this.codemirror.on("update",function(e,t){return function(){t.onUpdate(e)}}(u,c)),s.appendChild(u)}var f=this.codemirror.getWrapperElement();return f.parentNode.insertBefore(s,f.nextSibling),s}},B.prototype.value=function(e){return void 0===e?this.codemirror.getValue():(this.codemirror.getDoc().setValue(e),this)},B.toggleBold=c,B.toggleItalic=u,B.toggleStrikethrough=f,B.toggleBlockquote=d,B.toggleHeadingSmaller=p,B.toggleHeadingBigger=m,B.toggleHeading1=g,B.toggleHeading2=v,B.toggleHeading3=y,B.toggleCodeBlock=h,B.toggleUnorderedList=x,B.toggleOrderedList=b,B.cleanBlock=w,B.drawLink=k,B.drawImage=S,B.drawTable=C,B.drawHorizontalRule=L,B.undo=T,B.redo=M,B.togglePreview=A,B.toggleSideBySide=N,B.toggleFullScreen=s,B.prototype.toggleBold=function(){c(this)},B.prototype.toggleItalic=function(){u(this)},B.prototype.toggleStrikethrough=function(){f(this)},B.prototype.toggleBlockquote=function(){d(this)},B.prototype.toggleHeadingSmaller=function(){p(this)},B.prototype.toggleHeadingBigger=function(){m(this)},B.prototype.toggleHeading1=function(){g(this)},B.prototype.toggleHeading2=function(){v(this)},B.prototype.toggleHeading3=function(){y(this)},B.prototype.toggleCodeBlock=function(){h(this)},B.prototype.toggleUnorderedList=function(){x(this)},B.prototype.toggleOrderedList=function(){b(this)},B.prototype.cleanBlock=function(){w(this)},B.prototype.drawLink=function(){k(this)},B.prototype.drawImage=function(){S(this)},B.prototype.drawTable=function(){C(this)},B.prototype.drawHorizontalRule=function(){L(this)},B.prototype.undo=function(){T(this)},B.prototype.redo=function(){M(this)},B.prototype.togglePreview=function(){A(this)},B.prototype.toggleSideBySide=function(){N(this)},B.prototype.toggleFullScreen=function(){s(this)},B.prototype.isPreviewActive=function(){var e=this.codemirror,t=e.getWrapperElement(),n=t.lastChild;return/editor-preview-active/.test(n.className)},B.prototype.isSideBySideActive=function(){var e=this.codemirror,t=e.getWrapperElement(),n=t.nextSibling;return/editor-preview-active-side/.test(n.className)},B.prototype.isFullscreenActive=function(){var e=this.codemirror;return e.getOption("fullScreen")},B.prototype.getState=function(){var e=this.codemirror;return l(e)},B.prototype.toTextArea=function(){var e=this.codemirror,t=e.getWrapperElement();t.parentNode&&(this.gui.toolbar&&t.parentNode.removeChild(this.gui.toolbar),this.gui.statusbar&&t.parentNode.removeChild(this.gui.statusbar),this.gui.sideBySide&&t.parentNode.removeChild(this.gui.sideBySide)),e.toTextArea(),this.autosaveTimeoutId&&(clearTimeout(this.autosaveTimeoutId),this.autosaveTimeoutId=void 0,this.clearAutosavedValue())},t.exports=B},{"./codemirror/tablist":19,codemirror:10,"codemirror-spell-checker":4,"codemirror/addon/display/fullscreen.js":5,"codemirror/addon/display/placeholder.js":6,"codemirror/addon/edit/continuelist.js":7,"codemirror/addon/mode/overlay.js":8,"codemirror/addon/selection/mark-selection.js":9,"codemirror/mode/gfm/gfm.js":11,"codemirror/mode/markdown/markdown.js":12,"codemirror/mode/xml/xml.js":14,marked:17}]},{},[20])(20)});
\ No newline at end of file
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index 44ad8353..cbfecf82 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -10,6 +10,10 @@
 
   <script src="{% static "wiki/js/jquery-3.3.1.min.js" %}" type="text/javascript"></script>
   <script src="{% static "wiki/js/core.js" %}" type="text/javascript"></script>
+
+  <link rel="stylesheet" href="{% static "css/wiki/simplemde.min.css" %}">
+  <link rel="stylesheet" href="{% static "css/wiki/simplemde-fixes.css" %}">
+  <script src="{% static "js/wiki/simplemde.min.js" %}" type="text/javascript"></script>
 {% endblock %}
 
 {% block content %}
@@ -34,4 +38,6 @@
   {% endblock %}
 
   {% include "base/footer.html" %}
+
+  <script src="{% static "js/wiki/load_editor.js" %}" type="text/javascript"></script>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/forms/fields/char.html b/pydis_site/templates/wiki/forms/fields/char.html
index 9539f6eb..0f130751 100644
--- a/pydis_site/templates/wiki/forms/fields/char.html
+++ b/pydis_site/templates/wiki/forms/fields/char.html
@@ -17,10 +17,9 @@
     <div class="field">
       <div class="control">
         {% if is_markitup %}
-          <textarea class="textarea is-family-monospace{% if field.errors %} is-danger{% endif %}"
+          <textarea class="simple-mde textarea is-family-monospace{% if field.errors %} is-danger{% endif %}"
                     id="{{ field.auto_id }}"
                     name="{{ field.name }}"
-                    rows = 10
 
                     {% if field.required %}required{% endif %}
                     {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
-- 
cgit v1.2.3


From e8e8b06bf763793f81a9a4515cf1906ab45c9f66 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 13 Apr 2019 15:33:31 +0100
Subject: Small cosmetic changes

---
 pydis_site/static/js/wiki/load_editor.js |   4 +-
 pydis_site/templates/wiki/edit.html      | 237 ++++++++++++++++---------------
 2 files changed, 120 insertions(+), 121 deletions(-)

diff --git a/pydis_site/static/js/wiki/load_editor.js b/pydis_site/static/js/wiki/load_editor.js
index 95aa3d65..a9f78e65 100644
--- a/pydis_site/static/js/wiki/load_editor.js
+++ b/pydis_site/static/js/wiki/load_editor.js
@@ -1,10 +1,8 @@
 (function() {
-    window.editors = {};
+    window.editors = {};  // So that other scripts can get at 'em
 
     let elements = document.getElementsByClassName("simple-mde");
 
-    console.log(elements);
-
     for (let element of elements) {
         window.editors[element.id] = new SimpleMDE({
             "element": element,
diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index aa9ee032..fc5955e9 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -2,138 +2,139 @@
 {% load wiki_tags i18n sekizai_tags %}
 
 
-{% block wiki_pagetitle %}{% trans "Edit" %}: {{ article.current_revision.title }}{% endblock %}
+{% block wiki_pagetitle %}
+  Edit: {{ article.current_revision.title }}
+{% endblock %}
 
 {% block wiki_contents_tab %}
 
-{% if not user.is_authenticated %}
-<p class="alert alert-warning">
-{% trans "<strong>Warning:</strong> You are not logged in. Your IP address will be logged." %}
-<a href="{% url 'wiki:login' %}?next={% url 'wiki:edit' article_id=article.id path=urlpath.path %}">{% trans "Click here to log in" %} &raquo;</a>
-</p>
-{% endif %}
-
-<div class="row">
-
-  <div class="col-lg-8">
-    <form method="POST" class="form-horizontal" id="article_edit_form">
-      {% with edit_form as form %}
-        {% include "wiki/includes/editor.html" %}
-      {% endwith %}
-
-      <div class="form-group form-actions">
-        <div class="col-lg-12">
-          <div class="col-lg-offset-2">
-            <button class="btn btn-default" type="submit" name="preview" value="1" id="id_preview"
-                    formaction="{% url 'wiki:preview' path=urlpath.path article_id=article.id %}"
-                    formtarget="previewWindow"
-                    >
-              <span class="fa fa-eye"></span>
-              {% trans "Preview" %}
-            </button>
-            <button class="btn btn-primary" type="submit" name="save" value="1" id="id_save">
-              <span class="fa fa-check"></span>
-              {% trans "Save changes" %}
-            </button>
-
-            <div class="btn-toolbar pull-right">
-              {% if user.is_authenticated and urlpath.path %}
-              <a href="{% url 'wiki:move' path=urlpath.path article_id=article.id %}" class="btn btn-warning ">
-                <span class="fa fa-random"></span>
-                {% trans "Move article" %}
-              </a>
-              {% endif %}
-              {% if article|can_delete:user %}
-              <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="btn btn-danger">
-                <span class="fa fa-trash-o"></span>
-                {% trans "Delete article" %}
-              </a>
-              {% endif %}
+  {% if not user.is_authenticated %}
+  <p class="alert alert-warning">
+  {% trans "<strong>Warning:</strong> You are not logged in. Your IP address will be logged." %}
+  <a href="{% url 'wiki:login' %}?next={% url 'wiki:edit' article_id=article.id path=urlpath.path %}">{% trans "Click here to log in" %} &raquo;</a>
+  </p>
+  {% endif %}
+
+  <div class="row">
+
+    <div class="col-lg-8">
+      <form method="POST" class="form-horizontal" id="article_edit_form">
+        {% with edit_form as form %}
+          {% include "wiki/includes/editor.html" %}
+        {% endwith %}
+
+        <div class="form-group form-actions">
+          <div class="col-lg-12">
+            <div class="col-lg-offset-2">
+              <button class="btn btn-default" type="submit" name="preview" value="1" id="id_preview"
+                      formaction="{% url 'wiki:preview' path=urlpath.path article_id=article.id %}"
+                      formtarget="previewWindow"
+                      >
+                <span class="fa fa-eye"></span>
+                {% trans "Preview" %}
+              </button>
+              <button class="btn btn-primary" type="submit" name="save" value="1" id="id_save">
+                <span class="fa fa-check"></span>
+                {% trans "Save changes" %}
+              </button>
+
+              <div class="btn-toolbar pull-right">
+                {% if user.is_authenticated and urlpath.path %}
+                <a href="{% url 'wiki:move' path=urlpath.path article_id=article.id %}" class="btn btn-warning ">
+                  <span class="fa fa-random"></span>
+                  {% trans "Move article" %}
+                </a>
+                {% endif %}
+                {% if article|can_delete:user %}
+                <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="btn btn-danger">
+                  <span class="fa fa-trash-o"></span>
+                  {% trans "Delete article" %}
+                </a>
+                {% endif %}
+              </div>
             </div>
           </div>
         </div>
-      </div>
 
-    </form>
-  </div>
+      </form>
+    </div>
 
-  <div class="col-lg-4" id="wiki-edit-sidebar">
-    {% include "wiki/includes/editor_sidebar.html" %}
-  </div>
+    <div class="col-lg-4" id="wiki-edit-sidebar">
+      {% include "wiki/includes/editor_sidebar.html" %}
+    </div>
 
-</div>
+  </div>
 
-<div style="clear: both"></div>
+  <div style="clear: both"></div>
 
-{% include "wiki/includes/modals.html" %}
+  {% include "wiki/includes/modals.html" %}
 
-<div class="modal fade wiki-modal" id="previewModal">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-body">
-        <iframe name="previewWindow" frameborder="0"></iframe>
-      </div>
-      <div class="modal-footer">
-        <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
-          <span class="fa fa-arrow-circle-left"></span>
-          {% trans "Back to editor" %}
-        </a>
-        <a class="btn btn-lg btn-primary" id="id_preview_save_changes" href="#">
-          <span class="fa fa-check"></span>
-          {% trans "Save changes" %}
-        </a>
+  <div class="modal fade wiki-modal" id="previewModal">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-body">
+          <iframe name="previewWindow" frameborder="0"></iframe>
+        </div>
+        <div class="modal-footer">
+          <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
+            <span class="fa fa-arrow-circle-left"></span>
+            {% trans "Back to editor" %}
+          </a>
+          <a class="btn btn-lg btn-primary" id="id_preview_save_changes" href="#">
+            <span class="fa fa-check"></span>
+            {% trans "Save changes" %}
+          </a>
+        </div>
       </div>
     </div>
   </div>
-</div>
-
-{% addtoblock "js" %}
-<script language="javascript">
-  $(document).ready(function() {
-    $("#article_edit_form :input").change(function() {
-       $("#article_edit_form").data("changed",true);
-    });
-    if ($("#article_edit_form").find(".alert-danger").length > 0 || $("#article_edit_form").find(".has-error").length > 0 ) {
-      // Set the forms status as "changed" if there was a submission error
-      $("#article_edit_form").data("changed",true);
-    }
-    window.onbeforeunload = confirmOnPageExit;
-    var click_time = 0;
-    $("#article_edit_form").on("submit", function (ev) {
-        now = Date.now();
-        elapsed = now-click_time;
-        click_time = now;
-        if (elapsed < 3000)
-            ev.preventDefault();
-        window.onbeforeunload = null;
-        return true;
-    });
-    $("#id_preview").on("click", function () {
-        $("#previewModal").modal("show");
-        return true;
-    });
-    $("#id_preview_save_changes").on("click", function (ev) {
-        ev.preventDefault();
-        $("#id_save").trigger("click");
-    });
-  });
-
-var confirmOnPageExit = function (e) {
-  if ($("#article_edit_form").data("changed")) {
-    e = e || window.event;
-    var message = "You have unsaved changes!";
-    // For IE6-8 and Firefox prior to version 4
-    if (e) {
-        e.returnValue = message;
-    }
-    // For Chrome, Safari, IE8+ and Opera 12+
-    return message;
-  } else {
-    // If the form hasn't been changed, don't display the pop-up
-    return;
-  }
-};
-</script>
-{% endaddtoblock %}
 
+  {% addtoblock "js" %}
+    <script language="javascript">
+      $(document).ready(function() {
+        $("#article_edit_form :input").change(function() {
+           $("#article_edit_form").data("changed",true);
+        });
+        if ($("#article_edit_form").find(".alert-danger").length > 0 || $("#article_edit_form").find(".has-error").length > 0 ) {
+          // Set the forms status as "changed" if there was a submission error
+          $("#article_edit_form").data("changed",true);
+        }
+        window.onbeforeunload = confirmOnPageExit;
+        var click_time = 0;
+        $("#article_edit_form").on("submit", function (ev) {
+            now = Date.now();
+            elapsed = now-click_time;
+            click_time = now;
+            if (elapsed < 3000)
+                ev.preventDefault();
+            window.onbeforeunload = null;
+            return true;
+        });
+        $("#id_preview").on("click", function () {
+            $("#previewModal").modal("show");
+            return true;
+        });
+        $("#id_preview_save_changes").on("click", function (ev) {
+            ev.preventDefault();
+            $("#id_save").trigger("click");
+        });
+      });
+
+      var confirmOnPageExit = function (e) {
+        if ($("#article_edit_form").data("changed")) {
+          e = e || window.event;
+          var message = "You have unsaved changes!";
+          // For IE6-8 and Firefox prior to version 4
+          if (e) {
+              e.returnValue = message;
+          }
+          // For Chrome, Safari, IE8+ and Opera 12+
+          return message;
+        } else {
+          // If the form hasn't been changed, don't display the pop-up
+          return;
+        }
+      };
+    </script>
+  {% endaddtoblock %}
 {% endblock %}
-- 
cgit v1.2.3


From 34b72419c312d21b77185b72a47cb49508ed47e9 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 13 Apr 2019 16:39:47 +0100
Subject: Some more work towards the editor pages

---
 pydis_site/static/js/wiki/load_editor.js           |  51 ++++--
 pydis_site/templates/wiki/create_root.html         |   7 +-
 pydis_site/templates/wiki/edit.html                | 194 ++++++++++++---------
 pydis_site/templates/wiki/includes/editor.html     |   7 -
 .../templates/wiki/includes/editor_sidebar.html    |  12 --
 pydis_site/templates/wiki/settings.html            |   7 +-
 6 files changed, 161 insertions(+), 117 deletions(-)

diff --git a/pydis_site/static/js/wiki/load_editor.js b/pydis_site/static/js/wiki/load_editor.js
index a9f78e65..1837c7fd 100644
--- a/pydis_site/static/js/wiki/load_editor.js
+++ b/pydis_site/static/js/wiki/load_editor.js
@@ -1,8 +1,44 @@
 (function() {
     window.editors = {};  // So that other scripts can get at 'em
 
+    const TOCText = "[TOC]";
+
+    const headingAction = {
+        name: "heading",
+        action: SimpleMDE.toggleHeadingSmaller,
+        className: "fa fa-heading",
+        title: "Heading",
+    };
+
+    const imageAction = {
+        name: "image",
+        action: SimpleMDE.drawImage,
+        className: "fa fa-image",
+        title: "Insert image",
+    };
+
+    const TOCAction = {
+        name: "toc",
+        action: inserTOC,
+        className: "fa fa-stream",
+        title: "Insert Table of Contents"
+    };
+
     let elements = document.getElementsByClassName("simple-mde");
 
+    function inserTOC(editor) {
+        let doc = editor.codemirror.getDoc(),
+            cursor = doc.getCursor(),
+            line = doc.getLine(cursor.line),
+            position = {"line": cursor.line};
+
+        if (line.length === 0) {
+            doc.replaceRange(TOCText, position);
+        } else {
+            doc.replaceRange("\n" + TOCText, position)
+        }
+    }
+
     for (let element of elements) {
         window.editors[element.id] = new SimpleMDE({
             "element": element,
@@ -28,19 +64,10 @@
             tabSize: 4,
 
             toolbar: [
-                "bold", "italic", "strikethrough", {
-                    name: "heading",
-                    action: SimpleMDE.toggleHeadingSmaller,
-                    className: "fa fa-heading",
-                    title: "Heading",
-                }, "|",
+                "bold", "italic", "strikethrough", headingAction, "|",
                 "code", "quote", "unordered-list", "ordered-list", "|",
-                "link", {
-                    name: "image",
-                    action: SimpleMDE.drawImage,
-                    className: "fa fa-image",
-                    title: "Insert image",
-                }, "table", "horizontal-rule", "|",
+                "link", imageAction, "table", "horizontal-rule", "|",
+                TOCAction, "|",
                 "preview", "side-by-side", "fullscreen", "|",
                 "guide"
             ],
diff --git a/pydis_site/templates/wiki/create_root.html b/pydis_site/templates/wiki/create_root.html
index 08ee7f82..376321c6 100644
--- a/pydis_site/templates/wiki/create_root.html
+++ b/pydis_site/templates/wiki/create_root.html
@@ -39,7 +39,12 @@
       </div>
       <div class="field-body">
         <div class="control">
-          <input type="submit" class="button is-primary is-medium" name="save_changes" value="Create" />
+          <button type="submit" class="button is-primary" name="save_changes">
+            <span class="icon">
+              <i class="fas fa-plus"></i>
+            </span>
+            <span>Create</span>
+          </button>
         </div>
       </div>
     </div>
diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index fc5955e9..8d5b61db 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -6,13 +6,83 @@
   Edit: {{ article.current_revision.title }}
 {% endblock %}
 
+{% block head %}
+  {{ block.super }}
+
+  <script language="javascript">
+    {# I'm sorry this JS sucks, it came with the wiki, just stuck right in here. #}
+
+    $(document).ready(function() {
+      $("#article_edit_form :input").change(function() {
+         $("#article_edit_form").data("changed",true);
+      });
+      if ($("#article_edit_form").find(".alert-danger").length > 0 || $("#article_edit_form").find(".has-error").length > 0 ) {
+        // Set the forms status as "changed" if there was a submission error
+        $("#article_edit_form").data("changed",true);
+      }
+      window.onbeforeunload = confirmOnPageExit;
+      var click_time = 0;
+      $("#article_edit_form").on("submit", function (ev) {
+          now = Date.now();
+          elapsed = now-click_time;
+          click_time = now;
+          if (elapsed < 3000)
+              ev.preventDefault();
+          window.onbeforeunload = null;
+          return true;
+      });
+      $("#id_preview").on("click", function () {
+          $("#previewModal").modal("show");
+          return true;
+      });
+      $("#id_preview_save_changes").on("click", function (ev) {
+          ev.preventDefault();
+          $("#id_save").trigger("click");
+      });
+    });
+
+    var confirmOnPageExit = function (e) {
+      if ($("#article_edit_form").data("changed")) {
+        e = e || window.event;
+        var message = "You have unsaved changes!";
+        // For IE6-8 and Firefox prior to version 4
+        if (e) {
+            e.returnValue = message;
+        }
+        // For Chrome, Safari, IE8+ and Opera 12+
+        return message;
+      } else {
+        // If the form hasn't been changed, don't display the pop-up
+        return;
+      }
+    };
+  </script>
+
+  <script type="text/javascript">
+    $(document).ready( function() {
+      $('.sidebar-form').each(function () {
+        $(this).submit( function() {
+          this.unsaved_article_title.value = $('#id_title').val();
+          this.unsaved_article_content.value = $('#id_content').val();
+        });
+      });
+    });
+  </script>
+
+  <script language="javascript">
+    $(document).ready(function() {
+      $("#id_revision").val('{{ article.current_revision.id }}');
+    });
+  </script>
+{% endblock %}
+
 {% block wiki_contents_tab %}
 
   {% if not user.is_authenticated %}
-  <p class="alert alert-warning">
-  {% trans "<strong>Warning:</strong> You are not logged in. Your IP address will be logged." %}
-  <a href="{% url 'wiki:login' %}?next={% url 'wiki:edit' article_id=article.id path=urlpath.path %}">{% trans "Click here to log in" %} &raquo;</a>
-  </p>
+    <p class="alert alert-warning">
+      {% trans "<strong>Warning:</strong> You are not logged in. Your IP address will be logged." %}
+      <a href="{% url 'wiki:login' %}?next={% url 'wiki:edit' article_id=article.id path=urlpath.path %}">{% trans "Click here to log in" %} &raquo;</a>
+    </p>
   {% endif %}
 
   <div class="row">
@@ -23,39 +93,44 @@
           {% include "wiki/includes/editor.html" %}
         {% endwith %}
 
-        <div class="form-group form-actions">
-          <div class="col-lg-12">
-            <div class="col-lg-offset-2">
-              <button class="btn btn-default" type="submit" name="preview" value="1" id="id_preview"
-                      formaction="{% url 'wiki:preview' path=urlpath.path article_id=article.id %}"
-                      formtarget="previewWindow"
-                      >
-                <span class="fa fa-eye"></span>
-                {% trans "Preview" %}
-              </button>
-              <button class="btn btn-primary" type="submit" name="save" value="1" id="id_save">
-                <span class="fa fa-check"></span>
-                {% trans "Save changes" %}
-              </button>
-
-              <div class="btn-toolbar pull-right">
-                {% if user.is_authenticated and urlpath.path %}
-                <a href="{% url 'wiki:move' path=urlpath.path article_id=article.id %}" class="btn btn-warning ">
-                  <span class="fa fa-random"></span>
-                  {% trans "Move article" %}
-                </a>
-                {% endif %}
-                {% if article|can_delete:user %}
-                <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="btn btn-danger">
-                  <span class="fa fa-trash-o"></span>
-                  {% trans "Delete article" %}
-                </a>
-                {% endif %}
-              </div>
-            </div>
-          </div>
+        <button class="button is-primary" type="submit" name="preview" value="1" id="id_preview"
+                formaction="{% url 'wiki:preview' path=urlpath.path article_id=article.id %}"
+                formtarget="previewWindow"
+        >
+          <span class="icon">
+            <i class="fas fa-eye"></i>
+          </span>
+          <span>Preview</span>
+        </button>
+        <button class="button is-primary" type="submit" name="save" value="1" id="id_save">
+          <span class="icon">
+            <i class="fas fa-save"></i>
+          </span>
+          <span>Save Changes</span>
+        </button>
+
+        <div class="is-pulled-right">
+          {% if user.is_authenticated and urlpath.path %}
+            <a href="{% url 'wiki:move' path=urlpath.path article_id=article.id %}" class="button is-warning ">
+              <span class="icon">
+                <i class="fas fa-random"></i>
+              </span>
+              <span>Move Article</span>
+            </a>
+          {% endif %}
+          {% if article|can_delete:user %}
+            <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="button is-danger">
+              <span class="icon">
+                <i class="fas fa-trash"></i>
+              </span>
+              <span>Delete Article</span>
+            </a>
+          {% endif %}
         </div>
 
+        <br />
+        <br />
+
       </form>
     </div>
 
@@ -88,53 +163,4 @@
       </div>
     </div>
   </div>
-
-  {% addtoblock "js" %}
-    <script language="javascript">
-      $(document).ready(function() {
-        $("#article_edit_form :input").change(function() {
-           $("#article_edit_form").data("changed",true);
-        });
-        if ($("#article_edit_form").find(".alert-danger").length > 0 || $("#article_edit_form").find(".has-error").length > 0 ) {
-          // Set the forms status as "changed" if there was a submission error
-          $("#article_edit_form").data("changed",true);
-        }
-        window.onbeforeunload = confirmOnPageExit;
-        var click_time = 0;
-        $("#article_edit_form").on("submit", function (ev) {
-            now = Date.now();
-            elapsed = now-click_time;
-            click_time = now;
-            if (elapsed < 3000)
-                ev.preventDefault();
-            window.onbeforeunload = null;
-            return true;
-        });
-        $("#id_preview").on("click", function () {
-            $("#previewModal").modal("show");
-            return true;
-        });
-        $("#id_preview_save_changes").on("click", function (ev) {
-            ev.preventDefault();
-            $("#id_save").trigger("click");
-        });
-      });
-
-      var confirmOnPageExit = function (e) {
-        if ($("#article_edit_form").data("changed")) {
-          e = e || window.event;
-          var message = "You have unsaved changes!";
-          // For IE6-8 and Firefox prior to version 4
-          if (e) {
-              e.returnValue = message;
-          }
-          // For Chrome, Safari, IE8+ and Opera 12+
-          return message;
-        } else {
-          // If the form hasn't been changed, don't display the pop-up
-          return;
-        }
-      };
-    </script>
-  {% endaddtoblock %}
 {% endblock %}
diff --git a/pydis_site/templates/wiki/includes/editor.html b/pydis_site/templates/wiki/includes/editor.html
index 6686d8dd..bc1da1a0 100644
--- a/pydis_site/templates/wiki/includes/editor.html
+++ b/pydis_site/templates/wiki/includes/editor.html
@@ -2,10 +2,3 @@
 {% include "wiki/includes/editormedia.html" %}
 
 {% wiki_form form %}
-{% addtoblock "js" %}
-<script language="javascript">
-  $(document).ready(function() {
-    $("#id_revision").val('{{ article.current_revision.id }}');
-  });
-</script>
-{% endaddtoblock %}
diff --git a/pydis_site/templates/wiki/includes/editor_sidebar.html b/pydis_site/templates/wiki/includes/editor_sidebar.html
index 480dc239..87efed4d 100644
--- a/pydis_site/templates/wiki/includes/editor_sidebar.html
+++ b/pydis_site/templates/wiki/includes/editor_sidebar.html
@@ -1,16 +1,4 @@
 {% load i18n sekizai_tags %}
-{% addtoblock "js" %}
-<script type="text/javascript">
-  $(document).ready( function() {
-    $('.sidebar-form').each(function () {
-      $(this).submit( function() {
-        this.unsaved_article_title.value = $('#id_title').val();
-        this.unsaved_article_content.value = $('#id_content').val();
-      });
-    });
-  });
-</script>
-{% endaddtoblock %}
 
 <div class="panel-group" id="accordion_{{ plugin.slug }}">
 
diff --git a/pydis_site/templates/wiki/settings.html b/pydis_site/templates/wiki/settings.html
index 3e8c8dab..c26e4ccd 100644
--- a/pydis_site/templates/wiki/settings.html
+++ b/pydis_site/templates/wiki/settings.html
@@ -17,7 +17,12 @@
       </div>
       <div class="field-body">
         <div class="control">
-          <input type="submit" class="button is-primary is-medium" name="save" value="Save Changes" />
+          <button type="submit" class="button is-primary" name="save">
+            <span class="icon">
+              <i class="fas fa-save"></i>
+            </span>
+            <span>Save Changes</span>
+          </button>
         </div>
       </div>
     </div>
-- 
cgit v1.2.3


From ed0313e57a5729097c04763dbc5d12c6434433eb Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 13 Apr 2019 19:25:41 +0100
Subject: Some work towards fixed navigation

---
 pydis_site/templates/wiki/article.html             |  40 +++----
 pydis_site/templates/wiki/base.html                |   7 +-
 .../templates/wiki/includes/article_menu.html      | 123 +++++++++++++--------
 3 files changed, 100 insertions(+), 70 deletions(-)

diff --git a/pydis_site/templates/wiki/article.html b/pydis_site/templates/wiki/article.html
index 65877068..03c007e6 100644
--- a/pydis_site/templates/wiki/article.html
+++ b/pydis_site/templates/wiki/article.html
@@ -4,37 +4,37 @@
 
 {% block wiki_pagetitle %}{{ article.current_revision.title }}{% endblock %}
 
+{% block wiki_navbar %}
+  {% include "wiki/includes/article_menu.html" %}
+{% endblock %}
+
 {% block wiki_breadcrumbs %}
-{% include "wiki/includes/breadcrumbs.html" %}
+  {% include "wiki/includes/breadcrumbs.html" %}
 {% endblock %}
 
 {% block wiki_contents %}
-
   <div id="article-container">
-    <ul class="nav nav-pills" id="article-menu">
-      <li class="pull-left" id="article-title-li">
-        <h1 id="article-title">
-          {{ article.current_revision.title }}
-          <small style="font-size: 14px;">
-            {% if urlpath.parent %}
-            <a href="{% url 'wiki:get' path=urlpath.path %}"><span class="fa fa-bookmark"></span> {{ urlpath.slug }}</a>
-            {% endif %}
-            {% if article.current_revision.locked %}
-              <span class="fa fa-lock"></span> {% trans "locked" %}
-            {% endif %}
-          </small>
-        </h1>
-      </li>
-      {% include "wiki/includes/article_menu.html" %}
-    </ul>
+    <h1 id="article-title">
+      {{ article.current_revision.title }}
+      <small style="font-size: 14px;">
+        {% if urlpath.parent %}
+          <a href="{% url 'wiki:get' path=urlpath.path %}"><span class="fa fa-bookmark"></span> {{ urlpath.slug }}</a>
+        {% endif %}
+
+        {% if article.current_revision.locked %}
+          <span class="icon">
+            <i class="fas fa-lock"></i>
+          </span> locked
+        {% endif %}
+      </small>
+    </h1>
     <div>
       {% block wiki_contents_tab %}
       {% endblock %}
     </div>
   </div>
-
 {% endblock %}
 
 {% block wiki_footer_prepend %}
-  <p style="margin-bottom: 10px;"><em>{% trans "This article was last modified:" %} {{ article.current_revision.modified }}</em></p>
+  <p style="margin-bottom: 10px;"><em>This article was last modified: {{ article.current_revision.modified }}</em></p>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index cbfecf82..1affbe39 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -19,10 +19,11 @@
 {% block content %}
   {% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="far" use_logo=True %}
 
-  {% block wiki_body %}
-    {% block wiki_navbar %}
+  {% block wiki_navbar %}
+
+  {% endblock %}
 
-    {% endblock %}
+  {% block wiki_body %}
 
     <section class="section">
       <div class="container">
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index 9a83327b..7cf23a71 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -1,53 +1,82 @@
 {% load i18n wiki_tags %}
 
 {% with selected_tab as selected %}
+  <nav class="navbar is-light" role="navigation" aria-label="wiki navigation">
+    <div class="container">
+      <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>
+        <span aria-hidden="true"></span>
+      </a>
 
-<li class="pull-right{% if selected == "settings" %} active{% endif %}">
-  {% if not user.is_anonymous %}
-  <a href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}">
-    <span class="fa fa-wrench"></span>
-    <span class="hidden-xs">{% trans "Settings" %}</span>
-  </a>
-  {% endif %}
-</li>
-
-{% for plugin in article_tabs %}
-  <li class="pull-right{% if selected == plugin.slug %} active{% endif %}">
-    <a href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}">
-      <span class="{{ plugin.article_tab.1 }}"></span>
-      <span class="hidden-xs">{{ plugin.article_tab.0 }}</span>
-    </a>
-  </li>
-{% endfor %}
-
-<li class="pull-right{% if selected == "history" %} active{% endif %}">
-  <a href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}">
-    <span class="fa fa-clock-o"></span>
-    <span class="hidden-xs">{% trans "Changes" %}</span>
-  </a>
-</li>
-
-{% if article|can_write:user and not article.current_revision.locked %}
-<li class="pull-right{% if selected == "edit" %} active{% endif %}">
-  <a href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}">
-    <span class="fa fa-edit"></span>
-    <span class="hidden-xs">{% trans "Edit" %}</span>
-  </a>
-</li>
-{% else %}
-<li class="pull-right{% if selected == "source" %} active{% endif %}">
-  <a href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}">
-    <span class="fa fa-lock"></span>
-    <span class="hidden-xs">{% trans "View Source" %}</span>
-  </a>
-</li>
-{% endif %}
-
-<li class="pull-right{% if selected == "view" %} active{% endif %}">
-  <a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}">
-    <span class="fa fa-home"></span>
-    <span class="hidden-xs">{% trans "View" %}</span>
-  </a>
-</li>
+      <div class="navbar-menu" id="wiki-menu">
+        {% if not user.is_anonymous %}
+          <a class="navbar-item{% if selected == "settings" %} is-active{% endif %}"
+             href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}"
+          >
+            <span class="icon">
+              <i class="fas fa-wrench"></i>
+            </span>
+
+            <span>&nbsp;Settings</span>
+          </a>
+        {% endif %}
+
+        {% for plugin in article_tabs %}
+          <a class="navbar-item{% if selected == plugin.slug %} is-active{% endif %}"
+             href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}"
+          >
+            <span class="icon">
+              <i class="{{ plugin.article_tab.1 }}"></i>
+            </span>
+
+            <span>&nbsp;{{ plugin.article_tab.0 }}</span>
+          </a>
+        {% endfor %}
+
+        <a class="navbar-item{% if selected == "history" %} is-active{% endif %}"
+           href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}"
+        >
+          <span class="icon">
+            <i class="fas fa-clock"></i>
+          </span>
+
+          <span>&nbsp;Changes</span>
+        </a>
+
+        {% if article|can_write:user and not article.current_revision.locked %}
+          <a class="navbar-item{% if selected == "edit" %} is-active{% endif %}"
+             href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}"
+          >
+            <span class="icon">
+              <i class="fas fa-edit"></i>
+            </span>
+
+            <span>&nbsp;Edit</span>
+          </a>
+        {% else %}
+          <a class="navbar-item{% if selected == "source" %} is-active{% endif %}"
+             href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}"
+          >
+            <span class="icon">
+              <i class="fas fa-lock"></i>
+            </span>
+
+            <span>&nbsp;View Source</span>
+          </a>
+        {% endif %}
+
+        <a class="navbar-item{% if selected == "view" %} is-active{% endif %}"
+           href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}"
+        >
+          <span class="icon">
+            <i class="fas fa-home"></i>
+          </span>
+
+          <span>&nbsp;View</span>
+        </a>
+      </div>
+    </div>
+  </nav>
 
 {% endwith %}
-- 
cgit v1.2.3


From adafc9e405434b6b5ce47eff5be0e8be9e9688b6 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sun, 14 Apr 2019 14:44:15 +0100
Subject: Fixing up image plugin

---
 .gitignore                          | 1 +
 pydis_site/apps/home/urls.py        | 5 ++++-
 pydis_site/settings.py              | 5 +++++
 pydis_site/templates/base/base.html | 6 ++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f4306438..2888775d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,6 +113,7 @@ rethinkdb_data/
 # Node modules
 node_modules/
 
+media/
 pip-wheel-metadata/
 staticfiles/
 
diff --git a/pydis_site/apps/home/urls.py b/pydis_site/apps/home/urls.py
index dacf0a3a..34ceda40 100644
--- a/pydis_site/apps/home/urls.py
+++ b/pydis_site/apps/home/urls.py
@@ -1,3 +1,5 @@
+from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path, include
 from django.views.generic import TemplateView
@@ -6,6 +8,7 @@ from django.views.generic import TemplateView
 app_name = 'home'
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('notifications/', include('django_nyt.urls')),
     path('wiki/', include('wiki.urls')),
     path('', TemplateView.as_view(template_name='home/index.html'), name='home.index'),
-]
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 6c9af3aa..46d49f44 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -120,7 +120,9 @@ TEMPLATES = [
 
             'context_processors': [
                 'django.template.context_processors.debug',
+                'django.template.context_processors.media',
                 'django.template.context_processors.request',
+                'django.template.context_processors.static',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
 
@@ -181,6 +183,9 @@ STATIC_URL = '/static/'
 STATICFILES_DIRS = [os.path.join(BASE_DIR, 'pydis_site', 'static')]
 STATIC_ROOT = env('STATIC_ROOT', default='staticfiles')
 
+MEDIA_URL = '/media/'
+MEDIA_ROOT = env('MEDIA_ROOT', default='media')
+
 STATICFILES_FINDERS = [
   'django.contrib.staticfiles.finders.FileSystemFinder',
   'django.contrib.staticfiles.finders.AppDirectoriesFinder',
diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html
index 5b124ded..7164ce47 100644
--- a/pydis_site/templates/base/base.html
+++ b/pydis_site/templates/base/base.html
@@ -1,6 +1,5 @@
 {# Base template, with a few basic style definitions. #}
-{% load django_simple_bulma %}
-{% load static %}
+{% load django_simple_bulma sekizai_tags static %}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -22,6 +21,8 @@
   >
 
   {% block head %}{% endblock %}
+
+  {% render_block "css" %}
 </head>
 <body>
 
@@ -29,5 +30,6 @@
   {{ block.super }}
 {% endblock %}
 
+{% render_block "js" %}
 </body>
 </html>
-- 
cgit v1.2.3


From 7992729e29a18f67c6b3324a64a8fc4e58f5acb8 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sun, 14 Apr 2019 15:04:28 +0100
Subject: Remove attachments plugin, add plugin templates

---
 pydis_site/settings.py                             |   5 +-
 .../templates/wiki/plugins/images/index.html       | 110 ++++++++++++
 .../templates/wiki/plugins/images/purge.html       |  33 ++++
 .../templates/wiki/plugins/images/render.html      |  22 +++
 .../wiki/plugins/images/revision_add.html          |  33 ++++
 .../templates/wiki/plugins/images/sidebar.html     | 188 +++++++++++++++++++++
 .../templates/wiki/plugins/links/sidebar.html      |  44 +++++
 .../wiki/plugins/macros/article_list.html          |  14 ++
 .../templates/wiki/plugins/macros/sidebar.html     |  20 +++
 .../wiki/plugins/notifications/menubaritem.html    |  25 +++
 .../wiki/plugins/notifications/settings.html       |  44 +++++
 .../wiki/plugins/templatetags/article_list.html    |  20 +++
 12 files changed, 556 insertions(+), 2 deletions(-)
 create mode 100644 pydis_site/templates/wiki/plugins/images/index.html
 create mode 100644 pydis_site/templates/wiki/plugins/images/purge.html
 create mode 100644 pydis_site/templates/wiki/plugins/images/render.html
 create mode 100644 pydis_site/templates/wiki/plugins/images/revision_add.html
 create mode 100644 pydis_site/templates/wiki/plugins/images/sidebar.html
 create mode 100644 pydis_site/templates/wiki/plugins/links/sidebar.html
 create mode 100644 pydis_site/templates/wiki/plugins/macros/article_list.html
 create mode 100644 pydis_site/templates/wiki/plugins/macros/sidebar.html
 create mode 100644 pydis_site/templates/wiki/plugins/notifications/menubaritem.html
 create mode 100644 pydis_site/templates/wiki/plugins/notifications/settings.html
 create mode 100644 pydis_site/templates/wiki/plugins/templatetags/article_list.html

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 46d49f44..f7cca777 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -87,9 +87,10 @@ INSTALLED_APPS = [
     'sorl.thumbnail',
 
     'wiki.apps.WikiConfig',
-    'wiki.plugins.attachments.apps.AttachmentsConfig',
-    'wiki.plugins.notifications.apps.NotificationsConfig',
+
     'wiki.plugins.images.apps.ImagesConfig',
+    'wiki.plugins.links.apps.LinksConfig',
+    'wiki.plugins.redlinks.apps.RedlinksConfig',
     'wiki.plugins.macros.apps.MacrosConfig',
 ]
 
diff --git a/pydis_site/templates/wiki/plugins/images/index.html b/pydis_site/templates/wiki/plugins/images/index.html
new file mode 100644
index 00000000..191d5533
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/images/index.html
@@ -0,0 +1,110 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n humanize wiki_thumbnails %}
+
+
+{% block wiki_pagetitle %}{% trans "Images" %}: {{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_contents_tab %}
+  <p class="lead">{% trans "The following images are available for this article. Copy the markdown tag to directly refer to an image from the article text." %}</p>
+  <p>
+    <a href="{% url 'wiki:edit' path=urlpath.path article_id=article.id %}">
+      <span class="fa fa-arrow-left"></span>
+      {% trans "Back to edit page" %}
+    </a>
+  </p>
+  <table class="table table-bordered table-striped" style="width: 100%;">
+  {% for image in images %}
+    {% with image.current_revision.imagerevision as revision %}
+    <tr>
+      <th>{{ revision.get_filename|default:_("No file") }}</th>
+      <th>{% trans "Markdown tag" %}</th>
+      <th>{% trans "Uploaded by" %}</th>
+      <th>{% trans "Size" %}</th>
+    </tr>
+    <tr>
+      <td rowspan="3">
+        <p class="thumbnail">
+        {% thumbnail revision.image "250x250" as thumb %}
+            <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
+        {% endthumbnail %}
+        </p>
+        {% if image|can_write:user %}
+        <p>
+          {% if revision.deleted %}
+            <a href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
+              <span class="fa fa-upload"></span>
+              {% trans "Upload and publish new image" %}
+            </a> <br />
+            <a href="{% url 'wiki:images_restore' path=urlpath.path article_id=article.id image_id=image.id %}">
+              <span class="fa fa-refresh"></span>
+              {% trans "Restore image" %}
+            </a>
+          {% else %}
+            <a href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
+              <span class="fa fa-upload"></span>
+              {% trans "Upload replacement" %}
+            </a> <br />
+            <a href="{% url 'wiki:images_delete' path=urlpath.path article_id=article.id image_id=image.id %}">
+              <span class="fa fa-remove"></span>
+              {% trans "Remove image" %}
+            </a>
+          {% endif %}
+          {% if article|can_moderate:user %}
+          <br />
+          <a href="{% url 'wiki:images_purge' path=urlpath.path article_id=article.id image_id=image.id %}">
+            <span class="fa fa-trash"></span>
+            {% trans "Completely delete" %}
+          </a>
+          {% endif %}
+        </p>
+        {% endif %}
+      </td>
+      <td><code>[image:{{ image.id }}]</code></td>
+      <td>
+        <p>{% include "wiki/includes/revision_info.html" %}</p>
+      </td>
+      <td>{{ revision.get_size|filesizeformat }}<br />{{ revision.width }}x{{ revision.height }} pixels
+      </td>
+    </tr>
+    <tr>
+      <th colspan="100">{% trans "History" %}</th>
+    </tr>
+    <tr>
+      <td colspan="100">
+        <table class="table">
+          {% for old_revision in image.revision_set.all %}
+            <tr>
+              <td>
+              {% thumbnail old_revision.imagerevision.image "50x50" crop="center" as thumb %}
+                <img src="{{ thumb.url }}" alt="{{ revision.imagerevision.get_filename }}" />
+              {% endthumbnail %}
+              </td>
+              <td>{% include "wiki/includes/revision_info.html" with current_revision=image.current_revision revision=old_revision %}</td>
+              <td>{{ old_revision.imagerevision.get_size|filesizeformat }}</td>
+              <td>{{ old_revision.imagerevision.width }}x{{ old_revision.imagerevision.height }}</td>
+              <td>
+                {% if image|can_write:user and old_revision != image.current_revision %}
+                  <a href="{% url 'wiki:images_set_revision' path=urlpath.path article_id=article.id image_id=image.id rev_id=old_revision.id %}">
+                    <span class="fa fa-refresh"></span>
+                    {% trans "Revert to this version" %}
+                  </a>
+                {% endif %}
+              </td>
+            </tr>
+          {% endfor %}
+        </table>
+      </td>
+    </tr>
+    {% endwith %}
+  {% empty %}
+    <tr>
+    <td colspan="100">
+      <p style="margin-bottom: 20px;"><em>{% trans "There are no images for this article." %}</em></p>
+    </td>
+  {% endfor %}
+
+  </table>
+
+  {% include "wiki/includes/pagination.html" %}
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/plugins/images/purge.html b/pydis_site/templates/wiki/plugins/images/purge.html
new file mode 100644
index 00000000..28b8b476
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/images/purge.html
@@ -0,0 +1,33 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n humanize wiki_thumbnails %}
+
+
+{% block wiki_pagetitle %}{% trans "Purge deletion" %}: {{ image }}{% endblock %}
+
+{% block wiki_contents_tab %}
+  {% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %}
+    <p class="thumbnail pull-right">
+      <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
+    </p>
+  {% endthumbnail %}
+  <p class="lead">
+    {% trans "Purge image: Completely remove image file and all revisions." %}
+  </p>
+  <form method="POST" class="form-horizontal" enctype="multipart/form-data">
+    {% wiki_form form %}
+    <div class="form-group form-actions">
+      <div class="col-lg-2"></div>
+      <div class="col-lg-10">
+        <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+          <span class="fa fa-arrow-left"></span>
+          {% trans "Go back" %}
+        </a>
+        <button class="btn btn-primary">
+          <span class="fa fa-trash"></span>
+          {% trans "Remove it completely!" %}
+        </button>
+      </div>
+    </div>
+  </form>
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/plugins/images/render.html b/pydis_site/templates/wiki/plugins/images/render.html
new file mode 100644
index 00000000..d4470d98
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/images/render.html
@@ -0,0 +1,22 @@
+{% load wiki_thumbnails i18n %}{% comment %}
+  This template is used for the markdown extension that renders images and captions.
+
+  NB! Watch out for line breaks, markdown might add <br />s and <p>s.
+{% endcomment %}{% with image.current_revision.imagerevision as revision %}{% spaceless %}
+<figure class="thumbnail{% if align %} pull-{{ align }}{% endif %}" {% if width %} style="width: {{ width }}px;" {% endif %}>
+    <a href="{{ revision.image.url }}">
+{% if size %}
+  {% thumbnail revision.image size upscale=False as thumb %}
+      <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
+  {% empty %}
+      <div class="caption">
+        <em>{% trans "Image not found" %}</em>
+      </div>
+  {% endthumbnail %}
+{% else %}
+      <img src="{{ revision.image.url }}" alt="{{ revision.get_filename }}" />
+{% endif %}
+    </a>
+  <figcaption class="caption">{{ caption|safe }}</figcaption>
+</figure>
+{% endspaceless %}{% endwith %}
diff --git a/pydis_site/templates/wiki/plugins/images/revision_add.html b/pydis_site/templates/wiki/plugins/images/revision_add.html
new file mode 100644
index 00000000..87ca7a08
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/images/revision_add.html
@@ -0,0 +1,33 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n humanize wiki_thumbnails %}
+
+
+{% block wiki_pagetitle %}{% trans "Replace image" %}: {{ image }}{% endblock %}
+
+{% block wiki_contents_tab %}
+  {% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %}
+    <p class="thumbnail pull-right">
+      <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
+    </p>
+  {% endthumbnail %}
+  <p class="lead">
+    {% trans "Choose an image file to replace current image." %}
+  </p>
+  <form method="POST" class="form-horizontal" enctype="multipart/form-data">
+    {% wiki_form form %}
+    <div class="form-group form-actions">
+      <div class="col-lg-2"></div>
+      <div class="col-lg-10">
+        <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+          <span class="fa fa-arrow-left"></span>
+          {% trans "Go back" %}
+        </a>
+        <button class="btn btn-primary">
+          <span class="fa fa-upload"></span>
+          {% trans "Upload replacement" %}
+        </button>
+      </div>
+    </div>
+  </form>
+
+{% endblock %}
diff --git a/pydis_site/templates/wiki/plugins/images/sidebar.html b/pydis_site/templates/wiki/plugins/images/sidebar.html
new file mode 100644
index 00000000..909bf6c9
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/images/sidebar.html
@@ -0,0 +1,188 @@
+{% load i18n wiki_tags wiki_images_tags humanize wiki_thumbnails sekizai_tags %}
+
+
+{% addtoblock "js" %}
+<script type="text/javascript">
+function insert_image(data) {
+    if (typeof data == "number") {
+        image_id = data;
+        $("#img_title").text(" {{ _("Insert Image")|escapejs }} " + image_id);
+        $("#img_modal").on('shown.bs.modal', function(){
+            $(this).find('#img_caption').focus();
+        });
+        $("#img_modal").modal();
+   } else {
+        align = data.img_align.options[data.img_align.selectedIndex].text;
+        size = data.img_size.options[data.img_size.selectedIndex].text;
+        caption = data.img_caption.value;
+
+        data.img_align.selectedIndex = 0;
+        data.img_size.selectedIndex = 0;
+        data.img_caption.value = "";
+
+        tag = '\n[image:'+image_id;
+        if (align != "center") tag = tag + ' align:'+align;
+        if (size != "default") tag = tag + ' size:'+size;
+
+        if (caption == '')
+            $('#id_content').insertAtCaret(tag+']\n\n');
+        else
+            $('#id_content').insertAtCaret(tag+']\n    '+caption+'\n\n');
+    }
+}
+function add_image(form) {
+    $(form).submit();
+}
+</script>
+{% endaddtoblock %}
+
+{% with article|images_for_article as images %}
+<style type="text/css">
+  #image-list tr:first-child td {border:0;}
+</style>
+<div style="max-height: 300px; overflow: auto;">
+  <table class="table table-responsive table-bordered" id="image-list">
+    {% for image in images %}
+      {% with image.current_revision.imagerevision as revision %}
+      {% thumbnail revision.image "50x50" crop="center" as thumb %}
+        <tr>
+          <td style="white-space: nowrap;">
+            <p>{% trans "Image id" %}: {{ image.id }}</p>
+            <p>
+              <a href="javascript:void(insert_image({{ image.id }}))"><span class="fa fa-edit"></span> {% trans "Insert" %}</a><br />
+              {% if image|can_write:user %}
+              <a href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}"><span class="fa fa-upload"></span> {% trans "Replace" %}</a>
+              {% endif %}
+            </p>
+          </td>
+          <td>
+            <div class="thumbnail">
+              <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
+            </div>
+          </td>
+        </tr>
+      {% endthumbnail %}
+      {% endwith %}
+    {% empty %}
+    <tr>
+      <td><em>{% trans "No images found for this article" %}</em></td>
+    </tr>
+    {% endfor %}
+  </table>
+</div>
+
+<p>
+  <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}">
+    {% trans "Manage images" %} &raquo;
+  </a>
+</p>
+<hr />
+
+<h4>{% trans "Add new image" %}</h4>
+
+{% if article|images_can_add:user %}
+  {% if form.non_field_errors %}
+    {% if form_error_title %}<h4 class="alert-heading">{{ form_error_title }}</h4>{% endif %}
+    {% for error_message in form.non_field_errors %}
+      <div class="alert alert-block alert-danger">
+        {{ error_message }}
+      </div>
+    {% endfor %}
+  {% endif %}
+
+  {# Include the hidden fields #}
+  {% for hidden in form.hidden_fields %}
+    {{ hidden }}
+  {% endfor %}
+
+  <p>
+  {% for field in form.visible_fields %}
+    <fieldset id="div_{{ field.auto_id }}" class="control-group fields {% if field.errors %} error{% endif %}">
+      {% if field.label %}
+        <!--<label for="{{ field.id_for_label }}" class="{% if field.field.required %}requiredField{% endif %}">
+        {{ field.label|safe }}
+        </label>-->
+      {% endif %}
+      {{ field }}
+      {% if field.errors %}
+      <div id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="help-block">
+        {% for error in field.errors %}
+        <div>{{ error }}</div>
+        {% endfor %}
+      </div>
+      {% endif %}
+    </fieldset>
+    {% if field.help_text %}
+      <p id="hint_{{ field.auto_id }}" class="help-block">{{ field.help_text|safe }}</p>
+    {% endif %}
+  {% endfor %}
+  </p>
+
+  <p>
+    <button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="btn btn-default btn-md">
+      <span class="fa fa-upload"></span>
+      {% trans "Add image" %}
+    </button>
+  </p>
+{% else %}
+
+  {% if user.is_anonymous %}
+    {% include "wiki/includes/anonymous_blocked.html" %}
+  {% else %}
+    <p><em>{% trans "You do not have permissions to add images." %}</em></p>
+  {% endif %}
+{% endif %}
+
+<hr />
+
+<h4>
+  {% trans "How to use images" %}
+</h4>
+
+<p>{% trans "After uploading an image, it is attached to this particular article and can be used only here. Other users may replace the image, but older versions are kept. To show the image press the Insert button and select the options you want to use. You can use Markdown in the caption. The Markdown code syntax for images looks like this" %}<br/>
+<pre>[image:id align:right size:orig]
+    caption indented by 4 spaces</pre>
+{% trans "Possible values for align are" %} <pre>left | right</pre>
+{% trans "Possible values for size are" %} <pre>small | medium | large | orig | default</pre>
+</p>
+{% endwith %}
+
+<div class="modal" id="img_modal" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content" style="position:relative !important;">
+      <div class="modal-header">
+        <h4 id="img_title"></h4>
+      </div>
+      <div class="modal-body">
+        <form role="form">
+          <div class="form-group" style="margin-left:0; margin-right:0;">
+            <label for="img_align">{% trans "Alignment" %}</label>
+            <select class="form-control" id="img_align">
+              <option>center</option>
+              <option>left</option>
+              <option>right</option>
+            </select>
+          </div>
+          <div class="form-group" style="margin-left:0; margin-right:0;">
+            <label for="img_size">{% trans "Size" %}</label>
+            <select class="form-control" id="img_size">
+              <option>default</option>
+              <option>small</option>
+              <option>medium</option>
+              <option>large</option>
+              <option>orig</option>
+            </select>
+          </div>
+          <div class="form-group" style="margin-left:0; margin-right:0;">
+            <label for="img_caption">{% trans "Caption" %}</label>
+            <input type="text" class="form-control" id="img_caption" placeholder="{% trans "Enter caption" %}">
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-success btn-default" data-dismiss="modal" onClick="insert_image(this.form)"> {% trans "Insert image" %} </button>
+        <button class="btn btn-danger" data-dismiss="modal"> {% trans "Cancel" %} </button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/pydis_site/templates/wiki/plugins/links/sidebar.html b/pydis_site/templates/wiki/plugins/links/sidebar.html
new file mode 100644
index 00000000..45096edd
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/links/sidebar.html
@@ -0,0 +1,44 @@
+{% load i18n sekizai_tags static %}
+
+<h4>{% trans "Link to another wiki page" %}</h4>
+
+<p>
+  {% trans "Type in something from another wiki page's title and auto-complete will help you create a tag for your wiki link. Tags for links look like this:" %}<br />
+</p>
+
+<pre>[Title of link](wiki:ArticleSlug)</pre>
+
+<div class="input-group">
+  <input type="text" class="page_title_query form-control" id="links_page_title_query" value="" placeholder="Type to search..." />
+  <span class="input-group-btn">
+    <button type="button" class="btn btn-default" onclick="wikiInsertLink()">
+      {% trans "Insert" %}
+    </button>
+  </span>
+</div>
+
+<hr />
+
+<h4>{% trans "An external link" %}</h4>
+
+<p>
+  {% trans "You can link to another website simply by inserting an address example.com or http://example.com or by using the markdown syntax:" %}<br />
+</p>
+<pre>[Clickable text](http://example.com)</pre>
+
+{% addtoblock "js" %}<script type="text/javascript" src="{% static "wiki/js/typeahead.min.js" %}"></script>{% endaddtoblock %}
+{% addtoblock "js" %}
+<script type="text/javascript">
+  $(document).ready(function() {
+      $('.page_title_query').typeahead({
+        remote: "{% url 'wiki:links_query_urlpath' path=urlpath.path article_id=article.id %}?query=%QUERY",
+        dataType: String
+      });
+  });
+
+function wikiInsertLink() {
+  $('#id_content').insertAtCaret($('#links_page_title_query').val());
+}
+
+</script>
+{% endaddtoblock %}
diff --git a/pydis_site/templates/wiki/plugins/macros/article_list.html b/pydis_site/templates/wiki/plugins/macros/article_list.html
new file mode 100644
index 00000000..c9261f1e
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/macros/article_list.html
@@ -0,0 +1,14 @@
+{% load i18n wiki_macro_tags %}
+
+{% if article_children %}
+  <div class="article-list">
+    <ul>
+    <li class="nav-header">{% trans "Article index" %} <i class="fa fa-list"></i></li>
+    {% for child in article_children %}
+      {% article_list child depth %}
+      {% empty %}
+      <i>{% trans "Nothing below this level" %}</i>
+    {% endfor %}
+    </ul>
+  </div>
+{% endif %}
diff --git a/pydis_site/templates/wiki/plugins/macros/sidebar.html b/pydis_site/templates/wiki/plugins/macros/sidebar.html
new file mode 100644
index 00000000..31b68520
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/macros/sidebar.html
@@ -0,0 +1,20 @@
+{% load i18n wiki_macro_tags %}
+{% allowed_macros as macros %}
+
+{% for macro in macros %}
+<h4>{{ macro.short_description }}</h4>
+{{ macro.help_text|safe|linebreaks }}
+{% if macro.example_code %}
+<pre>{{ macro.example_code }}</pre>
+{% endif %}
+{% if macro.args %}
+<table class="table table-compact">
+{% for arg,description in macro.args.items %}
+  <tr>
+    <th>{{ arg }}</th>
+    <td>{{ description }}</td>
+  </tr>
+{% endfor %}
+</table>
+{% endif %}
+{% endfor %}
diff --git a/pydis_site/templates/wiki/plugins/notifications/menubaritem.html b/pydis_site/templates/wiki/plugins/notifications/menubaritem.html
new file mode 100644
index 00000000..6f1b6000
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/notifications/menubaritem.html
@@ -0,0 +1,25 @@
+{% 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
new file mode 100644
index 00000000..51b0245e
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/notifications/settings.html
@@ -0,0 +1,44 @@
+{% 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
new file mode 100644
index 00000000..842ac3cb
--- /dev/null
+++ b/pydis_site/templates/wiki/plugins/templatetags/article_list.html
@@ -0,0 +1,20 @@
+{% 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>
-- 
cgit v1.2.3


From cc5f3b7321c6992e0c7e324c735bb5272d8e5ae3 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sun, 14 Apr 2019 17:00:43 +0100
Subject: Modals and breadcrumb work

---
 pydis_site/static/js/wiki/modal.js                 |  13 ++
 pydis_site/templates/wiki/base.html                |  11 +-
 pydis_site/templates/wiki/edit.html                | 170 ++++++++++-----------
 .../templates/wiki/includes/article_menu.html      | 116 +++++++-------
 .../templates/wiki/includes/breadcrumbs.html       | 100 ++++++------
 .../templates/wiki/includes/editor_sidebar.html    |   2 +-
 pydis_site/templates/wiki/includes/formerrors.html |  17 ++-
 pydis_site/templates/wiki/preview_inline.html      |  25 ++-
 8 files changed, 245 insertions(+), 209 deletions(-)
 create mode 100644 pydis_site/static/js/wiki/modal.js

diff --git a/pydis_site/static/js/wiki/modal.js b/pydis_site/static/js/wiki/modal.js
new file mode 100644
index 00000000..01252575
--- /dev/null
+++ b/pydis_site/static/js/wiki/modal.js
@@ -0,0 +1,13 @@
+function open_modal(id) {
+    let element = document.getElementById(id);
+
+    $(element).addClass("is-active");
+
+    $(element).find(".modal-background").click(function() {
+        $(element).removeClass("is-active");
+    });
+
+    $(element).find("[aria-label=\"close\"]").click(function() {
+        $(element).removeClass("is-active");
+    });
+}
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index 1affbe39..4982fe78 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -17,20 +17,19 @@
 {% endblock %}
 
 {% block content %}
-  {% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="far" use_logo=True %}
+  {% block site_navbar %}
+    {% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="far" use_logo=True %}
+  {% endblock %}
 
   {% block wiki_navbar %}
 
   {% endblock %}
 
   {% block wiki_body %}
-
     <section class="section">
       <div class="container">
         {% wiki_messages %}
 
-        {% block wiki_breadcrumbs %}{% endblock %}
-
         <div class="content">
           {% block wiki_contents %}{% endblock %}
         </div>
@@ -38,7 +37,9 @@
     </section>
   {% endblock %}
 
-  {% include "base/footer.html" %}
+  {% block site_footer %}
+    {% include "base/footer.html" %}
+  {% endblock %}
 
   <script src="{% static "js/wiki/load_editor.js" %}" type="text/javascript"></script>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index 8d5b61db..1e1caaf7 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -1,81 +1,11 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n sekizai_tags %}
+{% load wiki_tags i18n sekizai_tags static %}
 
 
 {% block wiki_pagetitle %}
   Edit: {{ article.current_revision.title }}
 {% endblock %}
 
-{% block head %}
-  {{ block.super }}
-
-  <script language="javascript">
-    {# I'm sorry this JS sucks, it came with the wiki, just stuck right in here. #}
-
-    $(document).ready(function() {
-      $("#article_edit_form :input").change(function() {
-         $("#article_edit_form").data("changed",true);
-      });
-      if ($("#article_edit_form").find(".alert-danger").length > 0 || $("#article_edit_form").find(".has-error").length > 0 ) {
-        // Set the forms status as "changed" if there was a submission error
-        $("#article_edit_form").data("changed",true);
-      }
-      window.onbeforeunload = confirmOnPageExit;
-      var click_time = 0;
-      $("#article_edit_form").on("submit", function (ev) {
-          now = Date.now();
-          elapsed = now-click_time;
-          click_time = now;
-          if (elapsed < 3000)
-              ev.preventDefault();
-          window.onbeforeunload = null;
-          return true;
-      });
-      $("#id_preview").on("click", function () {
-          $("#previewModal").modal("show");
-          return true;
-      });
-      $("#id_preview_save_changes").on("click", function (ev) {
-          ev.preventDefault();
-          $("#id_save").trigger("click");
-      });
-    });
-
-    var confirmOnPageExit = function (e) {
-      if ($("#article_edit_form").data("changed")) {
-        e = e || window.event;
-        var message = "You have unsaved changes!";
-        // For IE6-8 and Firefox prior to version 4
-        if (e) {
-            e.returnValue = message;
-        }
-        // For Chrome, Safari, IE8+ and Opera 12+
-        return message;
-      } else {
-        // If the form hasn't been changed, don't display the pop-up
-        return;
-      }
-    };
-  </script>
-
-  <script type="text/javascript">
-    $(document).ready( function() {
-      $('.sidebar-form').each(function () {
-        $(this).submit( function() {
-          this.unsaved_article_title.value = $('#id_title').val();
-          this.unsaved_article_content.value = $('#id_content').val();
-        });
-      });
-    });
-  </script>
-
-  <script language="javascript">
-    $(document).ready(function() {
-      $("#id_revision").val('{{ article.current_revision.id }}');
-    });
-  </script>
-{% endblock %}
-
 {% block wiki_contents_tab %}
 
   {% if not user.is_authenticated %}
@@ -144,23 +74,89 @@
 
   {% include "wiki/includes/modals.html" %}
 
-  <div class="modal fade wiki-modal" id="previewModal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-body">
-          <iframe name="previewWindow" frameborder="0"></iframe>
-        </div>
-        <div class="modal-footer">
-          <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
-            <span class="fa fa-arrow-circle-left"></span>
-            {% trans "Back to editor" %}
-          </a>
-          <a class="btn btn-lg btn-primary" id="id_preview_save_changes" href="#">
-            <span class="fa fa-check"></span>
-            {% trans "Save changes" %}
-          </a>
-        </div>
+  <div class="modal" id="previewModal">
+    <div class="modal-background"></div>
+    <div class="modal-card" style="height: 50%;">
+      <div class="modal-card-body" style="padding: 0; overflow: hidden;">
+        <iframe name="previewWindow" frameborder="0" style="width: 100%; height: 100%;"></iframe>
+      </div>
+      <div class="modal-card-foot">
+        <button class="button is-primary" aria-label="close">Close</button>
+        <a class="button is-success" id="id_preview_save_changes">Save Changes</a>
       </div>
     </div>
   </div>
+
+  <script src="{% static "js/wiki/modal.js" %}" type="text/javascript"></script>
+
+  <script type="text/javascript">
+    {# I'm sorry this JS sucks, it came with the wiki, just stuck right in here. #}
+
+    $(document).ready(function() {
+      let article_edit_form = $("#article_edit_form");
+      let click_time = 0;
+
+      $("#article_edit_form :input").change(function() {
+         article_edit_form.data("changed",true);
+      });
+
+      if (article_edit_form.find(".alert-danger").length > 0 || article_edit_form.find(".has-error").length > 0 ) {
+        // Set the forms status as "changed" if there was a submission error
+        article_edit_form.data("changed",true);
+      }
+
+      window.onbeforeunload = confirmOnPageExit;
+
+      article_edit_form.on("submit", function (ev) {
+          now = Date.now();
+          elapsed = now-click_time;
+          click_time = now;
+          if (elapsed < 3000)
+              ev.preventDefault();
+          window.onbeforeunload = null;
+          return true;
+      });
+      $("#id_preview").click(function () {
+          open_modal("previewModal");
+          return true;
+      });
+      $("#id_preview_save_changes").on("click", function (ev) {
+          ev.preventDefault();
+          $("#id_save").trigger("click");
+      });
+    });
+
+    var confirmOnPageExit = function (e) {
+      if ($("#article_edit_form").data("changed")) {
+        e = e || window.event;
+        var message = "You have unsaved changes!";
+        // For IE6-8 and Firefox prior to version 4
+        if (e) {
+            e.returnValue = message;
+        }
+        // For Chrome, Safari, IE8+ and Opera 12+
+        return message;
+      } else {
+        // If the form hasn't been changed, don't display the pop-up
+        return;
+      }
+    };
+  </script>
+
+  <script type="text/javascript">
+    $(document).ready( function() {
+      $('.sidebar-form').each(function () {
+        $(this).submit( function() {
+          this.unsaved_article_title.value = $('#id_title').val();
+          this.unsaved_article_content.value = $('#id_content').val();
+        });
+      });
+    });
+  </script>
+
+  <script language="javascript">
+    $(document).ready(function() {
+      $("#id_revision").val('{{ article.current_revision.id }}');
+    });
+  </script>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index 7cf23a71..1d9d2a12 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -3,78 +3,86 @@
 {% with selected_tab as selected %}
   <nav class="navbar is-light" role="navigation" aria-label="wiki navigation">
     <div class="container">
-      <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>
-        <span aria-hidden="true"></span>
-      </a>
+      <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>
+          <span aria-hidden="true"></span>
+        </a>
+      </div>
 
       <div class="navbar-menu" id="wiki-menu">
-        {% if not user.is_anonymous %}
-          <a class="navbar-item{% if selected == "settings" %} is-active{% endif %}"
-             href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}"
-          >
-            <span class="icon">
-              <i class="fas fa-wrench"></i>
-            </span>
+        <div class="navbar-end">
+          {% if not user.is_anonymous %}
+            <a class="navbar-item{% if selected == "settings" %} is-active{% endif %}"
+               href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}"
+            >
+              <span class="icon">
+                <i class="fas fa-wrench"></i>
+              </span>
 
-            <span>&nbsp;Settings</span>
-          </a>
-        {% endif %}
+              <span>&nbsp;Settings</span>
+            </a>
+          {% endif %}
+
+          {% for plugin in article_tabs %}
+            <a class="navbar-item{% if selected == plugin.slug %} is-active{% endif %}"
+               href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}"
+            >
+              <span class="icon">
+                <i class="{{ plugin.article_tab.1 }}"></i>
+              </span>
+
+              <span>&nbsp;{{ plugin.article_tab.0 }}</span>
+            </a>
+          {% endfor %}
 
-        {% for plugin in article_tabs %}
-          <a class="navbar-item{% if selected == plugin.slug %} is-active{% endif %}"
-             href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}"
+          <a class="navbar-item{% if selected == "history" %} is-active{% endif %}"
+             href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}"
           >
             <span class="icon">
-              <i class="{{ plugin.article_tab.1 }}"></i>
+              <i class="fas fa-clock"></i>
             </span>
 
-            <span>&nbsp;{{ plugin.article_tab.0 }}</span>
+            <span>&nbsp;Changes</span>
           </a>
-        {% endfor %}
 
-        <a class="navbar-item{% if selected == "history" %} is-active{% endif %}"
-           href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}"
-        >
-          <span class="icon">
-            <i class="fas fa-clock"></i>
-          </span>
+          {% if article|can_write:user and not article.current_revision.locked %}
+            <a class="navbar-item{% if selected == "edit" %} is-active{% endif %}"
+               href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}"
+            >
+              <span class="icon">
+                <i class="fas fa-edit"></i>
+              </span>
 
-          <span>&nbsp;Changes</span>
-        </a>
+              <span>&nbsp;Edit</span>
+            </a>
+          {% else %}
+            <a class="navbar-item{% if selected == "source" %} is-active{% endif %}"
+               href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}"
+            >
+              <span class="icon">
+                <i class="fas fa-lock"></i>
+              </span>
 
-        {% if article|can_write:user and not article.current_revision.locked %}
-          <a class="navbar-item{% if selected == "edit" %} is-active{% endif %}"
-             href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}"
-          >
-            <span class="icon">
-              <i class="fas fa-edit"></i>
-            </span>
+              <span>&nbsp;View Source</span>
+            </a>
+          {% endif %}
 
-            <span>&nbsp;Edit</span>
-          </a>
-        {% else %}
-          <a class="navbar-item{% if selected == "source" %} is-active{% endif %}"
-             href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}"
+          <a class="navbar-item{% if selected == "view" %} is-active{% endif %}"
+             href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}"
           >
             <span class="icon">
-              <i class="fas fa-lock"></i>
+              <i class="fas fa-home"></i>
             </span>
 
-            <span>&nbsp;View Source</span>
+            <span>&nbsp;View</span>
           </a>
-        {% endif %}
-
-        <a class="navbar-item{% if selected == "view" %} is-active{% endif %}"
-           href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}"
-        >
-          <span class="icon">
-            <i class="fas fa-home"></i>
-          </span>
-
-          <span>&nbsp;View</span>
-        </a>
+        </div>
       </div>
     </div>
   </nav>
diff --git a/pydis_site/templates/wiki/includes/breadcrumbs.html b/pydis_site/templates/wiki/includes/breadcrumbs.html
index b7a8aeae..16060236 100644
--- a/pydis_site/templates/wiki/includes/breadcrumbs.html
+++ b/pydis_site/templates/wiki/includes/breadcrumbs.html
@@ -1,61 +1,61 @@
 {% load i18n %}
 {% if urlpath %}
-<div id="article-breadcrumbs">
-
-<ul class="breadcrumb pull-left">
-  {% 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">{{ article.current_revision.title|truncatechars:25 }}</li>
-</ul>
-<div class="pull-left" style="margin-left: 10px;">
-  <div class="btn-group">
-    <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#" style="padding: 7px;" title="{% trans "Sub-articles for" %} {{ article.current_revision.title }}">
-      <span class="fa fa-sitemap"></span>
-      <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu">
-      {% for child in children_slice %}
+
+  <div class="navbar-item">
+    <nav class="breadcrumb" aria-label="breadcrumbs">
+      {% for ancestor in urlpath.cached_ancestors %}
         <li>
-          <a href="{% url 'wiki:get' path=child.path %}">
-            {{ child.article.current_revision.title }}
-          </a>
+          <a href="{% url 'wiki:get' path=ancestor.path %}">{{ ancestor.article.current_revision.title|truncatechars:25 }}</a>
         </li>
-        {% empty %}
-        <li><a href="#"><em>{% trans "No sub-articles" %}</em></a></li>
       {% endfor %}
-      {% if children_slice_more %}
-      <li><a href="#"><em>{% trans "...and more" %}</em></a></li>
-      {% endif %}
-      <li class="divider"></li>
-      <li>
-        <a href="{% url 'wiki:dir' path=urlpath.path %}">{% trans "Browse articles in this level" %} &raquo;</a>
+
+      <li class="active">
+        <a href="{% url 'wiki:get' path=article.path %}">{{ article.current_revision.title|truncatechars:25 }}</a>
       </li>
-    </ul>
+    </nav>
   </div>
-</div>
-<div class="pull-left" style="margin-left: 10px;">
-  <div class="btn-group">
-    <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#" style="padding: 7px;" title="{% trans "Sub-articles for" %} {{ article.current_revision.title }}">
-      <span class="fa fa-file"></span>
-      <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu">
-      <li>
-        {% if urlpath.parent %}
-        <a href="{% url 'wiki:create' path=urlpath.parent.path %}" style="padding: 7px;">
-          <span class="fa fa-arrow-right"></span>
-          {% blocktrans with article.current_revision.title as title %}New article next to {{ title }}{% endblocktrans %}
-        </a>
+
+  <hr class="navbar-divider">
+
+  <div class="navbar-item has-dropdown is-hoverable">
+    <a class="navbar-link">Sub-Articles</a>
+
+    <div class="navbar-dropdown">
+      {% if children_slice %}
+        {% for child in children_slice %}
+          <a class="navbar-item" href="{% url 'wiki:get' path=child.path %}">
+            {{ child.article.current_revision.title }}
+          </a>
+        {% endfor %}
+
+        {% if children_slice_more %}
+          <a class="navbar-item" href="{% url 'wiki:dir' path=urlpath.path %}">
+            ...and more.
+          </a>
         {% endif %}
-        <a href="{% url 'wiki:create' path=urlpath.path %}" style="padding: 7px;">
-          <span class="fa fa-arrow-down"></span>
-          {% blocktrans with article.current_revision.title as title %}New article below {{ title }}{% endblocktrans %}
+
+        <hr class="navbar-divider">
+      {% endif %}
+
+      <a class="navbar-item" href="{% url 'wiki:dir' path=urlpath.path %}">
+        Browse other articles
+      </a>
+    </div>
+  </div>
+
+  <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>
-      </li>
-    </ul>
+      {% endif %}
+
+      <a class="navbar-item" href="{% url 'wiki:create' path=urlpath.path %}">
+        Below current level
+      </a>
+    </div>
   </div>
-</div>
-<div style="clear: both"></div>
-</div>
 {% endif %}
diff --git a/pydis_site/templates/wiki/includes/editor_sidebar.html b/pydis_site/templates/wiki/includes/editor_sidebar.html
index 87efed4d..5dd2f18b 100644
--- a/pydis_site/templates/wiki/includes/editor_sidebar.html
+++ b/pydis_site/templates/wiki/includes/editor_sidebar.html
@@ -15,7 +15,7 @@
     <div id="collapse_{{ plugin.slug }}" class="panel-collapse collapse{% if plugin_form.errors %} in{% endif %}">
       <div class="panel-body form-vertical">
         {% if plugin.sidebar.template %}
-          {% with plugin_form as form and plugin as plugin %}
+          {% with plugin_form as form %}
             <form method="POST" class="form-horizontal sidebar-form" action="?f={{ plugin_form.form_id }}" enctype="multipart/form-data">
               {% csrf_token %}
               {% include plugin.sidebar.template %}
diff --git a/pydis_site/templates/wiki/includes/formerrors.html b/pydis_site/templates/wiki/includes/formerrors.html
index 72d3c539..c6df2637 100644
--- a/pydis_site/templates/wiki/includes/formerrors.html
+++ b/pydis_site/templates/wiki/includes/formerrors.html
@@ -1,8 +1,15 @@
 {% if form.non_field_errors %}
-  {% if form_error_title %}<h4 class="alert-heading">{{ form_error_title }}</h4>{% endif %}
-  {% for error_message in form.non_field_errors %}
-    <div class="alert alert-block alert-danger">
-      {{ error_message }}
+  <article class="message is-danger">
+    {% if form_error_title %}
+      <div class="message-header">
+        <p>{{ form_error_title }}</p>
+      </div>
+    {% endif %}
+
+    <div class="message-body">
+      {% for error_message in form.non_field_errors %}
+        <p>{{ error_message }}</p>
+      {% endfor %}
     </div>
-  {% endfor %}
+  </article>
 {% endif %}
diff --git a/pydis_site/templates/wiki/preview_inline.html b/pydis_site/templates/wiki/preview_inline.html
index 77232753..bfe81a0c 100644
--- a/pydis_site/templates/wiki/preview_inline.html
+++ b/pydis_site/templates/wiki/preview_inline.html
@@ -1,8 +1,10 @@
 {% extends "wiki/base.html" %}
 {% load wiki_tags i18n sekizai_tags static %}
 
-{% block wiki_body %}
+{% block site_navbar %}{% endblock %}
+{% block site_footer %}{% endblock %}
 
+{% block wiki_body %}
   {% if revision %}
     <div class="alert alert-info">
       <strong>{% trans "Previewing revision" %}:</strong>
@@ -17,15 +19,14 @@
       <strong>{% trans "and" %}</strong>
       {% include "wiki/includes/revision_info.html" with revision=merge2 %}
     </div>
+
     {% if merge1.deleted %}
-    <div class="alert alert-danger">
-      <strong>{% trans "You cannot merge with a deleted revision" %}</strong>
-    </div>
+      <div class="alert alert-danger">
+        <strong>{% trans "You cannot merge with a deleted revision" %}</strong>
+      </div>
     {% endif %}
   {% endif %}
 
-  <h1 class="page-header">{{ title }}</h1>
-
   {% if revision and revision.deleted %}
     <div class="warning">
       <strong>{% trans "This revision has been deleted." %}</strong>
@@ -33,7 +34,17 @@
     </div>
   {% else %}
 
-    {% wiki_render article content %}
+    <section class="section">
+      <div class="container">
+        <div class="content">
+
+  <h1 class="title">{{ article.current_revision.title }}</h1>
+
+          {% wiki_render article content %}
+        </div>
+      </div>
+    </section>
+
     {% for plugin in plugins %}
       {% if plugin.RenderMedia.css %}
         {% addtoblock "css" %}
-- 
cgit v1.2.3


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

---
 pydis_site/settings.py                             | 13 +++--
 .../templates/wiki/includes/article_menu.html      |  9 ++--
 .../templates/wiki/includes/breadcrumbs.html       | 59 +++++++++++-----------
 pydis_site/templates/wiki/includes/messages.html   | 10 ++--
 4 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index f7cca777..70ec0a84 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -15,6 +15,8 @@ import sys
 
 import environ
 
+from django.contrib.messages import constants as messages
+
 
 env = environ.Env(
     DEBUG=(bool, False)
@@ -285,9 +287,6 @@ WIKI_ACCOUNT_HANDLING = False
 WIKI_ACCOUNT_SIGNUP_ALLOWED = False
 
 WIKI_ANONYMOUS = True
-WIKI_ANONYMOUS_CREATE = DEBUG
-WIKI_ANONYMOUS_UPLOAD = DEBUG
-WIKI_ANONYMOUS_WRITE = DEBUG
 
 WIKI_MARKDOWN_KWARGS = {
     "extension_configs": {
@@ -311,3 +310,11 @@ WIKI_MARKDOWN_KWARGS = {
         "wiki.plugins.macros.mdx.wikilinks",
     ]
 }
+
+WIKI_MESSAGE_TAG_CSS_CLASS = {
+    messages.DEBUG: "is-info",
+    messages.ERROR: "is-danger",
+    messages.INFO: "is-primary",
+    messages.SUCCESS: "is-success",
+    messages.WARNING: "is-warning",
+}
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


From bb22b1b5c5a3989729f40267621050341807a279 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sun, 14 Apr 2019 20:00:51 +0100
Subject: Breadcrumb/article menu work

---
 pydis_site/static/js/wiki/dropdown.js              |  37 ++++++
 pydis_site/templates/wiki/base.html                |   5 +-
 .../templates/wiki/includes/article_menu.html      | 120 +++++++++----------
 .../templates/wiki/includes/breadcrumbs.html       | 129 ++++++++++++---------
 4 files changed, 174 insertions(+), 117 deletions(-)
 create mode 100644 pydis_site/static/js/wiki/dropdown.js

diff --git a/pydis_site/static/js/wiki/dropdown.js b/pydis_site/static/js/wiki/dropdown.js
new file mode 100644
index 00000000..55b2e9fc
--- /dev/null
+++ b/pydis_site/static/js/wiki/dropdown.js
@@ -0,0 +1,37 @@
+// TODO: Move to django-simple-bulma
+
+(function() {
+    window.dropdowns = {};
+
+    let elements = document.getElementsByClassName("dropdown");
+
+    for (let element of elements) {
+        let menu_element = element.getElementsByClassName("dropdown-menu")[0];
+
+        function show() {
+            $(element).addClass("is-active");
+        }
+
+        function hide() {
+            $(element).removeClass("is-active");
+        }
+
+        function handle_event(e) {
+            show();
+
+            $(document.body).on("click." + menu_element.id, function() {
+                hide();
+
+                $(document.body).off("click." + menu_element.id);
+            });
+
+            e.stopPropagation();
+        }
+
+        $(element).click(handle_event);
+        $(element).hover(handle_event);
+        $(element).mouseleave(hide);
+
+        window.dropdowns[menu_element.id] = element;
+    }
+})();
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index 4982fe78..e1742657 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -21,8 +21,10 @@
     {% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="far" use_logo=True %}
   {% endblock %}
 
-  {% block wiki_navbar %}
+  {% block wiki_navbar %}{% endblock %}
 
+  {% block wiki_breadcrumbs %}
+    {% include "wiki/includes/breadcrumbs.html" %}
   {% endblock %}
 
   {% block wiki_body %}
@@ -41,5 +43,6 @@
     {% include "base/footer.html" %}
   {% endblock %}
 
+  <script src="{% static "js/wiki/dropdown.js" %}" type="text/javascript"></script>
   <script src="{% static "js/wiki/load_editor.js" %}" type="text/javascript"></script>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index db62d28d..56762420 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -4,87 +4,79 @@
   <nav class="navbar is-light" role="navigation" aria-label="wiki navigation">
     <div class="container">
       <div class="navbar-brand">
-        <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>
-          <span aria-hidden="true"></span>
-        </a>
-      </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 %}"
-               href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}"
-            >
-              <span class="icon">
-                <i class="fas fa-wrench"></i>
-              </span>
-
-              <span>&nbsp;Settings</span>
-            </a>
-          {% endif %}
-
-          {% for plugin in article_tabs %}
-            <a class="navbar-item{% if selected == plugin.slug %} is-active{% endif %}"
-               href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}"
-            >
-              <span class="icon">
-                <i class="{{ plugin.article_tab.1 }}"></i>
-              </span>
+        {% if not user.is_anonymous %}
+          <a class="navbar-item{% if selected == "settings" %} is-active{% endif %}"
+             href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}"
+          >
+            <span class="icon">
+              <i class="fas fa-wrench"></i>
+            </span>
 
-              <span>&nbsp;{{ plugin.article_tab.0 }}</span>
-            </a>
-          {% endfor %}
+            <span class="is-hidden-mobile">&nbsp;Settings</span>
+          </a>
+        {% endif %}
 
-          <a class="navbar-item{% if selected == "history" %} is-active{% endif %}"
-             href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}"
+        {% for plugin in article_tabs %}
+          <a class="navbar-item{% if selected == plugin.slug %} is-active{% endif %}"
+             href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}"
           >
             <span class="icon">
-              <i class="fas fa-clock"></i>
+              <i class="{{ plugin.article_tab.1 }}"></i>
             </span>
 
-            <span>&nbsp;Changes</span>
+            <span class="is-hidden-mobile">&nbsp;{{ plugin.article_tab.0 }}</span>
           </a>
+        {% endfor %}
 
-          {% if article|can_write:user and not article.current_revision.locked %}
-            <a class="navbar-item{% if selected == "edit" %} is-active{% endif %}"
-               href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}"
-            >
-              <span class="icon">
-                <i class="fas fa-edit"></i>
-              </span>
+        <a class="navbar-item{% if selected == "history" %} is-active{% endif %}"
+           href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}"
+        >
+          <span class="icon">
+            <i class="fas fa-clock"></i>
+          </span>
 
-              <span>&nbsp;Edit</span>
-            </a>
-          {% else %}
-            <a class="navbar-item{% if selected == "source" %} is-active{% endif %}"
-               href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}"
-            >
-              <span class="icon">
-                <i class="fas fa-lock"></i>
-              </span>
+          <span class="is-hidden-mobile">&nbsp;Changes</span>
+        </a>
 
-              <span>&nbsp;View Source</span>
-            </a>
-          {% endif %}
+        {% if article|can_write:user and not article.current_revision.locked %}
+          <a class="navbar-item{% if selected == "edit" %} is-active{% endif %}"
+             href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}"
+          >
+            <span class="icon">
+              <i class="fas fa-edit"></i>
+            </span>
 
-          <a class="navbar-item{% if selected == "view" %} is-active{% endif %}"
-             href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}"
+            <span class="is-hidden-mobile">&nbsp;Edit</span>
+          </a>
+        {% else %}
+          <a class="navbar-item{% if selected == "source" %} is-active{% endif %}"
+             href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}"
           >
             <span class="icon">
-              <i class="fas fa-home"></i>
+              <i class="fas fa-book-spells"></i>
             </span>
 
-            <span>&nbsp;View</span>
+            <span class="is-hidden-mobile">&nbsp;View Source</span>
           </a>
-        </div>
+        {% endif %}
+
+        <a class="navbar-item{% if selected == "view" %} is-active{% endif %}"
+           href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}"
+        >
+          <span class="icon">
+            <i class="fas fa-book-open"></i>
+          </span>
+
+          <span class="is-hidden-mobile">&nbsp;View</span>
+        </a>
+
+        <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>
+          <span aria-hidden="true"></span>
+        </a>
       </div>
+
     </div>
   </nav>
 
diff --git a/pydis_site/templates/wiki/includes/breadcrumbs.html b/pydis_site/templates/wiki/includes/breadcrumbs.html
index 5894da07..708edb19 100644
--- a/pydis_site/templates/wiki/includes/breadcrumbs.html
+++ b/pydis_site/templates/wiki/includes/breadcrumbs.html
@@ -1,62 +1,87 @@
-{% load i18n %}
 {% if urlpath and article %}
-  <div class="navbar-item has-dropdown is-hoverable">
-    <a class="navbar-link">Sub-Articles</a>
-
-    <div class="navbar-dropdown">
-      {% if children_slice %}
-        {% for child in children_slice %}
-          <a class="navbar-item" href="{% url 'wiki:get' path=child.path %}">
-            {{ child.article.current_revision.title }}
-          </a>
-        {% endfor %}
+  <section class="section">
+    <div class="container">
+      <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs">
+        <ul>
+          {% 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="is-active">
+            <a href="{% url 'wiki:get' path=article.path %}">{{ article.current_revision.title|truncatechars:25 }}</a>
+          </li>
+        </ul>
+      </nav>
 
-        {% if children_slice_more %}
-          <a class="navbar-item" href="{% url 'wiki:dir' path=urlpath.path %}">
-            ...and more.
+      <div class="dropdown is-pulled-right is-right">
+        <div class="dropdown-trigger">
+          <a aria-haspopup="true" aria-controls="sub-article-dropdown">
+            <span>Sub-Articles</span>
+            <span class="icon">
+              <i class="fas fa-angle-down"></i>
+            </span>
           </a>
-        {% endif %}
+        </div>
+        <div class="dropdown-menu" id="sub-article-dropdown" role="menu">
+          <div class="dropdown-content">
+            {% if children_slice %}
+              {% for child in children_slice %}
+                <a class="dropdown-item" href="{% url 'wiki:get' path=child.path %}">
+                  {{ child.article.current_revision.title }}
+                </a>
+              {% endfor %}
 
-        <hr class="navbar-divider">
-      {% endif %}
+              {% if children_slice_more %}
+                <a class="dropdown-item" href="{% url 'wiki:dir' path=urlpath.path %}">
+                  ...and more.
+                </a>
+              {% endif %}
 
-      <a class="navbar-item" href="{% url 'wiki:dir' path=urlpath.path %}">
-        Browse other articles
-      </a>
-    </div>
-  </div>
+              <hr class="dropdown-divider">
+            {% endif %}
 
-  {% if request.user.is_authenticated %}
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link">Create Article</a>
+            <a class="dropdown-item" href="{% url 'wiki:dir' path=urlpath.path %}">
+              Browse other articles
+            </a>
+          </div>
+        </div>
+      </div>
 
-      <div class="navbar-dropdown">
-        {% if urlpath.parent %}
-          <a class="navbar-item" href="{% url 'wiki:create' path=urlpath.parent.path %}">
-            At current level
-          </a>
-        {% endif %}
+      {% if request.user.is_authenticated %}
+        <div class="dropdown is-pulled-right is-right">
+          <div class="dropdown-trigger">
+            <a aria-haspopup="true" aria-controls="sub-article-dropdown">
+              <span>Create Article</span>
+              <span class="icon">
+                <i class="fas fa-angle-down"></i>
+              </span>
+              &nbsp;
+            </a>
+          </div>
+          <div class="dropdown-menu" id="sub-article-dropdown" role="menu">
+            <div class="dropdown-content">
+              {% if urlpath.parent %}
+                <a class="dropdown-item" href="{% url 'wiki:create' path=urlpath.parent.path %}">
+                  <span class="icon">
+                    <i class="fas fa-arrow-right"></i>
+                  </span>
+                  <span>At current level</span>
+                </a>
+              {% endif %}
+
+              <a class="dropdown-item" href="{% url 'wiki:create' path=urlpath.path %}">
+                <span class="icon">
+                  <i class="fas fa-arrow-down"></i>
+                </span>
+                <span>Below current level</span>
+              </a>
+            </div>
+          </div>
+        </div>
+      {% endif %}
 
-        <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>
+  </section>
 {% endif %}
-- 
cgit v1.2.3


From 596a9acf4e47449fc7990cbbc842742415d141a0 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 10:18:11 +0100
Subject: Editor: TOC insert correctly places on previous line rather than next
 line

---
 pydis_site/static/js/wiki/load_editor.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pydis_site/static/js/wiki/load_editor.js b/pydis_site/static/js/wiki/load_editor.js
index 1837c7fd..69730b14 100644
--- a/pydis_site/static/js/wiki/load_editor.js
+++ b/pydis_site/static/js/wiki/load_editor.js
@@ -19,23 +19,23 @@
 
     const TOCAction = {
         name: "toc",
-        action: inserTOC,
+        action: insertTOC,
         className: "fa fa-stream",
         title: "Insert Table of Contents"
     };
 
     let elements = document.getElementsByClassName("simple-mde");
 
-    function inserTOC(editor) {
+    function insertTOC(editor) {
         let doc = editor.codemirror.getDoc(),
             cursor = doc.getCursor(),
             line = doc.getLine(cursor.line),
-            position = {"line": cursor.line};
+            position = {"line": cursor.line, "ch": 0};
 
         if (line.length === 0) {
             doc.replaceRange(TOCText, position);
         } else {
-            doc.replaceRange("\n" + TOCText, position)
+            doc.replaceRange(TOCText + "\n", position)
         }
     }
 
-- 
cgit v1.2.3


From ab1b31e9091a173bf22712df9133328d0408ecee Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 11:45:46 +0100
Subject: Remove TOC, link headers, fix breadcrumb padding

Also removes some templates we don't care about
---
 pydis_site/settings.py                             |   4 +-
 pydis_site/static/css/wiki/style.css               |   3 +
 pydis_site/static/js/wiki/load_editor.js           |  21 ----
 .../templates/wiki/accounts/account_settings.html  |  14 ---
 pydis_site/templates/wiki/accounts/login.html      |  38 -------
 pydis_site/templates/wiki/accounts/signup.html     |  27 -----
 pydis_site/templates/wiki/base.html                |   3 +-
 .../templates/wiki/includes/article_menu.html      | 125 +++++++++++----------
 .../templates/wiki/includes/breadcrumbs.html       |   4 +-
 9 files changed, 73 insertions(+), 166 deletions(-)
 create mode 100644 pydis_site/static/css/wiki/style.css
 delete mode 100644 pydis_site/templates/wiki/accounts/account_settings.html
 delete mode 100644 pydis_site/templates/wiki/accounts/login.html
 delete mode 100644 pydis_site/templates/wiki/accounts/signup.html

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 70ec0a84..c4a1bf7e 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -287,11 +287,13 @@ WIKI_ACCOUNT_HANDLING = False
 WIKI_ACCOUNT_SIGNUP_ALLOWED = False
 
 WIKI_ANONYMOUS = True
+WIKI_ANONYMOUS_WRITE = False
 
 WIKI_MARKDOWN_KWARGS = {
     "extension_configs": {
         "wiki.plugins.macros.mdx.toc": {
-            "title": "Contents"
+            "anchorlink": True,
+            "baselevel": 2
         }
     }, "extensions": [
         "markdown.extensions.abbr",
diff --git a/pydis_site/static/css/wiki/style.css b/pydis_site/static/css/wiki/style.css
new file mode 100644
index 00000000..b4f233f7
--- /dev/null
+++ b/pydis_site/static/css/wiki/style.css
@@ -0,0 +1,3 @@
+.breadcrumb-section {
+    padding: 1rem;
+}
diff --git a/pydis_site/static/js/wiki/load_editor.js b/pydis_site/static/js/wiki/load_editor.js
index 69730b14..dfa087d9 100644
--- a/pydis_site/static/js/wiki/load_editor.js
+++ b/pydis_site/static/js/wiki/load_editor.js
@@ -17,28 +17,8 @@
         title: "Insert image",
     };
 
-    const TOCAction = {
-        name: "toc",
-        action: insertTOC,
-        className: "fa fa-stream",
-        title: "Insert Table of Contents"
-    };
-
     let elements = document.getElementsByClassName("simple-mde");
 
-    function insertTOC(editor) {
-        let doc = editor.codemirror.getDoc(),
-            cursor = doc.getCursor(),
-            line = doc.getLine(cursor.line),
-            position = {"line": cursor.line, "ch": 0};
-
-        if (line.length === 0) {
-            doc.replaceRange(TOCText, position);
-        } else {
-            doc.replaceRange(TOCText + "\n", position)
-        }
-    }
-
     for (let element of elements) {
         window.editors[element.id] = new SimpleMDE({
             "element": element,
@@ -67,7 +47,6 @@
                 "bold", "italic", "strikethrough", headingAction, "|",
                 "code", "quote", "unordered-list", "ordered-list", "|",
                 "link", imageAction, "table", "horizontal-rule", "|",
-                TOCAction, "|",
                 "preview", "side-by-side", "fullscreen", "|",
                 "guide"
             ],
diff --git a/pydis_site/templates/wiki/accounts/account_settings.html b/pydis_site/templates/wiki/accounts/account_settings.html
deleted file mode 100644
index ecff4376..00000000
--- a/pydis_site/templates/wiki/accounts/account_settings.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "wiki/base.html" %}
-{% load i18n wiki_tags sekizai_tags %}
-
-{% block wiki_pagetitle %}{% trans "Account Settings" %}{% endblock %}
-
-{% block wiki_contents %}
-<h1 class="page-header">{% trans "Account Settings" %}</h1>
-<form class="form-horizontal" action="" method="post">{% csrf_token %}
-    {% wiki_form form %}
-    <button type="submit" name="save_changes" class="btn btn-primary btn-lg">
-      {% trans "Update" %}
-    </button>
-</form>
-{% endblock %}
diff --git a/pydis_site/templates/wiki/accounts/login.html b/pydis_site/templates/wiki/accounts/login.html
deleted file mode 100644
index 082d47bd..00000000
--- a/pydis_site/templates/wiki/accounts/login.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% extends "wiki/base.html" %}
-{% load i18n wiki_tags sekizai_tags %}
-
-{% block wiki_pagetitle %}{% trans "Log in" %}{% endblock %}
-
-{% block wiki_contents %}
-<div class="row">
-  <div class="col-lg-3"></div>
-  <div class="col-lg-6">
-    <h1 class="page-header">{% trans "Please log in" %}</h1>
-    <form method="POST" class="form-horizontal">
-    {% wiki_form form %}
-    <div class="form-group form-actions">
-      <div class="col-lg-2"></div>
-      <div class="col-lg-10">
-        <button type="submit" name="save_changes" class="btn btn-primary btn-lg">
-          <span class="fa fa-lock"></span>
-          {% trans "Log me in..." %}
-        </button>
-      </div>
-    </div>
-    </form>
-
-    <p>
-      {% trans "Don't have an account?" %} <a href="{% url 'wiki:signup' %}">{% trans "Sign up" %} &raquo;</a>
-    </p>
-
-  </div>
-  <div class="col-lg-3"></div>
-</div>
-
-{% addtoblock "js" %}
-<script type="text/javascript">
-  $('#id_username').focus();
-</script>
-{% endaddtoblock %}
-
-{% endblock %}
diff --git a/pydis_site/templates/wiki/accounts/signup.html b/pydis_site/templates/wiki/accounts/signup.html
deleted file mode 100644
index 6db65d3d..00000000
--- a/pydis_site/templates/wiki/accounts/signup.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "wiki/base.html" %}
-{% load i18n wiki_tags sekizai_tags %}
-{% block wiki_pagetitle %}{% trans "Sign up" %}{% endblock %}
-
-{% block wiki_contents %}
-<h1 class="page-header">{% trans "Sign up" %}</h1>
-<form method="POST" class="form-horizontal">
-{% wiki_form form %}
-<div class="form-group form-actions">
-  <div class="col-lg-2"></div>
-  <div class="col-lg-10">
-    <button type="submit" name="save_changes" class="btn btn-primary btn-lg">
-      <span class="fa fa-plus"></span>
-      {% trans "Sign me up..." %}
-    </button>
-  </div>
-</div>
-</form>
-{% addtoblock "js" %}
-<script type="text/javascript">
-  function {{ honeypot_jsfunction }}() {
-    $('.{{ honeypot_class }}').parent().parent().hide();
-  }
-  $(document).ready({{ honeypot_jsfunction }});
-</script>
-{% endaddtoblock %}
-{% endblock %}
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index e1742657..112523cd 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -10,10 +10,11 @@
 
   <script src="{% static "wiki/js/jquery-3.3.1.min.js" %}" type="text/javascript"></script>
   <script src="{% static "wiki/js/core.js" %}" type="text/javascript"></script>
+  <script src="{% static "js/wiki/simplemde.min.js" %}" type="text/javascript"></script>
 
   <link rel="stylesheet" href="{% static "css/wiki/simplemde.min.css" %}">
   <link rel="stylesheet" href="{% static "css/wiki/simplemde-fixes.css" %}">
-  <script src="{% static "js/wiki/simplemde.min.js" %}" type="text/javascript"></script>
+  <link rel="stylesheet" href="{% static "css/wiki/style.css" %}">
 {% endblock %}
 
 {% block content %}
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index 56762420..c6cb6bf0 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -1,83 +1,84 @@
 {% load i18n wiki_tags %}
 
-{% with selected_tab as selected %}
-  <nav class="navbar is-light" role="navigation" aria-label="wiki navigation">
-    <div class="container">
-      <div class="navbar-brand">
-        {% if not user.is_anonymous %}
-          <a class="navbar-item{% if selected == "settings" %} is-active{% endif %}"
-             href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}"
-          >
-            <span class="icon">
-              <i class="fas fa-wrench"></i>
-            </span>
+{% if not user.is_anonymous %}
+  {% with selected_tab as selected %}
+    <nav class="navbar is-light" role="navigation" aria-label="wiki navigation">
+      <div class="container">
+        <div class="navbar-brand">
+          {% if not user.is_anonymous %}
+            <a class="navbar-item{% if selected == "settings" %} is-active{% endif %}"
+               href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}"
+            >
+              <span class="icon">
+                <i class="fas fa-wrench"></i>
+              </span>
 
-            <span class="is-hidden-mobile">&nbsp;Settings</span>
-          </a>
-        {% endif %}
+              <span class="is-hidden-mobile">&nbsp;Settings</span>
+            </a>
+          {% endif %}
 
-        {% for plugin in article_tabs %}
-          <a class="navbar-item{% if selected == plugin.slug %} is-active{% endif %}"
-             href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}"
+          {% for plugin in article_tabs %}
+            <a class="navbar-item{% if selected == plugin.slug %} is-active{% endif %}"
+               href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}"
+            >
+              <span class="icon">
+                <i class="{{ plugin.article_tab.1 }}"></i>
+              </span>
+
+              <span class="is-hidden-mobile">&nbsp;{{ plugin.article_tab.0 }}</span>
+            </a>
+          {% endfor %}
+
+          <a class="navbar-item{% if selected == "history" %} is-active{% endif %}"
+             href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}"
           >
             <span class="icon">
-              <i class="{{ plugin.article_tab.1 }}"></i>
+              <i class="fas fa-clock"></i>
             </span>
 
-            <span class="is-hidden-mobile">&nbsp;{{ plugin.article_tab.0 }}</span>
+            <span class="is-hidden-mobile">&nbsp;Changes</span>
           </a>
-        {% endfor %}
 
-        <a class="navbar-item{% if selected == "history" %} is-active{% endif %}"
-           href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}"
-        >
-          <span class="icon">
-            <i class="fas fa-clock"></i>
-          </span>
+          {% if article|can_write:user and not article.current_revision.locked %}
+            <a class="navbar-item{% if selected == "edit" %} is-active{% endif %}"
+               href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}"
+            >
+              <span class="icon">
+                <i class="fas fa-edit"></i>
+              </span>
 
-          <span class="is-hidden-mobile">&nbsp;Changes</span>
-        </a>
+              <span class="is-hidden-mobile">&nbsp;Edit</span>
+            </a>
+          {% else %}
+            <a class="navbar-item{% if selected == "source" %} is-active{% endif %}"
+               href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}"
+            >
+              <span class="icon">
+                <i class="fas fa-book-spells"></i>
+              </span>
 
-        {% if article|can_write:user and not article.current_revision.locked %}
-          <a class="navbar-item{% if selected == "edit" %} is-active{% endif %}"
-             href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}"
-          >
-            <span class="icon">
-              <i class="fas fa-edit"></i>
-            </span>
+              <span class="is-hidden-mobile">&nbsp;View Source</span>
+            </a>
+          {% endif %}
 
-            <span class="is-hidden-mobile">&nbsp;Edit</span>
-          </a>
-        {% else %}
-          <a class="navbar-item{% if selected == "source" %} is-active{% endif %}"
-             href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}"
+          <a class="navbar-item{% if selected == "view" %} is-active{% endif %}"
+             href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}"
           >
             <span class="icon">
-              <i class="fas fa-book-spells"></i>
+              <i class="fas fa-book-open"></i>
             </span>
 
-            <span class="is-hidden-mobile">&nbsp;View Source</span>
+            <span class="is-hidden-mobile">&nbsp;View</span>
           </a>
-        {% endif %}
-
-        <a class="navbar-item{% if selected == "view" %} is-active{% endif %}"
-           href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}"
-        >
-          <span class="icon">
-            <i class="fas fa-book-open"></i>
-          </span>
 
-          <span class="is-hidden-mobile">&nbsp;View</span>
-        </a>
+          <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>
+            <span aria-hidden="true"></span>
+          </a>
+        </div>
 
-        <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>
-          <span aria-hidden="true"></span>
-        </a>
       </div>
-
-    </div>
-  </nav>
-
-{% endwith %}
+    </nav>
+  {% endwith %}
+{% endif %}
diff --git a/pydis_site/templates/wiki/includes/breadcrumbs.html b/pydis_site/templates/wiki/includes/breadcrumbs.html
index 708edb19..a2359f39 100644
--- a/pydis_site/templates/wiki/includes/breadcrumbs.html
+++ b/pydis_site/templates/wiki/includes/breadcrumbs.html
@@ -1,5 +1,5 @@
-{% if urlpath and article %}
-  <section class="section">
+{% if urlpath and article and not user.is_anonymous %}
+  <section class="breadcrumb-section section">
     <div class="container">
       <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs">
         <ul>
-- 
cgit v1.2.3


From b6f6dcd6d9b3246a16a803f094bd1329b6797d20 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 12:18:49 +0100
Subject: Finish creation form, remove weird article title addons

---
 pydis_site/apps/home/templatetags/wiki_extra.py    |  9 ++++
 pydis_site/templates/wiki/article.html             | 11 ----
 pydis_site/templates/wiki/create.html              | 60 ++++++++++++----------
 .../wiki/forms/fields/wiki_slug_render.html        | 46 +++++++++++++++++
 4 files changed, 88 insertions(+), 38 deletions(-)
 create mode 100644 pydis_site/templates/wiki/forms/fields/wiki_slug_render.html

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index ab70eeb4..ae168ae3 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -8,6 +8,8 @@ from django.template import Template
 from django.template.loader import get_template
 from django.utils.safestring import mark_safe
 from wiki.editors.markitup import MarkItUpWidget
+from wiki.forms import WikiSlugField
+from wiki.models import URLPath
 from wiki.plugins.notifications.forms import SettingsModelChoiceField
 
 TEMPLATE_PATH = "wiki/forms/fields/{0}.html"
@@ -45,6 +47,7 @@ TEMPLATES = {
     ModelMultipleChoiceField: TEMPLATE_PATH.format("model_multiple_choice"),
 
     SettingsModelChoiceField: TEMPLATE_PATH.format("model_choice"),
+    WikiSlugField: TEMPLATE_PATH.format("wiki_slug_render"),
 }
 
 
@@ -88,3 +91,9 @@ def get_field_options(context, field: BoundField):
 
     context["options"] = widget.optgroups(field.name, value)
     return ""
+
+
+@register.filter
+def render_urlpath(value: URLPath):
+    return value.path or "/"
+
diff --git a/pydis_site/templates/wiki/article.html b/pydis_site/templates/wiki/article.html
index 03c007e6..39e1728d 100644
--- a/pydis_site/templates/wiki/article.html
+++ b/pydis_site/templates/wiki/article.html
@@ -16,17 +16,6 @@
   <div id="article-container">
     <h1 id="article-title">
       {{ article.current_revision.title }}
-      <small style="font-size: 14px;">
-        {% if urlpath.parent %}
-          <a href="{% url 'wiki:get' path=urlpath.path %}"><span class="fa fa-bookmark"></span> {{ urlpath.slug }}</a>
-        {% endif %}
-
-        {% if article.current_revision.locked %}
-          <span class="icon">
-            <i class="fas fa-lock"></i>
-          </span> locked
-        {% endif %}
-      </small>
     </h1>
     <div>
       {% block wiki_contents_tab %}
diff --git a/pydis_site/templates/wiki/create.html b/pydis_site/templates/wiki/create.html
index 669a5ac4..8a68a1c6 100644
--- a/pydis_site/templates/wiki/create.html
+++ b/pydis_site/templates/wiki/create.html
@@ -7,24 +7,24 @@
 {% block wiki_contents %}
 
   {% addtoblock "js" %}
-  <script type="text/javascript" src="{% static "admin/js/urlify.js" %}"></script>
-  <script type="text/javascript">
-  {% if not create_form.slug.value %}
-  //<![CDATA[
-  (function($) {
-	  $(document).ready(function (){
-		  $("#id_title").keyup(function () {
-			  var e = $("#id_slug")[0];
-			  if(!e._changed) {
-			    slug = URLify(this.value, 50);
-				  e.value = slug;
-			  }
-	      });
-	  });
-  })(jQuery);
-  //]]>
-  {% endif %}
-  </script>
+    <script type="text/javascript" src="{% static "admin/js/urlify.js" %}"></script>
+    <script type="text/javascript">
+    {% if not create_form.slug.value %}
+    //<![CDATA[
+    (function($) {
+      $(document).ready(function (){
+        $("#id_title").keyup(function () {
+          var e = $("#id_slug")[0];
+          if(!e._changed) {
+            slug = URLify(this.value, 50);
+            e.value = slug;
+          }
+          });
+      });
+    })(jQuery);
+    //]]>
+    {% endif %}
+    </script>
   {% endaddtoblock %}
 
   {% include "wiki/includes/editormedia.html" %}
@@ -32,16 +32,22 @@
 
   <form method="POST" class="form-horizontal">
     {% wiki_form create_form %}
-    <div class="form-group form-actions">
-      <div class="col-lg-2"></div>
-      <div class="col-lg-10">
-        <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="btn btn-default">
-          <span class="fa fa-arrow-left"></span>
-          {% trans "Go back" %}
+
+    <div class="field is-horizontal is-grouped">
+      <div class="control">
+        <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="button is-white">
+          <span class="icon">
+            <i class="fa fa-arrow-left"></i>
+          </span>
+          <span>Go back</span>
         </a>
-        <button type="submit" name="save_changes" class="btn btn-primary">
-          <span class="fa fa-plus"></span>
-          {% trans "Create article" %}
+      </div>
+      <div class="control">
+        <button type="submit" name="save_changes" class="button is-primary">
+          <span class="icon">
+            <i class="fa fa-plus"></i>
+          </span>
+          <span>Create Article</span>
         </button>
       </div>
     </div>
diff --git a/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html b/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html
new file mode 100644
index 00000000..c87fda7a
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html
@@ -0,0 +1,46 @@
+{% load wiki_extra %}
+
+<div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
+  <div class="field-label">
+    {% if field.label %}
+      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+      </label>
+    {% endif %}
+
+    {% if field.help_text %}
+      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+        {{ field.help_text|safe }}
+      </p>
+    {% endif %}
+  </div>
+
+  <div class="field-body">
+    <div class="field has-addons">
+    <div class="control">
+      <a class="button is-static">{{ field.form.urlpath_parent | render_urlpath }}</a>
+    </div>
+      <div class="control is-expanded">
+        <input class="input{% if field.errors %} is-danger{% endif %}"
+               type="text"
+               id="{{ field.auto_id }}"
+               name="{{ field.name }}"
+
+               {% if field.required %}required{% endif %}
+               {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
+               {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
+               {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
+               {% if field.value %}value="{{ field.value }}"{% endif %}
+        >
+      </div>
+
+    {% if field.errors %}
+      <p class="help is-danger">
+        {% for error in field.errors %}
+          <span id="error_{{ forloop.counter }}_{{ field.auto_id }}">{{ error }}</span><br />
+        {% endfor %}
+      </p>
+    {% endif %}
+    </div>
+  </div>
+</div>
-- 
cgit v1.2.3


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(-)

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


From d8851f99c9f51119f0bcc9042abe87b64479cca9 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 14:40:03 +0100
Subject: Editor fixes and sidebar accordion

---
 pydis_site/static/js/wiki/load_editor.js           |  3 ++
 pydis_site/templates/wiki/edit.html                |  4 +--
 pydis_site/templates/wiki/forms/fields/char.html   | 28 +++++++++--------
 pydis_site/templates/wiki/forms/fields/image.html  | 31 +++++++++++++++++++
 .../templates/wiki/includes/article_menu.html      |  6 ----
 .../templates/wiki/includes/editor_sidebar.html    | 36 ++++++++++++++--------
 6 files changed, 74 insertions(+), 34 deletions(-)
 create mode 100644 pydis_site/templates/wiki/forms/fields/image.html

diff --git a/pydis_site/static/js/wiki/load_editor.js b/pydis_site/static/js/wiki/load_editor.js
index dfa087d9..6eddbe1e 100644
--- a/pydis_site/static/js/wiki/load_editor.js
+++ b/pydis_site/static/js/wiki/load_editor.js
@@ -39,6 +39,7 @@
             forceSync: true,
             indentWithTabs: false,
             initialValue: element.value,
+            lineWrapping: true,
             placeholder: "**Write some _markdown_!**",
             spellChecker: false,
             tabSize: 4,
@@ -50,6 +51,8 @@
                 "preview", "side-by-side", "fullscreen", "|",
                 "guide"
             ],
+
+            status: false,
         })
     }
 })();
diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index 8bc05ffb..fb3efb31 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -17,7 +17,7 @@
 
   <div class="columns">
 
-    <div class="column is-8">
+    <div class="column is-two-thirds">
       <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="column is-4" id="wiki-edit-sidebar">
+    <div class="column is-one-third" id="wiki-edit-sidebar">
       {% include "wiki/includes/editor_sidebar.html" %}
     </div>
 
diff --git a/pydis_site/templates/wiki/forms/fields/char.html b/pydis_site/templates/wiki/forms/fields/char.html
index 0f130751..4c48d300 100644
--- a/pydis_site/templates/wiki/forms/fields/char.html
+++ b/pydis_site/templates/wiki/forms/fields/char.html
@@ -1,19 +1,21 @@
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    {% if field.label %}
-      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-      </label>
-    {% endif %}
+  {% if not is_markitup %}
+    <div class="field-label">
+      {% if field.label %}
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        </label>
+      {% endif %}
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
-  <div class="field-body">
+  <div class="field-body"{% if is_markitup %} style="display: block; width: 100%;"{% endif %}>
     <div class="field">
       <div class="control">
         {% if is_markitup %}
diff --git a/pydis_site/templates/wiki/forms/fields/image.html b/pydis_site/templates/wiki/forms/fields/image.html
new file mode 100644
index 00000000..47e115fe
--- /dev/null
+++ b/pydis_site/templates/wiki/forms/fields/image.html
@@ -0,0 +1,31 @@
+<div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
+  <div class="field-label">
+    {% if field.label %}
+      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+        IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+      </label>
+    {% endif %}
+
+    {% if field.help_text %}
+      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+        {{ field.help_text|safe }}
+      </p>
+    {% endif %}
+  </div>
+
+  <div class="field-body">
+    <div class="field">
+      <div class="control">
+        {{ field }}
+      </div>
+
+    {% if field.errors %}
+      <p class="help is-danger">
+        {% for error in field.errors %}
+          <span id="error_{{ forloop.counter }}_{{ field.auto_id }}">{{ error }}</span><br />
+        {% endfor %}
+      </p>
+    {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index cbaf024c..5429f6a8 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -70,12 +70,6 @@
 
             <span class="is-hidden-mobile">&nbsp;View</span>
           </a>
-
-          <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>
-            <span aria-hidden="true"></span>
-          </a>
         </div>
 
       </div>
diff --git a/pydis_site/templates/wiki/includes/editor_sidebar.html b/pydis_site/templates/wiki/includes/editor_sidebar.html
index 5dd2f18b..2eebb80f 100644
--- a/pydis_site/templates/wiki/includes/editor_sidebar.html
+++ b/pydis_site/templates/wiki/includes/editor_sidebar.html
@@ -1,19 +1,26 @@
 {% load i18n sekizai_tags %}
 
-<div class="panel-group" id="accordion_{{ plugin.slug }}">
-
+<section class="accordions">
 {% for plugin, plugin_form in sidebar %}
 
-  <div class="panel panel-default">
+  <article class="accordion is-primary">
+    <div class="accordion-header toggle">
+      <p>
+        {% if plugin.sidebar.icon_class %}
+          <span class="icon">
+            {% if plugin.sidebar.icon_class == "fa-picture-o" %}
+              <i class="fas fa-images"></i>
+            {% else %}
+              <i class="fas {{ plugin.sidebar.icon_class }}"></i>
+            {% endif %}
+          </span>
+        {% endif %}
+        {{ plugin.sidebar.headline }}
+      </p>
 
-    <div class="panel-heading">
-      <a class="panel-toggle" href="#collapse_{{ plugin.slug }}" data-toggle="collapse">
-        <h3 class="panel-title"><span class="fa fa-fw {{ plugin.sidebar.icon_class }}"></span> {{ plugin.sidebar.headline }}</h3>
-      </a>
     </div>
-
-    <div id="collapse_{{ plugin.slug }}" class="panel-collapse collapse{% if plugin_form.errors %} in{% endif %}">
-      <div class="panel-body form-vertical">
+    <div class="accordion-body">
+      <div class="accordion-content">
         {% if plugin.sidebar.template %}
           {% with plugin_form as form %}
             <form method="POST" class="form-horizontal sidebar-form" action="?f={{ plugin_form.form_id }}" enctype="multipart/form-data">
@@ -24,7 +31,10 @@
         {% endif %}
       </div>
     </div>
-
-  </div>
+  </article>
 {% endfor %}
-</div>
+</section>
+
+<script type="application/javascript">
+  bulmaAccordion.attach();
+</script>
-- 
cgit v1.2.3


From f15e84e84dd3ab9b58d2b31921230eafd86a7564 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 14:46:13 +0100
Subject: Small styling fixes

---
 pydis_site/templates/wiki/create.html |  2 +-
 pydis_site/templates/wiki/edit.html   | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pydis_site/templates/wiki/create.html b/pydis_site/templates/wiki/create.html
index 8a68a1c6..5cd5e292 100644
--- a/pydis_site/templates/wiki/create.html
+++ b/pydis_site/templates/wiki/create.html
@@ -35,7 +35,7 @@
 
     <div class="field is-horizontal is-grouped">
       <div class="control">
-        <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="button is-white">
+        <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="button is-light">
           <span class="icon">
             <i class="fa fa-arrow-left"></i>
           </span>
diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index fb3efb31..0ebfa2f6 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -23,7 +23,7 @@
           {% include "wiki/includes/editor.html" %}
         {% endwith %}
 
-        <button class="button is-primary" type="submit" name="preview" value="1" id="id_preview"
+        <button class="button is-light" type="submit" name="preview" value="1" id="id_preview"
                 formaction="{% url 'wiki:preview' path=urlpath.path article_id=article.id %}"
                 formtarget="previewWindow"
         >
@@ -82,8 +82,18 @@
         <iframe name="previewWindow" frameborder="0" style="width: 100%; height: 100%;"></iframe>
       </div>
       <div class="modal-card-foot">
-        <button class="button is-primary" aria-label="close">Close</button>
-        <a class="button is-success" id="id_preview_save_changes">Save Changes</a>
+        <button class="button is-white" aria-label="close">
+          <span class="icon">
+            <i class="fas fa-arrow-left"></i>
+          </span>
+          <span>Back</span>
+        </button>
+        <a class="button is-primary" id="id_preview_save_changes">
+          <span class="icon">
+            <i class="fas fa-save"></i>
+          </span>
+          <span>Save Changes</span>
+        </a>
       </div>
     </div>
   </div>
-- 
cgit v1.2.3


From f27987070e40fcf4b017f91c23c4747373e85c9d Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 14:56:50 +0100
Subject: Images sidebar work, and allow fields to be rendered without labels

---
 pydis_site/apps/home/templatetags/wiki_extra.py    |  4 +-
 .../templates/wiki/forms/fields/boolean.html       | 29 ++++---
 pydis_site/templates/wiki/forms/fields/char.html   |  2 +-
 pydis_site/templates/wiki/forms/fields/image.html  | 26 ++++---
 .../wiki/forms/fields/in_place_render.html         | 26 ++++---
 .../templates/wiki/forms/fields/model_choice.html  | 26 ++++---
 .../wiki/forms/fields/wiki_slug_render.html        | 26 ++++---
 pydis_site/templates/wiki/includes/formfield.html  |  2 +-
 .../templates/wiki/plugins/images/sidebar.html     | 88 ++++++++--------------
 .../wiki/plugins/macros/article_list.html          | 14 ----
 .../templates/wiki/plugins/macros/sidebar.html     | 20 -----
 11 files changed, 111 insertions(+), 152 deletions(-)
 delete mode 100644 pydis_site/templates/wiki/plugins/macros/article_list.html
 delete mode 100644 pydis_site/templates/wiki/plugins/macros/sidebar.html

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index ae168ae3..d4e9b266 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -62,7 +62,7 @@ def get_unbound_field(field: BoundField):
 
 
 @register.simple_tag
-def render_field(field: Field):
+def render_field(field: Field, render_labels: bool = True):
     if isinstance(field, BoundField):
         unbound_field = get_unbound_field(field)
     else:
@@ -75,7 +75,7 @@ def render_field(field: Field):
         raise NotImplementedError(f"Unknown field type: {unbound_field.__class__}")
 
     template_obj: Template = get_template(template_path)
-    context = {"field": field, "is_markitup": is_markitup}
+    context = {"field": field, "is_markitup": is_markitup, "render_labels": render_labels}
 
     return mark_safe(template_obj.render(context))
 
diff --git a/pydis_site/templates/wiki/forms/fields/boolean.html b/pydis_site/templates/wiki/forms/fields/boolean.html
index 9d054083..9a8470be 100644
--- a/pydis_site/templates/wiki/forms/fields/boolean.html
+++ b/pydis_site/templates/wiki/forms/fields/boolean.html
@@ -1,15 +1,17 @@
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    <label class="label {% if field.errors %} is-danger{% endif %}">
-      {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-    </label>
+  {% if render_labels %}
+    <div class="field-label">
+      <label class="label {% if field.errors %} is-danger{% endif %}">
+        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+      </label>
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field">
@@ -25,8 +27,13 @@
                {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
                {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
         />
+
         <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-          &nbsp;
+          {% if not render_labels %}
+            {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+          {% else %}
+            &nbsp;
+          {% endif %}
         </label>
       </div>
 
diff --git a/pydis_site/templates/wiki/forms/fields/char.html b/pydis_site/templates/wiki/forms/fields/char.html
index 4c48d300..83600dae 100644
--- a/pydis_site/templates/wiki/forms/fields/char.html
+++ b/pydis_site/templates/wiki/forms/fields/char.html
@@ -1,5 +1,5 @@
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  {% if not is_markitup %}
+  {% if render_labels and not is_markitup %}
     <div class="field-label">
       {% if field.label %}
         <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
diff --git a/pydis_site/templates/wiki/forms/fields/image.html b/pydis_site/templates/wiki/forms/fields/image.html
index 47e115fe..8591f547 100644
--- a/pydis_site/templates/wiki/forms/fields/image.html
+++ b/pydis_site/templates/wiki/forms/fields/image.html
@@ -1,17 +1,19 @@
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    {% if field.label %}
-      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-      </label>
-    {% endif %}
+  {% if render_labels %}
+    <div class="field-label">
+      {% if field.label %}
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        </label>
+      {% endif %}
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field">
diff --git a/pydis_site/templates/wiki/forms/fields/in_place_render.html b/pydis_site/templates/wiki/forms/fields/in_place_render.html
index 47e115fe..8591f547 100644
--- a/pydis_site/templates/wiki/forms/fields/in_place_render.html
+++ b/pydis_site/templates/wiki/forms/fields/in_place_render.html
@@ -1,17 +1,19 @@
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    {% if field.label %}
-      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-      </label>
-    {% endif %}
+  {% if render_labels %}
+    <div class="field-label">
+      {% if field.label %}
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        </label>
+      {% endif %}
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field">
diff --git a/pydis_site/templates/wiki/forms/fields/model_choice.html b/pydis_site/templates/wiki/forms/fields/model_choice.html
index c6cd53ab..58c55e04 100644
--- a/pydis_site/templates/wiki/forms/fields/model_choice.html
+++ b/pydis_site/templates/wiki/forms/fields/model_choice.html
@@ -1,19 +1,21 @@
 {% load wiki_extra %}
 
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    {% if field.label %}
-      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-      </label>
-    {% endif %}
+  {% if render_labels %}
+    <div class="field-label">
+      {% if field.label %}
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        </label>
+      {% endif %}
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field">
diff --git a/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html b/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html
index c87fda7a..ff5c8528 100644
--- a/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html
+++ b/pydis_site/templates/wiki/forms/fields/wiki_slug_render.html
@@ -1,19 +1,21 @@
 {% load wiki_extra %}
 
 <div id="div_{{ field.auto_id }}" class="field is-horizontal{% if field.errors %} is-danger{% endif %}">
-  <div class="field-label">
-    {% if field.label %}
-      <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-        {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
-      </label>
-    {% endif %}
+  {% if render_labels %}
+    <div class="field-label">
+      {% if field.label %}
+        <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
+          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+        </label>
+      {% endif %}
 
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
-        {{ field.help_text|safe }}
-      </p>
-    {% endif %}
-  </div>
+      {% if field.help_text %}
+        <p id="hint_{{ field.auto_id }}" class="help has-text-grey">
+          {{ field.help_text|safe }}
+        </p>
+      {% endif %}
+    </div>
+  {% endif %}
 
   <div class="field-body">
     <div class="field has-addons">
diff --git a/pydis_site/templates/wiki/includes/formfield.html b/pydis_site/templates/wiki/includes/formfield.html
index c466719b..8c42cfbf 100644
--- a/pydis_site/templates/wiki/includes/formfield.html
+++ b/pydis_site/templates/wiki/includes/formfield.html
@@ -3,5 +3,5 @@
 {% if field.is_hidden %}
   {{ field }}
 {% else %}
-  {% render_field field %}
+  {% render_field field render_labels %}
 {% endif %}
diff --git a/pydis_site/templates/wiki/plugins/images/sidebar.html b/pydis_site/templates/wiki/plugins/images/sidebar.html
index 909bf6c9..d25fe48e 100644
--- a/pydis_site/templates/wiki/plugins/images/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/images/sidebar.html
@@ -40,6 +40,39 @@ function add_image(form) {
 <style type="text/css">
   #image-list tr:first-child td {border:0;}
 </style>
+
+  <h4>Add image</h4>
+
+  {% if article|images_can_add:user %}
+    {% include "wiki/includes/formerrors.html" %}
+
+    {# Include the hidden fields #}
+    {% for hidden in form.hidden_fields %}
+      {{ hidden }}
+    {% endfor %}
+
+    <p>
+    {% for field in form.visible_fields %}
+      {% include "wiki/includes/formfield.html" with render_labels=False %}
+    {% endfor %}
+
+    <p>
+      <button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="button is-primary">
+        <span class="icon">
+          <i class="fas fa-upload"></i>
+        </span>
+        <span>Upload</span>
+      </button>
+    </p>
+  {% else %}
+
+    {% if user.is_anonymous %}
+      {% include "wiki/includes/anonymous_blocked.html" %}
+    {% else %}
+      <p><em>{% trans "You do not have permissions to add images." %}</em></p>
+    {% endif %}
+  {% endif %}
+
 <div style="max-height: 300px; overflow: auto;">
   <table class="table table-responsive table-bordered" id="image-list">
     {% for image in images %}
@@ -78,61 +111,6 @@ function add_image(form) {
 </p>
 <hr />
 
-<h4>{% trans "Add new image" %}</h4>
-
-{% if article|images_can_add:user %}
-  {% if form.non_field_errors %}
-    {% if form_error_title %}<h4 class="alert-heading">{{ form_error_title }}</h4>{% endif %}
-    {% for error_message in form.non_field_errors %}
-      <div class="alert alert-block alert-danger">
-        {{ error_message }}
-      </div>
-    {% endfor %}
-  {% endif %}
-
-  {# Include the hidden fields #}
-  {% for hidden in form.hidden_fields %}
-    {{ hidden }}
-  {% endfor %}
-
-  <p>
-  {% for field in form.visible_fields %}
-    <fieldset id="div_{{ field.auto_id }}" class="control-group fields {% if field.errors %} error{% endif %}">
-      {% if field.label %}
-        <!--<label for="{{ field.id_for_label }}" class="{% if field.field.required %}requiredField{% endif %}">
-        {{ field.label|safe }}
-        </label>-->
-      {% endif %}
-      {{ field }}
-      {% if field.errors %}
-      <div id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="help-block">
-        {% for error in field.errors %}
-        <div>{{ error }}</div>
-        {% endfor %}
-      </div>
-      {% endif %}
-    </fieldset>
-    {% if field.help_text %}
-      <p id="hint_{{ field.auto_id }}" class="help-block">{{ field.help_text|safe }}</p>
-    {% endif %}
-  {% endfor %}
-  </p>
-
-  <p>
-    <button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="btn btn-default btn-md">
-      <span class="fa fa-upload"></span>
-      {% trans "Add image" %}
-    </button>
-  </p>
-{% else %}
-
-  {% if user.is_anonymous %}
-    {% include "wiki/includes/anonymous_blocked.html" %}
-  {% else %}
-    <p><em>{% trans "You do not have permissions to add images." %}</em></p>
-  {% endif %}
-{% endif %}
-
 <hr />
 
 <h4>
diff --git a/pydis_site/templates/wiki/plugins/macros/article_list.html b/pydis_site/templates/wiki/plugins/macros/article_list.html
deleted file mode 100644
index c9261f1e..00000000
--- a/pydis_site/templates/wiki/plugins/macros/article_list.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load i18n wiki_macro_tags %}
-
-{% if article_children %}
-  <div class="article-list">
-    <ul>
-    <li class="nav-header">{% trans "Article index" %} <i class="fa fa-list"></i></li>
-    {% for child in article_children %}
-      {% article_list child depth %}
-      {% empty %}
-      <i>{% trans "Nothing below this level" %}</i>
-    {% endfor %}
-    </ul>
-  </div>
-{% endif %}
diff --git a/pydis_site/templates/wiki/plugins/macros/sidebar.html b/pydis_site/templates/wiki/plugins/macros/sidebar.html
deleted file mode 100644
index 31b68520..00000000
--- a/pydis_site/templates/wiki/plugins/macros/sidebar.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% load i18n wiki_macro_tags %}
-{% allowed_macros as macros %}
-
-{% for macro in macros %}
-<h4>{{ macro.short_description }}</h4>
-{{ macro.help_text|safe|linebreaks }}
-{% if macro.example_code %}
-<pre>{{ macro.example_code }}</pre>
-{% endif %}
-{% if macro.args %}
-<table class="table table-compact">
-{% for arg,description in macro.args.items %}
-  <tr>
-    <th>{{ arg }}</th>
-    <td>{{ description }}</td>
-  </tr>
-{% endfor %}
-</table>
-{% endif %}
-{% endfor %}
-- 
cgit v1.2.3


From db00d8720dce82d7caedfe4c37797e6e91e75612 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 15:00:11 +0100
Subject: Better method for default label rendering

---
 pydis_site/apps/home/templatetags/wiki_extra.py | 3 +++
 pydis_site/settings.py                          | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index d4e9b266..ca368e2c 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -68,6 +68,9 @@ def render_field(field: Field, render_labels: bool = True):
     else:
         unbound_field = field
 
+    if not isinstance(render_labels, bool):
+        render_labels = True
+
     template_path = TEMPLATES.get(unbound_field.__class__)
     is_markitup = isinstance(unbound_field.widget, MarkItUpWidget)
 
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index c4a1bf7e..58bf5abe 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -39,7 +39,8 @@ if DEBUG:
         'admin.pythondiscord.local',
         'api.pythondiscord.local',
         'staff.pythondiscord.local',
-        'wiki.pythondiscord.local'
+        'wiki.pythondiscord.local',
+        '*',  # PLEASE yell at me if I commit this
     ]
     SECRET_KEY = "+_x00w3e94##2-qm-v(5&-x_@*l3t9zlir1etu+7$@4%!it2##"
 
@@ -93,7 +94,6 @@ INSTALLED_APPS = [
     'wiki.plugins.images.apps.ImagesConfig',
     'wiki.plugins.links.apps.LinksConfig',
     'wiki.plugins.redlinks.apps.RedlinksConfig',
-    'wiki.plugins.macros.apps.MacrosConfig',
 ]
 
 MIDDLEWARE = [
@@ -202,7 +202,7 @@ ROOT_HOSTCONF = 'pydis_site.hosts'
 DEFAULT_HOST = 'home'
 
 if DEBUG:
-    PARENT_HOST = 'pythondiscord.local:8000'
+    PARENT_HOST = 'trixie.gserv.me:8000'
 else:
     PARENT_HOST = env('PARENT_HOST', default='pythondiscord.com')
 
@@ -307,7 +307,6 @@ WIKI_MARKDOWN_KWARGS = {
         "wiki.core.markdown.mdx.codehilite",
         "wiki.core.markdown.mdx.previewlinks",
         "wiki.core.markdown.mdx.responsivetable",
-        "wiki.plugins.macros.mdx.macro",
         "wiki.plugins.macros.mdx.toc",
         "wiki.plugins.macros.mdx.wikilinks",
     ]
-- 
cgit v1.2.3


From d35c9f32310038191eb7ee9975f91c7cdbb8fb45 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Mon, 15 Apr 2019 15:32:02 +0100
Subject: Image upload and images sidebar form work

---
 pydis_site/templates/wiki/forms/fields/image.html  | 22 ++++++++-
 .../templates/wiki/plugins/images/sidebar.html     | 52 +++++++++-------------
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/pydis_site/templates/wiki/forms/fields/image.html b/pydis_site/templates/wiki/forms/fields/image.html
index 8591f547..afef6889 100644
--- a/pydis_site/templates/wiki/forms/fields/image.html
+++ b/pydis_site/templates/wiki/forms/fields/image.html
@@ -18,7 +18,27 @@
   <div class="field-body">
     <div class="field">
       <div class="control">
-        {{ field }}
+        <div class="file has-name is-fullwidth">
+          <label class="file-label">
+            <input class="file-input"
+                   type="file"
+                   id="{{ field.auto_id }}"
+                   name="{{ field.name }}"
+                   accept="image/*"
+
+                   {% if field.required %}required{% endif %}
+            />
+          <span class="file-cta">
+            <span class="file-icon">
+              <i class="fas fa-image"></i>
+            </span>
+            <span class="file-label">
+              Upload
+            </span>
+          </span>
+          <span class="file-name"></span>
+          </label>
+        </div>
       </div>
 
     {% if field.errors %}
diff --git a/pydis_site/templates/wiki/plugins/images/sidebar.html b/pydis_site/templates/wiki/plugins/images/sidebar.html
index d25fe48e..d206cbaf 100644
--- a/pydis_site/templates/wiki/plugins/images/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/images/sidebar.html
@@ -41,37 +41,27 @@ function add_image(form) {
   #image-list tr:first-child td {border:0;}
 </style>
 
-  <h4>Add image</h4>
-
-  {% if article|images_can_add:user %}
-    {% include "wiki/includes/formerrors.html" %}
-
-    {# Include the hidden fields #}
-    {% for hidden in form.hidden_fields %}
-      {{ hidden }}
-    {% endfor %}
-
-    <p>
-    {% for field in form.visible_fields %}
-      {% include "wiki/includes/formfield.html" with render_labels=False %}
-    {% endfor %}
-
-    <p>
-      <button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="button is-primary">
-        <span class="icon">
-          <i class="fas fa-upload"></i>
-        </span>
-        <span>Upload</span>
-      </button>
-    </p>
-  {% else %}
-
-    {% if user.is_anonymous %}
-      {% include "wiki/includes/anonymous_blocked.html" %}
-    {% else %}
-      <p><em>{% trans "You do not have permissions to add images." %}</em></p>
-    {% endif %}
-  {% endif %}
+{% if article|images_can_add:user %}
+  {% include "wiki/includes/formerrors.html" %}
+
+  {# Include the hidden fields #}
+  {% for hidden in form.hidden_fields %}
+    {{ hidden }}
+  {% endfor %}
+
+  {% for field in form.visible_fields %}
+    {% include "wiki/includes/formfield.html" with render_labels=False %}
+  {% endfor %}
+
+  <button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="button is-primary is-fullwidth">
+    <span class="icon">
+      <i class="fas fa-save"></i>
+    </span>
+    <span>Save</span>
+  </button>
+{% endif %}
+
+<div class="is-divider"></div>
 
 <div style="max-height: 300px; overflow: auto;">
   <table class="table table-responsive table-bordered" id="image-list">
-- 
cgit v1.2.3


From f7830f299fc9009ff944b3aea656b44d83c91420 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 17 Apr 2019 11:38:04 +0100
Subject: Accessibility and images sidebar

---
 pydis_site/apps/home/templatetags/wiki_extra.py    |  1 -
 pydis_site/settings.py                             |  4 +-
 pydis_site/templates/wiki/forms/fields/image.html  |  4 +-
 .../templates/wiki/plugins/images/sidebar.html     | 75 ++++++++++++----------
 4 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index ca368e2c..e0a27973 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -99,4 +99,3 @@ def get_field_options(context, field: BoundField):
 @register.filter
 def render_urlpath(value: URLPath):
     return value.path or "/"
-
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 58bf5abe..40954566 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -276,6 +276,8 @@ BULMA_SETTINGS = {
     "variables": {
         "primary": "#7289DA",
         "link": "$primary",
+
+        "green": "#21c65c",  # Better contrast with the light text
     }
 }
 
@@ -313,7 +315,7 @@ WIKI_MARKDOWN_KWARGS = {
 }
 
 WIKI_MESSAGE_TAG_CSS_CLASS = {
-    messages.DEBUG: "is-info",
+    messages.DEBUG: "",  # is-info isn't distinctive enough from blurple
     messages.ERROR: "is-danger",
     messages.INFO: "is-primary",
     messages.SUCCESS: "is-success",
diff --git a/pydis_site/templates/wiki/forms/fields/image.html b/pydis_site/templates/wiki/forms/fields/image.html
index afef6889..ce5402be 100644
--- a/pydis_site/templates/wiki/forms/fields/image.html
+++ b/pydis_site/templates/wiki/forms/fields/image.html
@@ -3,7 +3,7 @@
     <div class="field-label">
       {% if field.label %}
         <label for="{{ field.auto_id }}" class="label {% if field.errors %} is-danger{% endif %}">
-          IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
+          {{ field.label | safe }} {% if field.field.required %}<span class="asterisk has-text-danger">*</span>{% endif %}
         </label>
       {% endif %}
 
@@ -33,7 +33,7 @@
               <i class="fas fa-image"></i>
             </span>
             <span class="file-label">
-              Upload
+              Choose
             </span>
           </span>
           <span class="file-name"></span>
diff --git a/pydis_site/templates/wiki/plugins/images/sidebar.html b/pydis_site/templates/wiki/plugins/images/sidebar.html
index d206cbaf..3089cc85 100644
--- a/pydis_site/templates/wiki/plugins/images/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/images/sidebar.html
@@ -55,48 +55,55 @@ function add_image(form) {
 
   <button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="button is-primary is-fullwidth">
     <span class="icon">
-      <i class="fas fa-save"></i>
+      <i class="fas fa-upload"></i>
     </span>
-    <span>Save</span>
+    <span>Upload</span>
   </button>
 {% endif %}
 
 <div class="is-divider"></div>
 
-<div style="max-height: 300px; overflow: auto;">
-  <table class="table table-responsive table-bordered" id="image-list">
-    {% for image in images %}
-      {% with image.current_revision.imagerevision as revision %}
-      {% thumbnail revision.image "50x50" crop="center" as thumb %}
-        <tr>
-          <td style="white-space: nowrap;">
-            <p>{% trans "Image id" %}: {{ image.id }}</p>
-            <p>
-              <a href="javascript:void(insert_image({{ image.id }}))"><span class="fa fa-edit"></span> {% trans "Insert" %}</a><br />
-              {% if image|can_write:user %}
-              <a href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}"><span class="fa fa-upload"></span> {% trans "Replace" %}</a>
-              {% endif %}
-            </p>
-          </td>
-          <td>
-            <div class="thumbnail">
-              <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
-            </div>
-          </td>
-        </tr>
-      {% endthumbnail %}
-      {% endwith %}
-    {% empty %}
-    <tr>
-      <td><em>{% trans "No images found for this article" %}</em></td>
-    </tr>
-    {% endfor %}
-  </table>
-</div>
+{% for image in images %}
+  {% with image.current_revision.imagerevision as revision %}
+    {% thumbnail revision.image "100x100" crop="center" as thumb %}
+      <div class="columns">
+        <div class="column is-half">
+          <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" title="{{ revision.get_filename }}" />
+        </div>
+        <div class="column is-half has-text-right">
+          <div class="tags is-right">
+            <span class="tag is-dark is-medium">Image ID: {{ image.id }}</span>
+          </div>
+
+          <p>
+            <a class="button is-primary" title="Insert image" href="javascript:void(insert_image({{ image.id }}))">
+              <span class="icon">
+                <i class="fa fa-paste"></i>
+              </span>
+            </a>
+
+            {% if image|can_write:user %}
+              <a class="button is-primary" title="Replace" href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
+                <span class="icon">
+                  <i class="fas fa-upload"></i>
+                </span>
+              </a>
+            {% endif %}
+          </p>
+        </div>
+      </div>
+    {% endthumbnail %}
+  {% endwith %}
+{% empty %}
+  <em>No images found for this article</em>
+{% endfor %}
 
 <p>
-  <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}">
-    {% trans "Manage images" %} &raquo;
+  <a class="button is-primary is-fullwidth" href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}">
+    <span>Manage Images</span>
+    <span class="icon">
+      <i class="fas fa-arrow-right"></i>
+    </span>
   </a>
 </p>
 <hr />
-- 
cgit v1.2.3


From 230e255ee233f0b04d3b5c3f1aac2b66f4564578 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 17 Apr 2019 13:54:33 +0100
Subject: Image sidebar is finally complete

---
 pydis_site/static/css/wiki/style.css               |   4 +
 pydis_site/static/js/wiki/load_editor.js           |  37 ++-
 pydis_site/static/js/wiki/modal.js                 |   3 +-
 .../templates/wiki/plugins/images/sidebar.html     | 363 +++++++++++++--------
 4 files changed, 256 insertions(+), 151 deletions(-)

diff --git a/pydis_site/static/css/wiki/style.css b/pydis_site/static/css/wiki/style.css
index b4f233f7..61ded7ce 100644
--- a/pydis_site/static/css/wiki/style.css
+++ b/pydis_site/static/css/wiki/style.css
@@ -1,3 +1,7 @@
 .breadcrumb-section {
     padding: 1rem;
 }
+
+div.control.is-fullwidth {
+    width: 100%;
+}
diff --git a/pydis_site/static/js/wiki/load_editor.js b/pydis_site/static/js/wiki/load_editor.js
index 6eddbe1e..0671daed 100644
--- a/pydis_site/static/js/wiki/load_editor.js
+++ b/pydis_site/static/js/wiki/load_editor.js
@@ -1,15 +1,12 @@
 (function() {
     window.editors = {};  // So that other scripts can get at 'em
 
-    const TOCText = "[TOC]";
-
     const headingAction = {
         name: "heading",
         action: SimpleMDE.toggleHeadingSmaller,
         className: "fa fa-heading",
         title: "Heading",
     };
-
     const imageAction = {
         name: "image",
         action: SimpleMDE.drawImage,
@@ -17,10 +14,37 @@
         title: "Insert image",
     };
 
+    const imageAlign = "align:{ALIGN} ";
+    const imageSize = "size:{SIZE}";
+
     let elements = document.getElementsByClassName("simple-mde");
 
+    function add_insert_image_wiki(editor) {
+        editor.insert_image_wiki = function(id, align, size, caption) {
+            let contents = "",
+                doc = editor.codemirror.getDoc(),
+                cursor = doc.getCursor();
+
+            if (typeof align !== "undefined" && align.length) {
+                contents = contents + imageAlign.replace("{ALIGN}", align);
+            }
+
+            if (typeof size !== "undefined" && size.length) {
+                contents = contents + imageSize.replace("{SIZE}", size);
+            }
+
+            contents = `\n[image:${id} ${contents}]`;
+
+            if (typeof caption !== "undefined" && caption.length) {
+                contents = contents + "\n" + `    ${caption}`
+            }
+
+            doc.replaceRange(contents, cursor);
+        }
+    }
+
     for (let element of elements) {
-        window.editors[element.id] = new SimpleMDE({
+        let editor = new SimpleMDE({
             "element": element,
 
             autoDownloadFontAwesome: false,  // We already have the pro one loaded
@@ -53,6 +77,9 @@
             ],
 
             status: false,
-        })
+        });
+
+        add_insert_image_wiki(editor);
+        window.editors[element.id] = editor;
     }
 })();
diff --git a/pydis_site/static/js/wiki/modal.js b/pydis_site/static/js/wiki/modal.js
index 01252575..1eb7b056 100644
--- a/pydis_site/static/js/wiki/modal.js
+++ b/pydis_site/static/js/wiki/modal.js
@@ -7,7 +7,8 @@ function open_modal(id) {
         $(element).removeClass("is-active");
     });
 
-    $(element).find("[aria-label=\"close\"]").click(function() {
+    $(element).find("[aria-label=\"close\"]").click(function(e) {
         $(element).removeClass("is-active");
+        e.preventDefault();
     });
 }
diff --git a/pydis_site/templates/wiki/plugins/images/sidebar.html b/pydis_site/templates/wiki/plugins/images/sidebar.html
index 3089cc85..b4e58e6d 100644
--- a/pydis_site/templates/wiki/plugins/images/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/images/sidebar.html
@@ -1,163 +1,236 @@
 {% load i18n wiki_tags wiki_images_tags humanize wiki_thumbnails sekizai_tags %}
 
-
-{% addtoblock "js" %}
-<script type="text/javascript">
-function insert_image(data) {
-    if (typeof data == "number") {
-        image_id = data;
-        $("#img_title").text(" {{ _("Insert Image")|escapejs }} " + image_id);
-        $("#img_modal").on('shown.bs.modal', function(){
-            $(this).find('#img_caption').focus();
-        });
-        $("#img_modal").modal();
-   } else {
-        align = data.img_align.options[data.img_align.selectedIndex].text;
-        size = data.img_size.options[data.img_size.selectedIndex].text;
-        caption = data.img_caption.value;
-
-        data.img_align.selectedIndex = 0;
-        data.img_size.selectedIndex = 0;
-        data.img_caption.value = "";
-
-        tag = '\n[image:'+image_id;
-        if (align != "center") tag = tag + ' align:'+align;
-        if (size != "default") tag = tag + ' size:'+size;
-
-        if (caption == '')
-            $('#id_content').insertAtCaret(tag+']\n\n');
-        else
-            $('#id_content').insertAtCaret(tag+']\n    '+caption+'\n\n');
-    }
-}
-function add_image(form) {
-    $(form).submit();
-}
-</script>
-{% endaddtoblock %}
-
 {% with article|images_for_article as images %}
-<style type="text/css">
-  #image-list tr:first-child td {border:0;}
-</style>
+  {% if article|images_can_add:user %}
+    {% include "wiki/includes/formerrors.html" %}
+
+    {# Include the hidden fields #}
+    {% for hidden in form.hidden_fields %}
+      {{ hidden }}
+    {% endfor %}
+
+    {% for field in form.visible_fields %}
+      {% include "wiki/includes/formfield.html" with render_labels=False %}
+    {% endfor %}
+
+    <button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="button is-primary is-fullwidth">
+      <span class="icon">
+        <i class="fas fa-upload"></i>
+      </span>
+      <span>Upload</span>
+    </button>
+
+    <br />
+  {% endif %}
+
+  {% for image in images %}
+    {% with image.current_revision.imagerevision as revision %}
+      {% thumbnail revision.image "100x100" crop="center" as thumb %}
+        <div class="columns">
+          <div class="column is-half">
+            <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" title="{{ revision.get_filename }}" />
+          </div>
+          <div class="column is-half has-text-right">
+            <div class="tags is-right">
+              <span class="tag is-dark is-medium">Image ID: {{ image.id }}</span>
+            </div>
 
-{% if article|images_can_add:user %}
-  {% include "wiki/includes/formerrors.html" %}
+            <p>
+              <a class="button is-primary" title="Insert image" href="javascript:void(insert_image({{ image.id }}))">
+                <span class="icon">
+                  <i class="fa fa-paste"></i>
+                </span>
+              </a>
 
-  {# Include the hidden fields #}
-  {% for hidden in form.hidden_fields %}
-    {{ hidden }}
-  {% endfor %}
+              {% if image|can_write:user %}
+                <a class="button is-primary" title="Replace" href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
+                  <span class="icon">
+                    <i class="fas fa-upload"></i>
+                  </span>
+                </a>
+              {% endif %}
+            </p>
+          </div>
+        </div>
+      {% endthumbnail %}
+    {% endwith %}
 
-  {% for field in form.visible_fields %}
-    {% include "wiki/includes/formfield.html" with render_labels=False %}
+  {% empty %}
+    <div class="has-text-centered">
+      No images found for this article.
+    </div>
+    <br />
   {% endfor %}
 
-  <button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="button is-primary is-fullwidth">
-    <span class="icon">
-      <i class="fas fa-upload"></i>
-    </span>
-    <span>Upload</span>
-  </button>
-{% endif %}
-
-<div class="is-divider"></div>
-
-{% for image in images %}
-  {% with image.current_revision.imagerevision as revision %}
-    {% thumbnail revision.image "100x100" crop="center" as thumb %}
-      <div class="columns">
-        <div class="column is-half">
-          <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" title="{{ revision.get_filename }}" />
-        </div>
-        <div class="column is-half has-text-right">
-          <div class="tags is-right">
-            <span class="tag is-dark is-medium">Image ID: {{ image.id }}</span>
-          </div>
+  <p>
+    <a class="button is-primary is-fullwidth" href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}">
+      <span>Manage Images</span>
+      <span class="icon">
+        <i class="fas fa-arrow-right"></i>
+      </span>
+    </a>
+  </p>
+
+  <h4 class="title is-4">How to use images</h4>
+
+  <p>
+    Images are local to the article, and may only be used in the article they are
+    uploaded to. Images may be replaced by clicking the upload button next to it
+    above, but note that image revisions are kept and can be found on the
+    <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}">Manage Images page</a>.
+  </p>
+
+  <p>
+    To make use of images in an article, use the <code>image</code> wiki tag in
+    your Markdown. These tags take some arguments for customisation, and you can
+    also include a caption on the next line, indented by four spaces. Note that
+    the <code>align</code> and <code>size</code> options are optional.
+  </p>
+    <p>
+    Syntax: <code>[image:ID align:x size:y]</code>
+    </p>
+  <p>
+    The ID to use is the image ID shown next to the image in the list above.
+    You can click on the insert button if you'd like to insert an image into the
+    editor without manually typing the tag.
+  </p>
+
+  <h5 class="title is-5">Example tag</h5>
+
+  <pre>
+  [image:1 align:left size:orig]
+      Python Discord logo
+  </pre>
+
+  <h5 class="title is-5">Options for align</h5>
+
+  <div class="tags">
+    <span class="tag is-primary">left</span>
+    <span class="tag is-primary">right</span>
+  </div>
 
-          <p>
-            <a class="button is-primary" title="Insert image" href="javascript:void(insert_image({{ image.id }}))">
-              <span class="icon">
-                <i class="fa fa-paste"></i>
-              </span>
-            </a>
+  <h5 class="title is-5">Options for size</h5>
 
-            {% if image|can_write:user %}
-              <a class="button is-primary" title="Replace" href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
-                <span class="icon">
-                  <i class="fas fa-upload"></i>
-                </span>
-              </a>
-            {% endif %}
-          </p>
-        </div>
-      </div>
-    {% endthumbnail %}
-  {% endwith %}
-{% empty %}
-  <em>No images found for this article</em>
-{% endfor %}
-
-<p>
-  <a class="button is-primary is-fullwidth" href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}">
-    <span>Manage Images</span>
-    <span class="icon">
-      <i class="fas fa-arrow-right"></i>
-    </span>
-  </a>
-</p>
-<hr />
-
-<hr />
-
-<h4>
-  {% trans "How to use images" %}
-</h4>
-
-<p>{% trans "After uploading an image, it is attached to this particular article and can be used only here. Other users may replace the image, but older versions are kept. To show the image press the Insert button and select the options you want to use. You can use Markdown in the caption. The Markdown code syntax for images looks like this" %}<br/>
-<pre>[image:id align:right size:orig]
-    caption indented by 4 spaces</pre>
-{% trans "Possible values for align are" %} <pre>left | right</pre>
-{% trans "Possible values for size are" %} <pre>small | medium | large | orig | default</pre>
-</p>
+  <div class="tags">
+    <span class="tag is-primary">small</span>
+    <span class="tag is-primary">medium</span>
+    <span class="tag is-primary">large</span>
+    <span class="tag is-primary">orig</span>
+    <span class="tag is-primary">default</span>
+  </div>
 {% endwith %}
 
-<div class="modal" id="img_modal" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content" style="position:relative !important;">
-      <div class="modal-header">
-        <h4 id="img_title"></h4>
-      </div>
-      <div class="modal-body">
-        <form role="form">
-          <div class="form-group" style="margin-left:0; margin-right:0;">
-            <label for="img_align">{% trans "Alignment" %}</label>
-            <select class="form-control" id="img_align">
-              <option>center</option>
-              <option>left</option>
-              <option>right</option>
-            </select>
+<div class="modal" id="imgModal">
+  <div class="modal-background"></div>
+  <div class="modal-card" style="height: 80%; width: 80%;">
+    <div class="modal-card-head">
+      <p class="modal-card-title">Insert Image</p>
+    </div>
+    <div class="modal-card-body" style="padding: 0; overflow: hidden;">
+      <section class="section">
+        <input type="hidden" value="0" id="img_id" />
+        <div class="field is-horizontal">
+          <div class="field-label">
+            <label for="img_align">Image alignment</label>
+          </div>
+          <div class="field-body">
+            <div class="control has-icons-left is-fullwidth">
+              <div class="select is-fullwidth">
+                <select id="img_align">
+                  <option selected value="">Default</option>
+                  <option value="left">Left</option>
+                  <option value="right">Right</option>
+                </select>
+              </div>
+
+              <span class="icon is-left">
+                <i class="fas fa-align-center"></i>
+              </span>
+            </div>
+          </div>
+        </div>
+
+        <div class="field is-horizontal">
+          <div class="field-label">
+            <label for="img_size">Image size</label>
           </div>
-          <div class="form-group" style="margin-left:0; margin-right:0;">
-            <label for="img_size">{% trans "Size" %}</label>
-            <select class="form-control" id="img_size">
-              <option>default</option>
-              <option>small</option>
-              <option>medium</option>
-              <option>large</option>
-              <option>orig</option>
-            </select>
+          <div class="field-body">
+            <div class="control has-icons-left is-fullwidth">
+              <div class="select is-fullwidth">
+                <select id="img_size">
+                  <option selected value="">Default</option>
+                  <option value="orig">Original</option>
+
+                  <option value="small">Small</option>
+                  <option value="medium">Medium</option>
+                  <option value="large">Large</option>
+                </select>
+              </div>
+              <span class="icon is-left">
+                <i class="fas fa-expand-arrows"></i>
+              </span>
+            </div>
           </div>
-          <div class="form-group" style="margin-left:0; margin-right:0;">
-            <label for="img_caption">{% trans "Caption" %}</label>
-            <input type="text" class="form-control" id="img_caption" placeholder="{% trans "Enter caption" %}">
+        </div>
+
+        <div class="field is-horizontal">
+          <div class="field-label">
+            <label for="img_caption">Image caption</label>
           </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button class="btn btn-success btn-default" data-dismiss="modal" onClick="insert_image(this.form)"> {% trans "Insert image" %} </button>
-        <button class="btn btn-danger" data-dismiss="modal"> {% trans "Cancel" %} </button>
-      </div>
+          <div class="field-body">
+            <input class="input" type="text" placeholder="Enter Caption" id="img_caption" />
+          </div>
+        </div>
+      </section>
+    </div>
+    <div class="modal-card-foot">
+      <button class="button is-light" aria-label="close">
+        <span class="icon">
+          <i class="fas fa-arrow-left"></i>
+        </span>
+        <span>Back</span>
+      </button>
+      <button class="button is-primary" id="id_image_insert">
+        <span class="icon">
+          <i class="fas fa-paste"></i>
+        </span>
+        <span>Insert</span>
+      </button>
     </div>
   </div>
 </div>
+
+<script type="text/javascript">
+  $("#id_image_insert").click(function(e) {
+    e.preventDefault();
+
+    let image_id_element = document.getElementById("img_id"),
+        align_element = document.getElementById("img_align"),
+        size_element = document.getElementById("img_size"),
+        caption_element = document.getElementById("img_caption"),
+
+        editor = window.editors["id_content"];
+
+    editor.insert_image_wiki(
+        image_id_element.value, align_element.value,
+        size_element.value, caption_element.value
+    );
+
+    $("#imgModal").removeClass("is-active");  // Close modal
+
+    // Reset form
+    image_id_element.value = 0;
+    align_element.selectedIndex = 0;
+    size_element.selectedIndex = 0;
+    caption_element.value = "";
+  });
+
+  function insert_image(image_id) {
+    document.getElementById("img_id").value = image_id;
+    open_modal("imgModal");
+  }
+
+  function add_image(form) {
+      $(form).submit();
+  }
+</script>
-- 
cgit v1.2.3


From ca8dd3a4e1bfd05fe65db88a0c5fc153103eea7c Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 17 Apr 2019 15:13:46 +0100
Subject: Correct image rendering in wiki articles

---
 .../templates/wiki/plugins/images/render.html      | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pydis_site/templates/wiki/plugins/images/render.html b/pydis_site/templates/wiki/plugins/images/render.html
index d4470d98..ced3f917 100644
--- a/pydis_site/templates/wiki/plugins/images/render.html
+++ b/pydis_site/templates/wiki/plugins/images/render.html
@@ -3,20 +3,23 @@
 
   NB! Watch out for line breaks, markdown might add <br />s and <p>s.
 {% endcomment %}{% with image.current_revision.imagerevision as revision %}{% spaceless %}
-<figure class="thumbnail{% if align %} pull-{{ align }}{% endif %}" {% if width %} style="width: {{ width }}px;" {% endif %}>
+<figure
+    class="image{% if align %} is-pulled-{{ align }}{% endif %}" {% if width %}
+    style="width: {{ width }}px;" {% endif %}
+>
     <a href="{{ revision.image.url }}">
-{% if size %}
-  {% thumbnail revision.image size upscale=False as thumb %}
-      <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
-  {% empty %}
-      <div class="caption">
-        <em>{% trans "Image not found" %}</em>
-      </div>
-  {% endthumbnail %}
-{% else %}
-      <img src="{{ revision.image.url }}" alt="{{ revision.get_filename }}" />
-{% endif %}
+      {% if size %}
+        {% thumbnail revision.image size upscale=False as thumb %}
+          <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
+        {% empty %}
+          <figcaption>
+            <em>"Image not found"</em>
+          </figcaption>
+        {% endthumbnail %}
+      {% else %}
+        <img src="{{ revision.image.url }}" alt="{{ revision.get_filename }}" />
+      {% endif %}
     </a>
-  <figcaption class="caption">{{ caption|safe }}</figcaption>
+  <figcaption>{{ caption|safe }}</figcaption>
 </figure>
 {% endspaceless %}{% endwith %}
-- 
cgit v1.2.3


From 5ede44a5300beea1edce258e74d73eb4e4a22f1c Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 17 Apr 2019 15:22:21 +0100
Subject: Fix up image replacement page

---
 .../templates/wiki/plugins/images/render.html      | 26 +++++-----
 .../wiki/plugins/images/revision_add.html          | 57 ++++++++++++----------
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/pydis_site/templates/wiki/plugins/images/render.html b/pydis_site/templates/wiki/plugins/images/render.html
index ced3f917..df09f48f 100644
--- a/pydis_site/templates/wiki/plugins/images/render.html
+++ b/pydis_site/templates/wiki/plugins/images/render.html
@@ -7,19 +7,19 @@
     class="image{% if align %} is-pulled-{{ align }}{% endif %}" {% if width %}
     style="width: {{ width }}px;" {% endif %}
 >
-    <a href="{{ revision.image.url }}">
-      {% if size %}
-        {% thumbnail revision.image size upscale=False as thumb %}
-          <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
-        {% empty %}
-          <figcaption>
-            <em>"Image not found"</em>
-          </figcaption>
-        {% endthumbnail %}
-      {% else %}
-        <img src="{{ revision.image.url }}" alt="{{ revision.get_filename }}" />
-      {% endif %}
-    </a>
+  <a href="{{ revision.image.url }}">
+    {% if size %}
+      {% thumbnail revision.image size upscale=False as thumb %}
+        <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
+      {% empty %}
+        <figcaption>
+          <em>"Image not found"</em>
+        </figcaption>
+      {% endthumbnail %}
+    {% else %}
+      <img src="{{ revision.image.url }}" alt="{{ revision.get_filename }}" />
+    {% endif %}
+  </a>
   <figcaption>{{ caption|safe }}</figcaption>
 </figure>
 {% endspaceless %}{% endwith %}
diff --git a/pydis_site/templates/wiki/plugins/images/revision_add.html b/pydis_site/templates/wiki/plugins/images/revision_add.html
index 87ca7a08..60c91c6a 100644
--- a/pydis_site/templates/wiki/plugins/images/revision_add.html
+++ b/pydis_site/templates/wiki/plugins/images/revision_add.html
@@ -1,33 +1,40 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n humanize wiki_thumbnails %}
+{% load wiki_tags wiki_thumbnails %}
 
-
-{% block wiki_pagetitle %}{% trans "Replace image" %}: {{ image }}{% endblock %}
+{% block wiki_pagetitle %}Replace Image: {{ image }}{% endblock %}
 
 {% block wiki_contents_tab %}
-  {% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %}
-    <p class="thumbnail pull-right">
-      <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
-    </p>
-  {% endthumbnail %}
-  <p class="lead">
-    {% trans "Choose an image file to replace current image." %}
-  </p>
-  <form method="POST" class="form-horizontal" enctype="multipart/form-data">
-    {% wiki_form form %}
-    <div class="form-group form-actions">
-      <div class="col-lg-2"></div>
-      <div class="col-lg-10">
-        <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="btn btn-default">
-          <span class="fa fa-arrow-left"></span>
-          {% trans "Go back" %}
+  <div class="columns">
+    <div class="column is-two-thirds">
+      <p class="lead">
+        Upload an image to replace the current one.
+      </p>
+      <form method="POST" class="form-horizontal" enctype="multipart/form-data">
+        {% wiki_form form %}
+
+        <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="button is-light">
+          <span class="icon">
+            <i class="fas fa-arrow-left"></i>
+          </span>
+          <span>Go Back</span>
         </a>
-        <button class="btn btn-primary">
-          <span class="fa fa-upload"></span>
-          {% trans "Upload replacement" %}
+
+        <button class="button is-primary" type="submit">
+          <span class="icon">
+            <i class="fas fa-upload"></i>
+          </span>
+          <span>Upload</span>
         </button>
-      </div>
+      </form>
     </div>
-  </form>
-
+    <div class="column is-one-third">
+      {% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %}
+        <figure class="image">
+          <a href="{{ image.current_revision.imagerevision.image.url }}">
+            <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" title="{{ revision.get_filename }}" />
+          </a>
+        </figure>
+      {% endthumbnail %}
+    </div>
+  </div>
 {% endblock %}
-- 
cgit v1.2.3


From 02a10bfe32c20c837c03c900ccaec06b394ccce1 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 17 Apr 2019 15:59:25 +0100
Subject: Lots of work on the images management page

---
 pydis_site/settings.py                             |   2 +
 .../templates/wiki/plugins/images/index.html       | 221 ++++++++++++---------
 2 files changed, 134 insertions(+), 89 deletions(-)

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 40954566..15718485 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -278,6 +278,8 @@ BULMA_SETTINGS = {
         "link": "$primary",
 
         "green": "#21c65c",  # Better contrast with the light text
+
+        "dimensions": "16 24 32 48 64 96 128 256 512"  # Image dimensions
     }
 }
 
diff --git a/pydis_site/templates/wiki/plugins/images/index.html b/pydis_site/templates/wiki/plugins/images/index.html
index 191d5533..a3474273 100644
--- a/pydis_site/templates/wiki/plugins/images/index.html
+++ b/pydis_site/templates/wiki/plugins/images/index.html
@@ -12,97 +12,140 @@
       {% trans "Back to edit page" %}
     </a>
   </p>
-  <table class="table table-bordered table-striped" style="width: 100%;">
-  {% for image in images %}
-    {% with image.current_revision.imagerevision as revision %}
-    <tr>
-      <th>{{ revision.get_filename|default:_("No file") }}</th>
-      <th>{% trans "Markdown tag" %}</th>
-      <th>{% trans "Uploaded by" %}</th>
-      <th>{% trans "Size" %}</th>
-    </tr>
-    <tr>
-      <td rowspan="3">
-        <p class="thumbnail">
-        {% thumbnail revision.image "250x250" as thumb %}
-            <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
-        {% endthumbnail %}
-        </p>
-        {% if image|can_write:user %}
-        <p>
-          {% if revision.deleted %}
-            <a href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
-              <span class="fa fa-upload"></span>
-              {% trans "Upload and publish new image" %}
-            </a> <br />
-            <a href="{% url 'wiki:images_restore' path=urlpath.path article_id=article.id image_id=image.id %}">
-              <span class="fa fa-refresh"></span>
-              {% trans "Restore image" %}
-            </a>
-          {% else %}
-            <a href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
-              <span class="fa fa-upload"></span>
-              {% trans "Upload replacement" %}
-            </a> <br />
-            <a href="{% url 'wiki:images_delete' path=urlpath.path article_id=article.id image_id=image.id %}">
-              <span class="fa fa-remove"></span>
-              {% trans "Remove image" %}
-            </a>
-          {% endif %}
-          {% if article|can_moderate:user %}
-          <br />
-          <a href="{% url 'wiki:images_purge' path=urlpath.path article_id=article.id image_id=image.id %}">
-            <span class="fa fa-trash"></span>
-            {% trans "Completely delete" %}
-          </a>
-          {% endif %}
-        </p>
-        {% endif %}
-      </td>
-      <td><code>[image:{{ image.id }}]</code></td>
-      <td>
-        <p>{% include "wiki/includes/revision_info.html" %}</p>
-      </td>
-      <td>{{ revision.get_size|filesizeformat }}<br />{{ revision.width }}x{{ revision.height }} pixels
-      </td>
-    </tr>
-    <tr>
-      <th colspan="100">{% trans "History" %}</th>
-    </tr>
-    <tr>
-      <td colspan="100">
-        <table class="table">
-          {% for old_revision in image.revision_set.all %}
-            <tr>
-              <td>
-              {% thumbnail old_revision.imagerevision.image "50x50" crop="center" as thumb %}
-                <img src="{{ thumb.url }}" alt="{{ revision.imagerevision.get_filename }}" />
-              {% endthumbnail %}
-              </td>
-              <td>{% include "wiki/includes/revision_info.html" with current_revision=image.current_revision revision=old_revision %}</td>
-              <td>{{ old_revision.imagerevision.get_size|filesizeformat }}</td>
-              <td>{{ old_revision.imagerevision.width }}x{{ old_revision.imagerevision.height }}</td>
-              <td>
-                {% if image|can_write:user and old_revision != image.current_revision %}
-                  <a href="{% url 'wiki:images_set_revision' path=urlpath.path article_id=article.id image_id=image.id rev_id=old_revision.id %}">
-                    <span class="fa fa-refresh"></span>
-                    {% trans "Revert to this version" %}
+  <table class="table is-fullwidth">
+    {% for image in images %}
+      {% with image.current_revision.imagerevision as revision %}
+        <thead>
+          <tr>
+            <th>{{ revision.get_filename|default:_("No filename") }}</th>
+            <th>Tag</th>
+            <th colspan="3">Updated</th>
+            <th>Size</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td rowspan="3">
+              <figure class="image is-128x128">
+                {% thumbnail revision.image "128x128" as thumb %}
+                  <a href="{{ revision.image.url }}">
+                    <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" title="{{ revision.get_filename }}" />
                   </a>
-                {% endif %}
-              </td>
-            </tr>
-          {% endfor %}
-        </table>
-      </td>
-    </tr>
-    {% endwith %}
-  {% empty %}
-    <tr>
-    <td colspan="100">
-      <p style="margin-bottom: 20px;"><em>{% trans "There are no images for this article." %}</em></p>
-    </td>
-  {% endfor %}
+                {% endthumbnail %}
+              </figure>
 
+              {% if image|can_write:user %}
+                {% if revision.deleted %}
+                  <a class="button is-success" title="Upload and publish new image" href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
+                    <span class="icon">
+                      <i class="fas fa-upload"></i>
+                    </span>
+                    <span>Upload</span>
+                  </a>
+                  <a class="button is-primary" title="Restore deleted image" href="{% url 'wiki:images_restore' path=urlpath.path article_id=article.id image_id=image.id %}">
+                    <span class="icon">
+                      <i class="fas fa-sync"></i>
+                    </span>
+                    <span>Restore</span>
+                  </a>
+                {% else %}
+                  <a class="button is-success" title="Upload replacement image" href="{% url 'wiki:images_add_revision' path=urlpath.path article_id=article.id image_id=image.id %}">
+                    <span class="icon">
+                      <i class="fas fa-upload"></i>
+                    </span>
+                    <span>Upload</span>
+                  </a>
+                  <a class="button is-warning" title="Remove image" href="{% url 'wiki:images_delete' path=urlpath.path article_id=article.id image_id=image.id %}">
+                    <span class="icon">
+                      <i class="fas fa-times"></i>
+                    </span>
+                    <span>Remove</span>
+                  </a>
+                {% endif %}
+                {% if article|can_moderate:user %}
+                  <a class="button is-danger tooltip" href="{% url 'wiki:images_purge' path=urlpath.path article_id=article.id image_id=image.id %}">
+                    <span class="icon">
+                      <i class="fas fa-trash"></i>
+                    </span>
+                    <span>Delete</span>
+                  </a>
+                {% endif %}
+              {% endif %}
+            </td>
+            <td>
+              <code>[image:{{ image.id }}]</code>
+            </td>
+            <td colspan="3">
+              {% include "wiki/includes/revision_info.html" %}
+            </td>
+            <td>
+              {{ revision.get_size|filesizeformat }}<br />{{ revision.width }}x{{ revision.height }} pixels
+            </td>
+          </tr>
+          <tr>
+            <th colspan="5">
+              History
+            </th>
+          </tr>
+          <tr>
+            <td class="is-paddingless" colspan="5">
+              <table class="table is-striped">
+                <thead>
+                  <tr>
+                    <th></th>
+                    <th>Updated</th>
+                    <th>Size</th>
+                    <th>Dimensions</th>
+                    <th></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {% for old_revision in image.revision_set.all %}
+                    <tr {% if forloop.first %}class="is-selected"{% endif %}>
+                      <td>
+                        <figure class="image">
+                          {% thumbnail old_revision.imagerevision.image "50x50" crop="center" as thumb %}
+                            <a href="{{ old_revision.imagerevision.image.url }}">
+                              <img src="{{ thumb.url }}" alt="{{ revision.imagerevision.get_filename }}" />
+                            </a>
+                          {% endthumbnail %}
+                        </figure>
+                      </td>
+                      <td>
+                        {% include "wiki/includes/revision_info.html" with current_revision=image.current_revision revision=old_revision %}
+                      </td>
+                      <td>
+                        {{ old_revision.imagerevision.get_size|filesizeformat }}
+                      </td>
+                      <td>
+                        {{ old_revision.imagerevision.width }}x{{ old_revision.imagerevision.height }} pixels
+                      </td>
+                      <td>
+                        {% if image|can_write:user and old_revision != image.current_revision %}
+                          <a class="button is-primary" href="{% url 'wiki:images_set_revision' path=urlpath.path article_id=article.id image_id=image.id rev_id=old_revision.id %}">
+                            <span class="icon">
+                              <i class="fas fa-sync"></i>
+                            </span>
+                            <span>Restore</span>
+                          </a>
+                        {% else %}
+                          <a class="button is-static has-text-black">
+                            <span class="icon">
+                              <i class="fas fa-times"></i>
+                            </span>
+                            <span>Current</span>
+                          </a>
+                        {% endif %}
+                      </td>
+                    </tr>
+                  {% endfor %}
+                </tbody>
+              </table>
+            </td>
+          </tr>
+        </tbody>
+      {% endwith %}
+    {% endfor %}
   </table>
 
   {% include "wiki/includes/pagination.html" %}
-- 
cgit v1.2.3


From b91562c38b88b794bf3fc4b6b6433a0daef2c758 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 18 Apr 2019 10:54:59 +0100
Subject: Settings fixes/reversions

---
 pydis_site/settings.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 15718485..8aaee2fd 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -40,7 +40,6 @@ if DEBUG:
         'api.pythondiscord.local',
         'staff.pythondiscord.local',
         'wiki.pythondiscord.local',
-        '*',  # PLEASE yell at me if I commit this
     ]
     SECRET_KEY = "+_x00w3e94##2-qm-v(5&-x_@*l3t9zlir1etu+7$@4%!it2##"
 
@@ -202,7 +201,7 @@ ROOT_HOSTCONF = 'pydis_site.hosts'
 DEFAULT_HOST = 'home'
 
 if DEBUG:
-    PARENT_HOST = 'trixie.gserv.me:8000'
+    PARENT_HOST = 'pythondiscord.local:8000'
 else:
     PARENT_HOST = env('PARENT_HOST', default='pythondiscord.com')
 
@@ -303,7 +302,6 @@ WIKI_MARKDOWN_KWARGS = {
         "markdown.extensions.abbr",
         "markdown.extensions.attr_list",
         "markdown.extensions.extra",
-        "markdown.extensions.fenced_code",
         "markdown.extensions.footnotes",
         "markdown.extensions.nl2br",
         "markdown.extensions.sane_lists",
-- 
cgit v1.2.3


From c5cd73ec7598564b5c52c4c7dea91ba7cb9a8c96 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 18 Apr 2019 10:56:03 +0100
Subject: All config of PARENT_HOST with env var

---
 pydis_site/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 8aaee2fd..b938b36d 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -201,7 +201,7 @@ ROOT_HOSTCONF = 'pydis_site.hosts'
 DEFAULT_HOST = 'home'
 
 if DEBUG:
-    PARENT_HOST = 'pythondiscord.local:8000'
+    PARENT_HOST = env('PARENT_HOST', default='pythondiscord.local:8000')
 else:
     PARENT_HOST = env('PARENT_HOST', default='pythondiscord.com')
 
-- 
cgit v1.2.3


From aac6c77323bdfecf71d48ba336c4488760e88c59 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 18 Apr 2019 11:02:50 +0100
Subject: Images plugin is complete.

---
 .../templates/wiki/plugins/images/index.html       |  5 ++-
 .../templates/wiki/plugins/images/purge.html       | 51 +++++++++++++---------
 .../templates/wiki/plugins/images/render.html      |  6 +--
 .../wiki/plugins/images/revision_add.html          |  4 +-
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/pydis_site/templates/wiki/plugins/images/index.html b/pydis_site/templates/wiki/plugins/images/index.html
index a3474273..4973ea6f 100644
--- a/pydis_site/templates/wiki/plugins/images/index.html
+++ b/pydis_site/templates/wiki/plugins/images/index.html
@@ -1,6 +1,7 @@
 {% extends "wiki/article.html" %}
 {% load wiki_tags i18n humanize wiki_thumbnails %}
 
+{# TODO: This page needs re-styling, but it's functional for now so we're not touching it until after wiki completion #}
 
 {% block wiki_pagetitle %}{% trans "Images" %}: {{ article.current_revision.title }}{% endblock %}
 
@@ -63,7 +64,7 @@
                   </a>
                 {% endif %}
                 {% if article|can_moderate:user %}
-                  <a class="button is-danger tooltip" href="{% url 'wiki:images_purge' path=urlpath.path article_id=article.id image_id=image.id %}">
+                  <a class="button is-danger" href="{% url 'wiki:images_purge' path=urlpath.path article_id=article.id image_id=image.id %}">
                     <span class="icon">
                       <i class="fas fa-trash"></i>
                     </span>
@@ -129,7 +130,7 @@
                             <span>Restore</span>
                           </a>
                         {% else %}
-                          <a class="button is-static has-text-black">
+                          <a class="button is-static has-text-grey">
                             <span class="icon">
                               <i class="fas fa-times"></i>
                             </span>
diff --git a/pydis_site/templates/wiki/plugins/images/purge.html b/pydis_site/templates/wiki/plugins/images/purge.html
index 28b8b476..2789f536 100644
--- a/pydis_site/templates/wiki/plugins/images/purge.html
+++ b/pydis_site/templates/wiki/plugins/images/purge.html
@@ -5,29 +5,38 @@
 {% block wiki_pagetitle %}{% trans "Purge deletion" %}: {{ image }}{% endblock %}
 
 {% block wiki_contents_tab %}
-  {% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %}
-    <p class="thumbnail pull-right">
-      <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
-    </p>
-  {% endthumbnail %}
-  <p class="lead">
-    {% trans "Purge image: Completely remove image file and all revisions." %}
-  </p>
-  <form method="POST" class="form-horizontal" enctype="multipart/form-data">
-    {% wiki_form form %}
-    <div class="form-group form-actions">
-      <div class="col-lg-2"></div>
-      <div class="col-lg-10">
-        <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="btn btn-default">
-          <span class="fa fa-arrow-left"></span>
-          {% trans "Go back" %}
+  <div class="columns">
+    <div class="column is-two-thirds">
+      <p>
+        Purge image: Completely remove image file and all revisions
+      </p>
+      <form method="POST" class="form-horizontal" enctype="multipart/form-data">
+        {% wiki_form form %}
+
+        <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="button is-white">
+          <span class="icon">
+            <i class="fas fa-arrow-left"></i>
+          </span>
+          <span>Go Back</span>
         </a>
-        <button class="btn btn-primary">
-          <span class="fa fa-trash"></span>
-          {% trans "Remove it completely!" %}
+
+        <button class="button is-danger" type="submit">
+          <span class="icon">
+            <i class="fas fa-trash"></i>
+          </span>
+          <span>Permanently remove</span>
         </button>
-      </div>
+      </form>
     </div>
-  </form>
 
+    <div class="column is-one-third">
+      {% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %}
+        <figure class="image">
+          <a href="{{ image.current_revision.imagerevision.image.url }}">
+            <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" title="{{ revision.get_filename }}" />
+          </a>
+        </figure>
+      {% endthumbnail %}
+    </div>
+  </div>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/plugins/images/render.html b/pydis_site/templates/wiki/plugins/images/render.html
index df09f48f..c34616cb 100644
--- a/pydis_site/templates/wiki/plugins/images/render.html
+++ b/pydis_site/templates/wiki/plugins/images/render.html
@@ -4,8 +4,8 @@
   NB! Watch out for line breaks, markdown might add <br />s and <p>s.
 {% endcomment %}{% with image.current_revision.imagerevision as revision %}{% spaceless %}
 <figure
-    class="image{% if align %} is-pulled-{{ align }}{% endif %}" {% if width %}
-    style="width: {{ width }}px;" {% endif %}
+    class="image{% if align %} is-pulled-{{ align }}{% endif %}"
+    {% if width %}style="width: {{ width }}px;" {% endif %}
 >
   <a href="{{ revision.image.url }}">
     {% if size %}
@@ -13,7 +13,7 @@
         <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
       {% empty %}
         <figcaption>
-          <em>"Image not found"</em>
+          <em>Image not found</em>
         </figcaption>
       {% endthumbnail %}
     {% else %}
diff --git a/pydis_site/templates/wiki/plugins/images/revision_add.html b/pydis_site/templates/wiki/plugins/images/revision_add.html
index 60c91c6a..6b17587a 100644
--- a/pydis_site/templates/wiki/plugins/images/revision_add.html
+++ b/pydis_site/templates/wiki/plugins/images/revision_add.html
@@ -6,13 +6,13 @@
 {% block wiki_contents_tab %}
   <div class="columns">
     <div class="column is-two-thirds">
-      <p class="lead">
+      <p>
         Upload an image to replace the current one.
       </p>
       <form method="POST" class="form-horizontal" enctype="multipart/form-data">
         {% wiki_form form %}
 
-        <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="button is-light">
+        <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="button is-white">
           <span class="icon">
             <i class="fas fa-arrow-left"></i>
           </span>
-- 
cgit v1.2.3


From 4167374b71ef00da4203151f380eb561ac340d59 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 18 Apr 2019 16:24:15 +0100
Subject: Links plugin is.. functional..

---
 pydis_site/static/js/wiki/load_editor.js           | 11 ++++
 .../templates/wiki/plugins/links/sidebar.html      | 74 ++++++++++++++--------
 2 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/pydis_site/static/js/wiki/load_editor.js b/pydis_site/static/js/wiki/load_editor.js
index 0671daed..589d8a75 100644
--- a/pydis_site/static/js/wiki/load_editor.js
+++ b/pydis_site/static/js/wiki/load_editor.js
@@ -43,6 +43,15 @@
         }
     }
 
+    function add_insert_text(editor) {
+        editor.insert_text = function(text) {
+            let doc = editor.codemirror.getDoc(),
+                cursor = doc.getCursor();
+
+            doc.replaceRange(text, cursor);
+        }
+    }
+
     for (let element of elements) {
         let editor = new SimpleMDE({
             "element": element,
@@ -80,6 +89,8 @@
         });
 
         add_insert_image_wiki(editor);
+        add_insert_text(editor);
+
         window.editors[element.id] = editor;
     }
 })();
diff --git a/pydis_site/templates/wiki/plugins/links/sidebar.html b/pydis_site/templates/wiki/plugins/links/sidebar.html
index 45096edd..80c390dc 100644
--- a/pydis_site/templates/wiki/plugins/links/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/links/sidebar.html
@@ -1,44 +1,68 @@
-{% load i18n sekizai_tags static %}
+{% load sekizai_tags static %}
 
-<h4>{% trans "Link to another wiki page" %}</h4>
+<h4 class="title is-4">Link to another wiki page</h4>
 
 <p>
-  {% trans "Type in something from another wiki page's title and auto-complete will help you create a tag for your wiki link. Tags for links look like this:" %}<br />
+  Type in something from another wiki page's title and auto-complete will help you create a tag for your wiki link. Tags for links look like this:<br />
 </p>
 
 <pre>[Title of link](wiki:ArticleSlug)</pre>
 
-<div class="input-group">
-  <input type="text" class="page_title_query form-control" id="links_page_title_query" value="" placeholder="Type to search..." />
-  <span class="input-group-btn">
-    <button type="button" class="btn btn-default" onclick="wikiInsertLink()">
-      {% trans "Insert" %}
-    </button>
-  </span>
+<div class="field">
+  <div class="control has-icons-left">
+    <div class="dropdown">
+      <div class="dropdown-trigger">
+        <input class="input" type="text" id="page_title_input" value="" placeholder="Search: 3+ chars" aria-haspopup="true" aria-controls="page_title_menu">
+      </div>
+      <div class="dropdown-menu" id="page_title_menu" role="menu"></div>
+    </div>
+
+    <span class="icon is-small is-left">
+      <i class="fas fa-search"></i>
+    </span>
+  </div>
 </div>
 
-<hr />
+<div class="is-divider"></div>
 
-<h4>{% trans "An external link" %}</h4>
+<h4 class="title is-4">An external link</h4>
 
 <p>
-  {% trans "You can link to another website simply by inserting an address example.com or http://example.com or by using the markdown syntax:" %}<br />
+  You can link to another website simply by inserting an address example.com or http://example.com or by using the markdown syntax:<br />
 </p>
+
 <pre>[Clickable text](http://example.com)</pre>
 
-{% addtoblock "js" %}<script type="text/javascript" src="{% static "wiki/js/typeahead.min.js" %}"></script>{% endaddtoblock %}
 {% addtoblock "js" %}
-<script type="text/javascript">
-  $(document).ready(function() {
-      $('.page_title_query').typeahead({
-        remote: "{% url 'wiki:links_query_urlpath' path=urlpath.path article_id=article.id %}?query=%QUERY",
-        dataType: String
-      });
-  });
-
-function wikiInsertLink() {
-  $('#id_content').insertAtCaret($('#links_page_title_query').val());
-}
+  <script src="https://cdn.rawgit.com/mattmezza/bulmahead/master/dist/bulmahead.bundle.js"></script>
+
+  <script type="text/javascript">
+    $(document).ready(function() {
+      function search(query) {
+        query = encodeURIComponent(query);
+        return fetch(`{% url 'wiki:links_query_urlpath' path=urlpath.path article_id=article.id %}?query=${query}`).then(function(response) {
+          return response.json();
+        }).then(function(data){
+          return data.map(function(element) {
+            return {label: element, value: element};
+          })
+        });
+      }
+
+      function selected(state) {
+        let value = state.value;
+        wikiInsertLink(value);
+        document.getElementById("page_title_input").value = "";
+      }
+
+      bulmahead("page_title_input", "page_title_menu", search, selected, 10);
+    });
+
+    function wikiInsertLink(value) {
+      let editor = window.editors["id_content"];
+
+      editor.insert_text(value);
+    }
 
 </script>
 {% endaddtoblock %}
-- 
cgit v1.2.3


From 487866ea0388e743e75dff4fb16a477f01955c91 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 18 Apr 2019 17:01:36 +0100
Subject: Prevent accidental submission of link plugin form

---
 pydis_site/templates/wiki/plugins/links/sidebar.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pydis_site/templates/wiki/plugins/links/sidebar.html b/pydis_site/templates/wiki/plugins/links/sidebar.html
index 80c390dc..fd948af1 100644
--- a/pydis_site/templates/wiki/plugins/links/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/links/sidebar.html
@@ -8,6 +8,9 @@
 
 <pre>[Title of link](wiki:ArticleSlug)</pre>
 
+{# We do this to prevent accidental form submission - this isn't _really_ a form #}
+<input type="submit" disabled style="display: none" aria-hidden="true" />
+
 <div class="field">
   <div class="control has-icons-left">
     <div class="dropdown">
-- 
cgit v1.2.3


From 9dd3a0b3d87a0fe3162a403b891aab1e26dfffe1 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 18 Apr 2019 17:35:58 +0100
Subject: Delete/Error/Move/Permission Denied pages

---
 pydis_site/apps/home/templatetags/wiki_extra.py  |   7 +-
 pydis_site/templates/wiki/delete.html            | 109 ++++++++++++++---------
 pydis_site/templates/wiki/error.html             |  71 ++++++++-------
 pydis_site/templates/wiki/move.html              |  82 +++++++++--------
 pydis_site/templates/wiki/permission_denied.html |  54 +++++------
 5 files changed, 190 insertions(+), 133 deletions(-)

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index e0a27973..63d9bade 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -1,3 +1,5 @@
+from typing import Union
+
 from django import template
 from django.forms import (
     BooleanField, BoundField, CharField, ChoiceField, ComboField, DateField, DateTimeField, DecimalField, DurationField,
@@ -97,5 +99,8 @@ def get_field_options(context, field: BoundField):
 
 
 @register.filter
-def render_urlpath(value: URLPath):
+def render_urlpath(value: Union[URLPath, str]):
+    if isinstance(value, str):
+        return value or "/"
+
     return value.path or "/"
diff --git a/pydis_site/templates/wiki/delete.html b/pydis_site/templates/wiki/delete.html
index afb4140d..1be82fa9 100644
--- a/pydis_site/templates/wiki/delete.html
+++ b/pydis_site/templates/wiki/delete.html
@@ -1,67 +1,96 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n sekizai_tags %}
+{% load wiki_tags sekizai_tags %}
 
 
-{% block wiki_pagetitle %}{% trans "Delete article" %}{% endblock %}
+{% block wiki_pagetitle %}Delete Article{% endblock %}
 
 {% block wiki_contents %}
-  <h1 class="page-header">{% trans "Delete" %} "{{ article.current_revision.title }}"</h1>
+  <h1 class="title is-1">Delete "{{ article.current_revision.title }}"</h1>
 
   {% if cannot_delete_root %}
-    <p class="lead">{% trans "You cannot delete a root article." %}</p>
-    <p><a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}">{% trans "Go back" %}</a></p>
+    <div class="message is-warning">
+      <div class="message-body">
+        <p>
+          You cannot delete the root article.
+        </p>
+
+        <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="button is-primary">
+          <span class="icon">
+            <i class="fas fa-arrow-left"></i>
+          </span>
+          <span>Go back</span>
+        </a>
+      </div>
+    </div>
   {% else %}
-
     {% if cannot_delete_children %}
-
-      <p class="alert alert-danger"><strong>{% trans "You cannot delete this article because you do not have permission to delete articles with children. Try to remove the children manually one-by-one." %}</strong></p>
-
+      <div class="message is-warning">
+        <div class="message-body">
+          <p>
+            You do not have permission to delete articles that have children.
+          </p>
+
+          <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="button is-primary">
+            <span class="icon">
+              <i class="fas fa-arrow-left"></i>
+            </span>
+            <span>Go back</span>
+          </a>
+        </div>
+      </div>
     {% endif %}
 
     {% if delete_children %}
+      <div class="message">
+        <div class="message-body">
+          <p>
+            You are deleting an article with children. If you delete this article, then its children will also be deleted.
+          </p>
+          <p>
+            If you choose to purge this article, note that its children will also be purged.
+          </p>
+        </div>
+      </div>
 
-      <p class="lead">{% trans "You are deleting an article. This means that its children will be deleted as well. If you choose to purge, children will also be purged!" %}</p>
-
-      <h2>{% trans "Articles that will be deleted" %}</h2>
+      <h2 class="title is-2">Child articles</h2>
 
       <ul>
         {% for child in delete_children %}
-        <li><a href="{% url 'wiki:get' article_id=child.article.id %}" target="_blank">{{ child.article }}</a></li>
+          <li><a href="{% url 'wiki:get' article_id=child.article.id %}" target="_blank">{{ child.article }}</a></li>
+        {% endfor %}
+
         {% if delete_children_more %}
-        <li><em>{% trans "...and more!" %}</em></li>
+          <li><em>"...and more!"</em></li>
         {% endif %}
-        {% endfor %}
       </ul>
 
     {% endif %}
 
     {% if not cannot_delete_children %}
-    <p class="lead">{% trans "You are deleting an article. Please confirm." %}</p>
-
-    <form method="POST" class="form-horizontal">
-      {% wiki_form delete_form %}
-      <div class="form-group form-actions">
-        <div class="col-lg-2"></div>
-        <div class="col-lg-10">
-          <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-default">
-            <span class="fa fa-arrow-left"></span>
-            {% trans "Go back" %}
-          </a>
-          <button type="submit" name="save_changes" class="btn btn-danger">
-            <span class="fa fa-trash-o"></span>
-            {% trans "Delete article" %}
-          </button>
-        </div>
-      </div>
-    </form>
+      <p>Please confirm that you would like to delete this article.</p>
+
+      <form method="POST">
+        {% wiki_form delete_form %}
+
+      <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="button is-white">
+        <span class="icon">
+          <i class="fas fa-arrow-left"></i>
+        </span>
+        <span>Go back</span>
+      </a>
+      <button type="submit" name="save_changes" class="button is-danger">
+        <span class="icon">
+          <i class="fas fa-trash"></i>
+        </span>
+        <span>Delete Article</span>
+      </button>
+      </form>
     {% endif %}
-
   {% endif %}
 
-{% addtoblock "js" %}
-<script type="text/javascript">
-  $('#id_revision').val('{{ article.current_revision.id }}');
-</script>
-{% endaddtoblock %}
-
+  {% addtoblock "js" %}
+  <script type="text/javascript">
+    $('#id_revision').val('{{ article.current_revision.id }}');
+  </script>
+  {% endaddtoblock %}
 {% endblock %}
diff --git a/pydis_site/templates/wiki/error.html b/pydis_site/templates/wiki/error.html
index b54c8cff..04e6948a 100644
--- a/pydis_site/templates/wiki/error.html
+++ b/pydis_site/templates/wiki/error.html
@@ -9,37 +9,44 @@
 {% endblock %}
 
 {% block wiki_contents %}
-
-{% if error_type == "ancestors_missing" %}
-
-  <h1 class="page-header">{% trans "Not found" %}</h1>
-
-  <div class="missing">
-    <p>{% trans "This article was not found, and neither was its parent article." %}</p>
-    <p>
-      <a href="{% url 'wiki:get' path='' %}" class="btn btn-default"><i class="fa fa-arrow-left"></i> {% trans "Start page" %}</a>
-    </p>
-  </div>
-
-{% else %}
-
-  <h1 class="page-header">{% trans "Error" %}</h1>
-
-  <div class="error">
-    {% if not error_msg %}
-    <p>{% trans "There was some sort of error accessing this page. Sorry!" %}</p>
-    {% else %}
-    <p>{{ error_msg }}</p>
-    {% endif %}
-  </div>
-
-  {% if article %}
-  <p>
-    <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-default"><i class="fa fa-arrow-left"></i> {% trans "Back to" %} {{ article.current_revision.title }}</a>
-  </p>
+  {% if error_type == "ancestors_missing" %}
+    <h1 class="title">Not Found</h1>
+
+    <div 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!
+        </p>
+        <a href="{% url 'wiki:get' path='' %}" class="button is-primary">
+          <span class="icon">
+            <i class="fas fa-arrow-left"></i>
+          </span>
+          <span>Back to homepage</span>
+        </a>
+      </div>
+    </div>
+  {% else %}
+    <h1 class="title">Error</h1>
+
+    <div class="message is-danger">
+      <div class="message-body">
+        <p>
+          {% if not error_msg %}
+            Unfortunately, an error occurred while retrieving that page. Please let us know!
+          {% else %}
+            {{ error_msg }}
+          {% endif %}
+        </p>
+
+        {% if article %}
+          <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="button is-primary">
+            <span class="icon">
+              <i class="fas fa-arrow-left"></i>
+            </span>
+            <span>Back to {{ article.current_revision.title }}</span>
+          </a>
+        {% endif %}
+      </div>
+    </div>
   {% endif %}
-
-
-{% endif %}
-
 {% endblock %}
diff --git a/pydis_site/templates/wiki/move.html b/pydis_site/templates/wiki/move.html
index d93a3675..f2c83485 100644
--- a/pydis_site/templates/wiki/move.html
+++ b/pydis_site/templates/wiki/move.html
@@ -5,46 +5,58 @@
 
 {% block wiki_contents_tab %}
 
-<div class="row">
-  <div class="col-lg-10">
-    <form method="POST" class="form-horizontal" id="article_move_form">
-      {% wiki_form form %}
-
-      <div class="btn-group" id="dest_selector">
-        <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
-          <span class="dest_selector_title"></span>
-          <span class="caret"></span>
-        </a>
-        <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-            {% with current_path=root_path %}{% include "wiki/includes/move_tree.html" %}{% endwith %}
-        </ul>
-      </div>
-      <p class="col-lg-offset-2">
+  <div class="message is-warning">
+    <div class="message-body">
+      {% if urlpath.get_descendants %}
         {% blocktrans count cnt=urlpath.get_descendants.count trimmed %}
-          {{ cnt }} nested article will also be moved.<br>
-          Be careful, links to this article and {{ cnt }} article nested
-          in this hierarchy will not be updated.
+          <p>
+            Please note that this article has {{ cnt }} child article. If you
+            decide to move this article, then links to any child articles will
+            not be updated.
+          </p>
           {% plural %}
-          {{ cnt }} nested articles will also be moved.<br>
-          Be careful, links to this article and {{ cnt }} articles nested
-          in this hierarchy will not be updated.
+          <p>
+            Please note that this article has {{ cnt }} child articles. If you
+            decide to move this article, then links to any child articles will
+            not be updated.
+          </p>
         {% endblocktrans %}
+      {% endif %}
+      <p>
+        Remember: Any links to this article will not be automatically updated. You
+        may leave behind a redirect page by specifying that option below, but these
+        are temporary - so it's better to update the links directly.
       </p>
-      <div class="form-group form-actions">
-        <div class="col-lg-12 col-lg-offset-2">
-          <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-default">
-            <span class="fa fa-arrow-left"></span>
-            {% trans "Go back" %}
-          </a>
-          <button class="btn btn-large btn-primary" type="submit" name="move" id="id_move">
-            <span class="fa fa-random"></span>
-            {% trans "Move article" %}
-          </button>
-        </div>
-      </div>
-    </form>
+    </div>
   </div>
-</div>
+
+<form method="POST" class="form-horizontal" id="article_move_form">
+  {% wiki_form form %}
+
+  {# Not gonna lie, I have no idea what this is or what it's for #}
+  <div class="btn-group" id="dest_selector">
+    <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
+      <span class="dest_selector_title"></span>
+      <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+        {% with current_path=root_path %}{% include "wiki/includes/move_tree.html" %}{% endwith %}
+    </ul>
+  </div>
+
+  <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="button is-white">
+    <span class="icon">
+      <i class="fas fa-arrow-left"></i>
+    </span>
+    <span>Go back</span>
+  </a>
+  <button class="button is-warning" type="submit" name="move" id="id_move">
+    <span class="icon">
+      <i class="fas fa-random"></i>
+    </span>
+    <span>Move article</span>
+  </button>
+</form>
 
 {% addtoblock "js" %}
 
diff --git a/pydis_site/templates/wiki/permission_denied.html b/pydis_site/templates/wiki/permission_denied.html
index 06afbbda..3314a79d 100644
--- a/pydis_site/templates/wiki/permission_denied.html
+++ b/pydis_site/templates/wiki/permission_denied.html
@@ -1,32 +1,36 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n %}
-
+{% load wiki_tags %}
 
 {% block wiki_pagetitle %}Permission Denied{% endblock %}
 
 {% block wiki_contents %}
-  <h1 class="page-header">{% trans "Permission Denied" %}</h1>
-  <p class="alert denied alert-danger">
-    <i class="fa fa-minus-circle"></i>
-    {% trans "Sorry, you don't have permission to access this page." %}
-  </p>
-  {% if article.current_revision.locked %}
-  <p class="alert alert-warning">
-    <i class="fa fa-lock"></i>
-    {% trans "This article is locked for editing." %}
-  </p>
-  {% endif %}
-
-  <p>
-  {% if not read_denied %}
-    <a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}" class="btn btn-default">
-      {% trans "Back to article" %}
-    </a>
-  {% elif urlpath.parent %}
-    <a href="{% url 'wiki:get' path=urlpath.parent.path %}" class="btn btn-default">
-      {% trans "Back to article" %}
-    </a>
-  {% endif %}
-  </p>
+  <div class="message is-danger">
+    <div class="message-header">
+      <p>Permission Denied</p>
+    </div>
 
+    <div class="message-body">
+      <p>
+        Sorry, you don't have permission to access this page.
+      </p>
+      {% if article.current_revision.locked %}
+        <p>This article is locked for editing.</p>
+      {% endif %}
+      {% if not read_denied %}
+        <a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}" class="button is-primary">
+          <span class="icon">
+            <i class="fas fa-arrow-left"></i>
+          </span>
+          <span>Back to article</span>
+        </a>
+      {% elif urlpath.parent %}
+        <a href="{% url 'wiki:get' path=urlpath.parent.path %}" class="button is-primary">
+          <span class="icon">
+            <i class="fas fa-arrow-left"></i>
+          </span>
+          <span>Back to article</span>
+        </a>
+      {% endif %}
+    </div>
+  </div>
 {% endblock %}
-- 
cgit v1.2.3


From 33c166a3796ebcf3ce7af4e0404599a086b7716e Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 18 Apr 2019 17:52:37 +0100
Subject: Article deleted/Deleted list pages

---
 pydis_site/templates/wiki/deleted.html      | 90 ++++++++++++++++-------------
 pydis_site/templates/wiki/deleted_list.html | 65 ++++++++++++---------
 2 files changed, 87 insertions(+), 68 deletions(-)

diff --git a/pydis_site/templates/wiki/deleted.html b/pydis_site/templates/wiki/deleted.html
index 55ce2b46..a767ddbf 100644
--- a/pydis_site/templates/wiki/deleted.html
+++ b/pydis_site/templates/wiki/deleted.html
@@ -2,55 +2,63 @@
 {% load wiki_tags i18n sekizai_tags %}
 
 
-{% block wiki_pagetitle %}{% trans "Article deleted" %}{% endblock %}
+{% block wiki_pagetitle %}Article deleted{% endblock %}
 
 {% block wiki_contents %}
-  <style type="text/css">
-    label[for=id_confirm] {
-      float: left;
-      margin-right: 10px;
-    }
-  </style>
-  <h1 class="page-header">{% trans "Article deleted" %}</h1>
+  <div class="message is-warning">
+    <div class="message-header">
+      <p>Article deleted</p>
+    </div>
+    <div class="message-body">
+      <p>
+        The article you were looking for has been deleted.
+      </p>
+    </div>
+  </div>
 
-  <p class="lead">
-  {% trans "The article you were looking for has been deleted." %}
-  </p>
+  {% if not article.current_revision.locked or article|can_delete:user %}
 
-  <div class="row">
+    <h2 class="title is-2">
+      Restore Article
+    </h2>
 
-  {% if not article.current_revision.locked or article|can_delete:user %}
-    <div class="col-lg-6">
-      <div class="well">
-        <h2>{% trans "Restore" %}</h2>
-        <p>{% trans "You may restore this article and its children by clicking restore." %}</p>
-        <p>
-          <a href="?restore=1" class="btn btn-default">
-            <span class="fa fa-repeat"></span>
-            {% trans "Restore" %}
-          </a>
-        </p>
-      </div>
-    </div>
+    <p>
+      To restore this article and any child articles, click the restore button below.
+    </p>
+    <a href="?restore=1" class="button is-primary">
+      <span class="icon">
+        <i class="fa fa-sync"></i>
+      </span>
+      <span>Restore</span>
+    </a>
   {% endif %}
 
   {% if article|can_moderate:user %}
-    <div class="col-lg-6">
-      <div class="well">
-        <h2>{% trans "Purge deletion" %}</h2>
-        <p>{% trans "You may remove this article and any children permanently and free their slugs by clicking the below button. This action cannot be undone." %}</p>
-        <form method="POST" class="form form-inline">
-          {% csrf_token %}
-          {% wiki_form purge_form %}
-            <button class="btn btn-default">
-              <span class="fa fa-remove"></span>
-              {% trans "Purge" %}
-            </button>
-        </form>
-      </div>
-    </div>
-  {% endif %}
+     <h2 class="title is-2">
+      Purge Article
+    </h2>
 
-  </div>
+    <p>
+      To permanently remove this article and any child articles, click the purge button below. This will
+      allow you to free up the slugs assigned to these articles, so that they may be used for other
+      articles.
+    </p>
+    <p>
+      Please note: <span class="has-text-danger">This action cannot be undone</span>.
+    </p>
+
+    <form method="POST" class="form form-inline">
+      {% csrf_token %}
+      {% wiki_form purge_form %}
+      <button class="button is-danger" type="submit">
+        <span class="icon">
+          <i class="fas fa-trash"></i>
+        </span>
+        <span>
+          Purge
+        </span>
+      </button>
+    </form>
+  {% endif %}
 
 {% endblock %}
diff --git a/pydis_site/templates/wiki/deleted_list.html b/pydis_site/templates/wiki/deleted_list.html
index d0d72824..6ec2a8df 100644
--- a/pydis_site/templates/wiki/deleted_list.html
+++ b/pydis_site/templates/wiki/deleted_list.html
@@ -1,33 +1,44 @@
 {% extends "wiki/base.html" %}
-{% load i18n wiki_tags sekizai_tags %}
+{% load wiki_tags sekizai_tags %}
 
-{% block wiki_pagetitle %}{% trans "Admin Panel" %}{% endblock %}
+{% block wiki_pagetitle %}Deleted Articles{% endblock %}
 
 {% block wiki_contents %}
+  <h1 class="title is-1">Deleted Articles</h1>
 
-<h1 class="page-header">{% trans "Deleted Articles" %}</h1>
-{% if deleted_articles %}
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th>{% trans "Page Title" %}</th>
-        <th>{% trans "Date Deleted" %}</th>
-        <th>{% trans "Restore Article" %}</th>
-      </tr>
-    </thead>
-    <tbody>
-    {% for article in deleted_articles %}
-      <tr>
-        <td><a href="{{article.get_absolute_url}}">{{ article }}</a></td>
-        <td> {{article.modified}} </td>
-        <td><a href="{% url 'wiki:deleted' article_id=article.id %}?restore=1" class="btn btn-default"><span class="fa fa-repeat"></span>
-            {% trans "Restore" %}</a></td>
-      </tr>
-    {% endfor %}
-    </tbody>
-  </table>
-{% else %}
-  <b> {% trans "No deleted articles to display" %} </b>
-{% endif %}
-
+  {% if deleted_articles %}
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>Page Title</th>
+          <th>Date Deleted</th>
+          <th>Restore Article</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for article in deleted_articles %}
+          <tr>
+            <td>
+              <a href="{{article.get_absolute_url}}">{{ article }}</a>
+            </td>
+            <td>
+              {{article.modified}}
+            </td>
+            <td>
+              <a href="{% url 'wiki:deleted' article_id=article.id %}?restore=1" class="button is-primary">
+                <span class="icon">
+                  <i class="fas fa-sync"></i>
+                </span>
+                <span>Restore</span>
+              </a>
+            </td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  {% else %}
+    <p>
+      No deleted articles to display.
+    </p>
+  {% endif %}
 {% endblock %}
-- 
cgit v1.2.3


From fab16f5da7bac8bf781e0d86076e9ef484e4047d Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 18 Apr 2019 17:55:21 +0100
Subject: Source page

---
 .../templates/wiki/includes/anonymous_blocked.html     | 13 -------------
 pydis_site/templates/wiki/source.html                  | 18 ++++++++----------
 2 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 pydis_site/templates/wiki/includes/anonymous_blocked.html

diff --git a/pydis_site/templates/wiki/includes/anonymous_blocked.html b/pydis_site/templates/wiki/includes/anonymous_blocked.html
deleted file mode 100644
index 5e1d3dac..00000000
--- a/pydis_site/templates/wiki/includes/anonymous_blocked.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% load i18n %}
-
-<em>
-{% url 'wiki:signup' as signup_url %}
-{% url 'wiki:login' as login_url %}
-{% if login_url and signup_url %}
-  {% blocktrans trimmed %}
-  You need to <a href="{{ login_url }}">log in</a> or <a href="{{ signup_url }}">sign up</a> to use this function.
-  {% endblocktrans %}
-{% else %}
-  {% trans "You need to log in or sign up to use this function." %}
-{% endif %}
-</em>
diff --git a/pydis_site/templates/wiki/source.html b/pydis_site/templates/wiki/source.html
index 0c610208..caae077e 100644
--- a/pydis_site/templates/wiki/source.html
+++ b/pydis_site/templates/wiki/source.html
@@ -1,17 +1,15 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n humanize %}
+{% load wiki_tags humanize %}
 
 
-{% block wiki_pagetitle %}{% trans "Source of" %} {{ article.current_revision.title }}{% endblock %}
+{% block wiki_pagetitle %}Source of "{{ article.current_revision.title }}"{% endblock %}
 
 {% block wiki_contents_tab %}
+  {% if article.current_revision.locked %}
+    <p>This article is currently locked for editing.</p>
+  {% endif %}
 
-{% if article.current_revision.locked %}
-<p class="lead">{% trans "This article is currently locked for editing." %}</p>
-{% endif %}
-
-<pre class="pre-scrollable">
-  {{ article.current_revision.content }}
-</pre>
-
+  <pre class="is-fullwidth">
+{{ article.current_revision.content }}
+  </pre>
 {% endblock %}
-- 
cgit v1.2.3


From 06fed91f6515e08a0e62cc48ade80d65257fcbd9 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 18 Apr 2019 18:12:04 +0100
Subject: Searching and pagination

---
 pydis_site/templates/base/paginator.html           | 64 ++++++++++++++++++++++
 pydis_site/templates/wiki/dir.html                 |  4 +-
 pydis_site/templates/wiki/history.html             |  4 +-
 pydis_site/templates/wiki/includes/pagination.html | 24 --------
 .../templates/wiki/includes/searchresult.html      |  7 ++-
 .../templates/wiki/plugins/images/index.html       |  4 +-
 pydis_site/templates/wiki/search.html              | 62 ++++++++++++---------
 7 files changed, 113 insertions(+), 56 deletions(-)
 create mode 100644 pydis_site/templates/base/paginator.html
 delete mode 100644 pydis_site/templates/wiki/includes/pagination.html

diff --git a/pydis_site/templates/base/paginator.html b/pydis_site/templates/base/paginator.html
new file mode 100644
index 00000000..8eaa37ee
--- /dev/null
+++ b/pydis_site/templates/base/paginator.html
@@ -0,0 +1,64 @@
+{% comment %}
+This template inserts a Bulma paginator wherever one is required. Simply include it as follows:
+
+{% include "base/paginator.html" with page=paginator_object %}
+{% endcomment %}
+
+<nav class="pagination" role="navigation" aria-label="pagination">
+    {% if page.has_previous %}
+        <a class="pagination-previous" href="{% url "blog.posts" page=page.previous_page_number %}">Newer</a>
+    {% else %}
+        <a class="pagination-previous" title="This is the first page" disabled>Newer</a>
+    {% endif %}
+
+    {% if page.has_next %}
+        <a class="pagination-next" href="{% url "" page=1 %}">Older</a>
+    {% else %}
+        <a class="pagination-next" title="This is the last page" disabled>Older</a>
+    {% endif %}
+
+    <ul class="pagination-list">
+        {% if page.has_previous %}
+            <li>
+                <a class="pagination-link" aria-label="Goto page 1"
+                   href="{% url "blog.posts" page=1 %}">
+                    1
+                </a>
+            </li>
+            <li>
+              <span class="pagination-ellipsis">&hellip;</span>
+            </li>
+            <li>
+                <a class="pagination-link" aria-label="Goto page {{ page.previous_page_number }}"
+                   href="{% url "blog.posts" page=page.previous_page_number %}">
+                    {{ page.previous_page_number }}
+                </a>
+            </li>
+        {% endif %}
+
+        <li>
+            <a class="pagination-link is-current" aria-label="Page {{ page.number }}" aria-current="page"
+               href="{% url "blog.posts" page=page.number %}">
+                {{ page.number }}
+            </a>
+        </li>
+
+        {% if page.has_next %}
+            <li>
+                <a class="pagination-link" aria-label="Goto page {{ page.next_page_number }}"
+                   href="{% url "blog.posts" page=page.next_page_number %}">
+                    {{ page.next_page_number }}
+                </a>
+            </li>
+            <li>
+              <span class="pagination-ellipsis">&hellip;</span>
+            </li>
+            <li>
+                <a class="pagination-link" aria-label="Goto page {{ page.paginator.num_pages }}"
+                   href="{% url "blog.posts" page=page.paginator.num_pages %}">
+                    {{ page.paginator.num_pages }}
+                </a>
+            </li>
+        {% endif %}
+    </ul>
+</nav>
diff --git a/pydis_site/templates/wiki/dir.html b/pydis_site/templates/wiki/dir.html
index 86b04c85..283fe598 100644
--- a/pydis_site/templates/wiki/dir.html
+++ b/pydis_site/templates/wiki/dir.html
@@ -77,6 +77,8 @@
   {% endfor %}
 </table>
 
-{% include "wiki/includes/pagination.html" %}
+{% if is_paginated %}
+  {% include "base/paginator.html" with page=page_obj %}
+{% endif %}
 
 {% endblock %}
diff --git a/pydis_site/templates/wiki/history.html b/pydis_site/templates/wiki/history.html
index d7a3a4da..d0a0d868 100644
--- a/pydis_site/templates/wiki/history.html
+++ b/pydis_site/templates/wiki/history.html
@@ -118,7 +118,9 @@
       </div>
     {% endfor %}
 
-    {% include "wiki/includes/pagination.html" %}
+    {% if is_paginated %}
+      {% include "base/paginator.html" with page=page_obj %}
+    {% endif %}
 
     {% if revisions.count > 1 and article|can_write:user and not article.current_revision.locked %}
 
diff --git a/pydis_site/templates/wiki/includes/pagination.html b/pydis_site/templates/wiki/includes/pagination.html
deleted file mode 100644
index 6e7ec608..00000000
--- a/pydis_site/templates/wiki/includes/pagination.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% load i18n %}
-{% if is_paginated %}
-<ul class="pagination">
-    {% if page_obj.has_previous %}
-        <li><a class="prev btn btn-info" href="?{% if search_query %}q={{ search_query  }}&{% endif %}page={{ page_obj.previous_page_number }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">&laquo;</a></li>
-    {% else %}
-        <li class="disabled"><span>&laquo;</span></li>
-    {% endif %}
-
-    {% for pc in paginator.page_range %}
-        {% if pc == 0 %}
-            <li class="disabled"><span>...</span></li>
-        {% else %}
-            <li class="{% if pc == page_obj.number %} active{% endif %}"><a href="?{% if search_query %}q={{ search_query  }}&{% endif %}page={{ pc }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">{{ pc }}</a></li>
-        {% endif %}
-    {% endfor %}
-
-    {% if page_obj.has_next %}
-        <li><a class="next btn btn-info" href="?{% if search_query %}q={{ search_query  }}&{% endif %}page={{ page_obj.next_page_number }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">&raquo;</a></li>
-    {% else %}
-        <li class="disabled"><span>&raquo;</span></li>
-    {% endif %}
-</ul>
-{% endif %}
diff --git a/pydis_site/templates/wiki/includes/searchresult.html b/pydis_site/templates/wiki/includes/searchresult.html
index f6dd7a09..350280a0 100644
--- a/pydis_site/templates/wiki/includes/searchresult.html
+++ b/pydis_site/templates/wiki/includes/searchresult.html
@@ -4,19 +4,20 @@
 <tr>
   <td>
     {% for urlpath in article.urlpath_set.all %}
-      <a href="{% url 'wiki:get' path=urlpath.path %}">{{ article.current_revision.title }}<br /><small class="muted">/{{ urlpath.path }}</small></a>
+      <a href="{% url 'wiki:get' path=urlpath.path %}">{{ article.current_revision.title }}<br /><small class="has-text-grey">Slug: /{{ urlpath.path }}</small></a>
     {% empty %}
       <a href="{% url 'wiki:get' article_id=article.id %}">{{ article.current_revision.title }}</a>
     {% endfor %}
+
     {% if article.current_revision.deleted %}
       <span class="fa fa-trash"></span>
     {% endif %}
+
     {% if article.current_revision.locked %}
       <span class="fa fa-lock"></span>
     {% endif %}
-    <p class="muted"><small>{{ article.render|get_content_snippet:search_query }}</small></p>
   </td>
-  <td style="white-space: nowrap">
+  <td class="has-text-right">
     {{ article.current_revision.created|naturaltime }}
   </td>
 </tr>
diff --git a/pydis_site/templates/wiki/plugins/images/index.html b/pydis_site/templates/wiki/plugins/images/index.html
index 4973ea6f..64515208 100644
--- a/pydis_site/templates/wiki/plugins/images/index.html
+++ b/pydis_site/templates/wiki/plugins/images/index.html
@@ -149,6 +149,8 @@
     {% endfor %}
   </table>
 
-  {% include "wiki/includes/pagination.html" %}
+  {% if is_paginated %}
+    {% include "base/paginator.html" with page=page_obj %}
+  {% endif %}
 
 {% endblock %}
diff --git a/pydis_site/templates/wiki/search.html b/pydis_site/templates/wiki/search.html
index 080cf40d..700ed8c4 100644
--- a/pydis_site/templates/wiki/search.html
+++ b/pydis_site/templates/wiki/search.html
@@ -2,52 +2,62 @@
 {% load wiki_tags i18n humanize %}
 
 
-{% block wiki_pagetitle %}{% trans "Search results for:" %} {{ search_query }}{% endblock %}
+{% block wiki_pagetitle %}Search results for: "{{ search_query }}"{% endblock %}
 
 {% block wiki_contents %}
 
-<h1 class="page-header">{% trans "Search results for:" %} {{ search_query }}</h1>
+<h1 class="page-header">Search results for: "{{ search_query }}"</h1>
 
 <form class="form-search directory-toolbar">
-<p class="lead">
-  <div class="pull-right">
+  <p>
     {% if urlpath %}
-      {% trans "Searching in" %} {{ urlpath.article }}
+      Searching: <strong>in {{ urlpath.article }}</strong>
     {% else %}
-      {% trans "Searching whole wiki" %}
+      Searching: <strong>everywhere</strong>
     {% endif %}
-    <div class="input-group">
-      <input type="search" class="form-control search-query" name="q" value="{{ search_query }}" />
-      <span class="input-group-btn">
-        <button class="btn btn-default" type="submit">
-          <span class="fa fa-search"></span>
-        </button>
+  </p>
+
+  <div class="field has-addons">
+    <div class="control has-icons-left is-expanded">
+      <input type="search" class="input" name="q" value="{{ search_query }}" />
+      <span class="icon is-left">
+        <i class="fas fa-search"></i>
       </span>
     </div>
+    <div class="control">
+      <button class="button is-primary" type="submit">
+        Search
+      </button>
+    </div>
   </div>
-  <p>{% blocktrans with paginator.object_list.count as cnt %}Your search returned <strong>{{ cnt }}</strong> results.{% endblocktrans %}</p>
-  <div class="clearfix"></div>
-</p>
+
+  <p>
+    {% blocktrans with paginator.object_list.count as cnt %}
+      Your search returned <strong>{{ cnt }}</strong> results.
+    {% endblocktrans %}
+  </p>
 </form>
 
-<table class="table table-striped">
+<table class="table is-striped">
   <tr>
-    <th style="width: 75%">{% trans "Title" %}</th>
-    <th>{% trans "Last modified" %}</th>
+    <th>Title</th>
+    <th class="has-text-right">Last modified</th>
   </tr>
   {% for article in articles %}
     {% block wiki_search_loop %}
-    {% include "wiki/includes/searchresult.html" %}
+      {% include "wiki/includes/searchresult.html" %}
     {% endblock %}
-    {% empty%}
-    <tr>
-      <td colspan="100">
-        <em>{% trans "There are no articles in this level" %}</em>
-      </td>
-    </tr>
+    {% empty %}
+      <tr>
+        <td colspan="2">
+          <em>No articles were found for that search query.</em>
+        </td>
+      </tr>
   {% endfor %}
 </table>
 
-{% include "wiki/includes/pagination.html" %}
+{% if is_paginated %}
+  {% include "base/paginator.html" with page=page_obj %}
+{% endif %}
 
 {% endblock %}
-- 
cgit v1.2.3


From 5e76c9ade203830c7f9a904d049dd54299a215b1 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 11:36:40 +0100
Subject: Big pagination changes because the wiki is stupid

---
 pydis_site/apps/home/templatetags/extra_tags.py | 65 +++++++++++++++++++++++++
 pydis_site/apps/home/templatetags/wiki_extra.py |  4 +-
 pydis_site/templates/base/paginator.html        | 41 ++++++++--------
 pydis_site/templates/wiki/history.html          |  4 +-
 4 files changed, 91 insertions(+), 23 deletions(-)
 create mode 100644 pydis_site/apps/home/templatetags/extra_tags.py

diff --git a/pydis_site/apps/home/templatetags/extra_tags.py b/pydis_site/apps/home/templatetags/extra_tags.py
new file mode 100644
index 00000000..a4da1742
--- /dev/null
+++ b/pydis_site/apps/home/templatetags/extra_tags.py
@@ -0,0 +1,65 @@
+from urllib.parse import urlparse, ParseResult, urlunparse
+
+from django.template import Context, Library
+from django.urls import resolve, reverse, NoReverseMatch
+
+register = Library()
+
+
+@register.simple_tag(takes_context=True)
+def url_extend(context: Context, *args, **kwargs):
+    current_url = context["request"].get_full_path()
+    resolved = resolve(current_url)
+
+    url = resolved.url_name
+    app_name = resolved.app_name
+
+    try:
+        _args = resolved.args
+        _kwargs = resolved.kwargs.copy()
+
+        _args += args
+        _kwargs.update(kwargs)
+
+        if app_name:
+            pattern = f"{app_name}:{url}"
+        else:
+            pattern = url
+
+        return reverse(pattern, args=_args, kwargs=_kwargs)
+    except NoReverseMatch:
+        _args = resolved.args
+        _kwargs = resolved.kwargs.copy()
+
+        if app_name:
+            pattern = f"{app_name}:{url}"
+        else:
+            pattern = url
+
+        reversed_url = reverse(pattern, args=_args, kwargs=_kwargs)
+        parsed: ParseResult = urlparse(reversed_url)
+
+        params = parsed.params
+
+        if params:
+            params += f"&"
+        else:
+            params = "?"
+
+        params += "&".join(args)
+        kwarg_list = []
+
+        for key, value in kwargs.items():
+            kwarg_list.append(f"{key}={value}")
+
+        params += "&".join(kwarg_list)
+
+        parsed = ParseResult(
+            parsed.scheme, parsed.netloc, parsed.path,
+            "", parsed.query, parsed.fragment
+        )
+
+        unparsed = urlunparse(parsed) + params
+        print(parsed)
+        print(unparsed)
+        return unparsed
diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index 63d9bade..58612cc8 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -6,7 +6,7 @@ from django.forms import (
     EmailField, Field, FileField, FilePathField, FloatField, GenericIPAddressField, ImageField, IntegerField,
     ModelChoiceField, ModelMultipleChoiceField, MultiValueField, MultipleChoiceField, NullBooleanField, RegexField,
     SlugField, SplitDateTimeField, TimeField, TypedChoiceField, TypedMultipleChoiceField, URLField, UUIDField)
-from django.template import Template
+from django.template import Template, Context
 from django.template.loader import get_template
 from django.utils.safestring import mark_safe
 from wiki.editors.markitup import MarkItUpWidget
@@ -86,7 +86,7 @@ def render_field(field: Field, render_labels: bool = True):
 
 
 @register.simple_tag(takes_context=True)
-def get_field_options(context, field: BoundField):
+def get_field_options(context: Context, field: BoundField):
     widget = field.field.widget
 
     if field.value() is None:
diff --git a/pydis_site/templates/base/paginator.html b/pydis_site/templates/base/paginator.html
index 8eaa37ee..9cf031f0 100644
--- a/pydis_site/templates/base/paginator.html
+++ b/pydis_site/templates/base/paginator.html
@@ -1,27 +1,28 @@
+{% load extra_tags %}
 {% comment %}
 This template inserts a Bulma paginator wherever one is required. Simply include it as follows:
 
-{% include "base/paginator.html" with page=paginator_object %}
+{% include "base/paginator.html" with page_obj=paginator_object %}
 {% endcomment %}
 
 <nav class="pagination" role="navigation" aria-label="pagination">
-    {% if page.has_previous %}
-        <a class="pagination-previous" href="{% url "blog.posts" page=page.previous_page_number %}">Newer</a>
+    {% if page_obj.has_previous %}
+        <a class="pagination-previous" href="{% url_extend page=page_obj.previous_page_number %}">Newer</a>
     {% else %}
         <a class="pagination-previous" title="This is the first page" disabled>Newer</a>
     {% endif %}
 
-    {% if page.has_next %}
-        <a class="pagination-next" href="{% url "" page=1 %}">Older</a>
+    {% if page_obj.has_next %}
+        <a class="pagination-next" href="{% url_extend page=1 %}">Older</a>
     {% else %}
         <a class="pagination-next" title="This is the last page" disabled>Older</a>
     {% endif %}
 
     <ul class="pagination-list">
-        {% if page.has_previous %}
+        {% if page_obj.has_previous %}
             <li>
                 <a class="pagination-link" aria-label="Goto page 1"
-                   href="{% url "blog.posts" page=1 %}">
+                   href="{% url_extend page=1 %}">
                     1
                 </a>
             </li>
@@ -29,34 +30,34 @@ This template inserts a Bulma paginator wherever one is required. Simply include
               <span class="pagination-ellipsis">&hellip;</span>
             </li>
             <li>
-                <a class="pagination-link" aria-label="Goto page {{ page.previous_page_number }}"
-                   href="{% url "blog.posts" page=page.previous_page_number %}">
-                    {{ page.previous_page_number }}
+                <a class="pagination-link" aria-label="Goto page {{ page_obj.previous_page_number }}"
+                   href="{% url_extend page=page_obj.previous_page_number %}">
+                    {{ page_obj.previous_page_number }}
                 </a>
             </li>
         {% endif %}
 
         <li>
-            <a class="pagination-link is-current" aria-label="Page {{ page.number }}" aria-current="page"
-               href="{% url "blog.posts" page=page.number %}">
-                {{ page.number }}
+            <a class="pagination-link is-current" aria-label="Page {{ page_obj.number }}" aria-current="page"
+               href="{% url_extend page=page_obj.number %}">
+                {{ page_obj.number }}
             </a>
         </li>
 
-        {% if page.has_next %}
+        {% if page_obj.has_next %}
             <li>
-                <a class="pagination-link" aria-label="Goto page {{ page.next_page_number }}"
-                   href="{% url "blog.posts" page=page.next_page_number %}">
-                    {{ page.next_page_number }}
+                <a class="pagination-link" aria-label="Goto page {{ page_obj.next_page_number }}"
+                   href="{% url_extend page=page_obj.next_page_number %}">
+                    {{ page_obj.next_page_number }}
                 </a>
             </li>
             <li>
               <span class="pagination-ellipsis">&hellip;</span>
             </li>
             <li>
-                <a class="pagination-link" aria-label="Goto page {{ page.paginator.num_pages }}"
-                   href="{% url "blog.posts" page=page.paginator.num_pages %}">
-                    {{ page.paginator.num_pages }}
+                <a class="pagination-link" aria-label="Goto page {{ page_obj.paginator.num_pages }}"
+                   href="{% url_extend page=page_obj.paginator.num_pages %}">
+                    {{ page_obj.paginator.num_pages }}
                 </a>
             </li>
         {% endif %}
diff --git a/pydis_site/templates/wiki/history.html b/pydis_site/templates/wiki/history.html
index d0a0d868..afc6eafe 100644
--- a/pydis_site/templates/wiki/history.html
+++ b/pydis_site/templates/wiki/history.html
@@ -118,8 +118,10 @@
       </div>
     {% endfor %}
 
+    {% include "wiki/includes/pagination.html" %}
+
     {% if is_paginated %}
-      {% include "base/paginator.html" with page=page_obj %}
+      {% include "base/paginator.html" %}
     {% endif %}
 
     {% if revisions.count > 1 and article|can_write:user and not article.current_revision.locked %}
-- 
cgit v1.2.3


From ed7ba6aa8ebe02d8e16fc784ece95d6092c4701b Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 12:11:49 +0100
Subject: Wiki pagination is special-cased, so we basically have one option for
 it

---
 pydis_site/apps/home/templatetags/extra_tags.py    |  65 ----------
 pydis_site/static/css/wiki/style.css               |  14 +++
 pydis_site/templates/base/paginator.html           |  65 ----------
 pydis_site/templates/wiki/dir.html                 | 132 ++++++++++-----------
 pydis_site/templates/wiki/history.html             |   6 +-
 pydis_site/templates/wiki/includes/pagination.html |  26 ++++
 .../templates/wiki/plugins/images/index.html       |   4 +-
 pydis_site/templates/wiki/search.html              | 102 ++++++++--------
 8 files changed, 156 insertions(+), 258 deletions(-)
 delete mode 100644 pydis_site/apps/home/templatetags/extra_tags.py
 delete mode 100644 pydis_site/templates/base/paginator.html
 create mode 100644 pydis_site/templates/wiki/includes/pagination.html

diff --git a/pydis_site/apps/home/templatetags/extra_tags.py b/pydis_site/apps/home/templatetags/extra_tags.py
deleted file mode 100644
index a4da1742..00000000
--- a/pydis_site/apps/home/templatetags/extra_tags.py
+++ /dev/null
@@ -1,65 +0,0 @@
-from urllib.parse import urlparse, ParseResult, urlunparse
-
-from django.template import Context, Library
-from django.urls import resolve, reverse, NoReverseMatch
-
-register = Library()
-
-
-@register.simple_tag(takes_context=True)
-def url_extend(context: Context, *args, **kwargs):
-    current_url = context["request"].get_full_path()
-    resolved = resolve(current_url)
-
-    url = resolved.url_name
-    app_name = resolved.app_name
-
-    try:
-        _args = resolved.args
-        _kwargs = resolved.kwargs.copy()
-
-        _args += args
-        _kwargs.update(kwargs)
-
-        if app_name:
-            pattern = f"{app_name}:{url}"
-        else:
-            pattern = url
-
-        return reverse(pattern, args=_args, kwargs=_kwargs)
-    except NoReverseMatch:
-        _args = resolved.args
-        _kwargs = resolved.kwargs.copy()
-
-        if app_name:
-            pattern = f"{app_name}:{url}"
-        else:
-            pattern = url
-
-        reversed_url = reverse(pattern, args=_args, kwargs=_kwargs)
-        parsed: ParseResult = urlparse(reversed_url)
-
-        params = parsed.params
-
-        if params:
-            params += f"&"
-        else:
-            params = "?"
-
-        params += "&".join(args)
-        kwarg_list = []
-
-        for key, value in kwargs.items():
-            kwarg_list.append(f"{key}={value}")
-
-        params += "&".join(kwarg_list)
-
-        parsed = ParseResult(
-            parsed.scheme, parsed.netloc, parsed.path,
-            "", parsed.query, parsed.fragment
-        )
-
-        unparsed = urlunparse(parsed) + params
-        print(parsed)
-        print(unparsed)
-        return unparsed
diff --git a/pydis_site/static/css/wiki/style.css b/pydis_site/static/css/wiki/style.css
index 61ded7ce..c5dbd7c3 100644
--- a/pydis_site/static/css/wiki/style.css
+++ b/pydis_site/static/css/wiki/style.css
@@ -5,3 +5,17 @@
 div.control.is-fullwidth {
     width: 100%;
 }
+
+ul.pagination-list {
+    list-style: none;
+    margin: 0;
+}
+
+ul.pagination-list li + li {
+    margin: 0;
+}
+
+.pagination {
+    margin-top: 0.5rem;
+    margin-bottom: 0.5rem;
+}
diff --git a/pydis_site/templates/base/paginator.html b/pydis_site/templates/base/paginator.html
deleted file mode 100644
index 9cf031f0..00000000
--- a/pydis_site/templates/base/paginator.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% load extra_tags %}
-{% comment %}
-This template inserts a Bulma paginator wherever one is required. Simply include it as follows:
-
-{% include "base/paginator.html" with page_obj=paginator_object %}
-{% endcomment %}
-
-<nav class="pagination" role="navigation" aria-label="pagination">
-    {% if page_obj.has_previous %}
-        <a class="pagination-previous" href="{% url_extend page=page_obj.previous_page_number %}">Newer</a>
-    {% else %}
-        <a class="pagination-previous" title="This is the first page" disabled>Newer</a>
-    {% endif %}
-
-    {% if page_obj.has_next %}
-        <a class="pagination-next" href="{% url_extend page=1 %}">Older</a>
-    {% else %}
-        <a class="pagination-next" title="This is the last page" disabled>Older</a>
-    {% endif %}
-
-    <ul class="pagination-list">
-        {% if page_obj.has_previous %}
-            <li>
-                <a class="pagination-link" aria-label="Goto page 1"
-                   href="{% url_extend page=1 %}">
-                    1
-                </a>
-            </li>
-            <li>
-              <span class="pagination-ellipsis">&hellip;</span>
-            </li>
-            <li>
-                <a class="pagination-link" aria-label="Goto page {{ page_obj.previous_page_number }}"
-                   href="{% url_extend page=page_obj.previous_page_number %}">
-                    {{ page_obj.previous_page_number }}
-                </a>
-            </li>
-        {% endif %}
-
-        <li>
-            <a class="pagination-link is-current" aria-label="Page {{ page_obj.number }}" aria-current="page"
-               href="{% url_extend page=page_obj.number %}">
-                {{ page_obj.number }}
-            </a>
-        </li>
-
-        {% if page_obj.has_next %}
-            <li>
-                <a class="pagination-link" aria-label="Goto page {{ page_obj.next_page_number }}"
-                   href="{% url_extend page=page_obj.next_page_number %}">
-                    {{ page_obj.next_page_number }}
-                </a>
-            </li>
-            <li>
-              <span class="pagination-ellipsis">&hellip;</span>
-            </li>
-            <li>
-                <a class="pagination-link" aria-label="Goto page {{ page_obj.paginator.num_pages }}"
-                   href="{% url_extend page=page_obj.paginator.num_pages %}">
-                    {{ page_obj.paginator.num_pages }}
-                </a>
-            </li>
-        {% endif %}
-    </ul>
-</nav>
diff --git a/pydis_site/templates/wiki/dir.html b/pydis_site/templates/wiki/dir.html
index 283fe598..d8560089 100644
--- a/pydis_site/templates/wiki/dir.html
+++ b/pydis_site/templates/wiki/dir.html
@@ -5,80 +5,76 @@
 {% block wiki_pagetitle %}{% trans "Listing articles in" %} {{ article.current_revision.title }}{% endblock %}
 
 {% block wiki_contents_tab %}
+  {% url 'wiki:dir' urlpath.path as self_url %}
 
-{% url 'wiki:dir' urlpath.path as self_url %}
-
-<form class="form-search directory-toolbar">
-<div class="well well-small">
-  <div class="btn-group pull-left">
-    {% if urlpath.parent %}
-    <a href="{% url 'wiki:dir' path=urlpath.parent.path %}" class="btn btn-default">
-      <span class="fa fa-arrow-up"></span>
-      {% trans "Up one level" %}
-    </a>
-    {% endif %}
-    <a href="{% url 'wiki:create' path=urlpath.path %}" class="btn btn-default">
-      <span class="fa fa-plus"></span>
-      {% trans "Add article" %}
-    </a>
-  </div>
-  <div class="pull-right">
-    {{ filter_form.query }}
-  </div>
-  {% if filter_query %}
-    <div class="pull-right filter-clear">
-      <a href="{{ self_url }}">({% trans "clear" %})</a>
+  <form class="form-search directory-toolbar">
+  <div class="well well-small">
+    <div class="btn-group pull-left">
+      {% if urlpath.parent %}
+      <a href="{% url 'wiki:dir' path=urlpath.parent.path %}" class="btn btn-default">
+        <span class="fa fa-arrow-up"></span>
+        {% trans "Up one level" %}
+      </a>
+      {% endif %}
+      <a href="{% url 'wiki:create' path=urlpath.path %}" class="btn btn-default">
+        <span class="fa fa-plus"></span>
+        {% trans "Add article" %}
+      </a>
+    </div>
+    <div class="pull-right">
+      {{ filter_form.query }}
     </div>
-  {% endif %}
+    {% if filter_query %}
+      <div class="pull-right filter-clear">
+        <a href="{{ self_url }}">({% trans "clear" %})</a>
+      </div>
+    {% endif %}
 
-  <div class="clearfix"></div>
-</div>
-</form>
+    <div class="clearfix"></div>
+  </div>
+  </form>
 
-<p>
-  {% with paginator.object_list.count as cnt %}
-    {% blocktrans with urlpath.path as path and cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb trimmed %}
-      Browsing <strong><a href="{{ self_url }}">/{{ path }}</a></strong>. There {{ articles_plur_verb }} <strong>{{ cnt }} {{ articles_plur }}</strong> in this level.
-    {% endblocktrans %}
-  {% endwith %}
-</p>
+  <p>
+    {% with paginator.object_list.count as cnt %}
+      {% blocktrans with urlpath.path as path and cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb trimmed %}
+        Browsing <strong><a href="{{ self_url }}">/{{ path }}</a></strong>. There {{ articles_plur_verb }} <strong>{{ cnt }} {{ articles_plur }}</strong> in this level.
+      {% endblocktrans %}
+    {% endwith %}
+  </p>
 
-<table class="table table-striped">
-  <tr>
-    <th>{% trans "Title" %}</th>
-    <th>{% trans "Slug" %}</th>
-    <th>{% trans "Last modified" %}</th>
-  </tr>
-  {% for urlpath in directory %}
+  <table class="table table-striped">
     <tr>
-      <td>
-        <a href="{% url 'wiki:get' path=urlpath.path %}"> {{ urlpath.article.current_revision.title }} </a>
-        <a href="{% url 'wiki:dir' path=urlpath.path %}" class="list-children"> › </a>
-        {% if urlpath.article.current_revision.deleted %}
-          <span class="fa fa-trash"></span>
-        {% endif %}
-        {% if urlpath.article.current_revision.locked %}
-          <span class="fa fa-lock"></span>
-        {% endif %}
-      </td>
-      <td>
-        {{ urlpath.slug }}
-      </td>
-      <td>
-        {{ urlpath.article.current_revision.created|naturaltime }}
-      </td>
+      <th>{% trans "Title" %}</th>
+      <th>{% trans "Slug" %}</th>
+      <th>{% trans "Last modified" %}</th>
     </tr>
-    {% empty%}
-    <tr>
-      <td colspan="100">
-        <em>{% trans "There are no articles in this level" %}</em>
-      </td>
-    </tr>
-  {% endfor %}
-</table>
-
-{% if is_paginated %}
-  {% include "base/paginator.html" with page=page_obj %}
-{% endif %}
+    {% for urlpath in directory %}
+      <tr>
+        <td>
+          <a href="{% url 'wiki:get' path=urlpath.path %}"> {{ urlpath.article.current_revision.title }} </a>
+          <a href="{% url 'wiki:dir' path=urlpath.path %}" class="list-children"> › </a>
+          {% if urlpath.article.current_revision.deleted %}
+            <span class="fa fa-trash"></span>
+          {% endif %}
+          {% if urlpath.article.current_revision.locked %}
+            <span class="fa fa-lock"></span>
+          {% endif %}
+        </td>
+        <td>
+          {{ urlpath.slug }}
+        </td>
+        <td>
+          {{ urlpath.article.current_revision.created|naturaltime }}
+        </td>
+      </tr>
+      {% empty%}
+      <tr>
+        <td colspan="100">
+          <em>{% trans "There are no articles in this level" %}</em>
+        </td>
+      </tr>
+    {% endfor %}
+  </table>
 
+  {% include "wiki/includes/pagination.html" %}
 {% endblock %}
diff --git a/pydis_site/templates/wiki/history.html b/pydis_site/templates/wiki/history.html
index afc6eafe..793b4888 100644
--- a/pydis_site/templates/wiki/history.html
+++ b/pydis_site/templates/wiki/history.html
@@ -49,6 +49,8 @@
   {% trans "Click each revision to see a list of edited lines. Click the Preview button to see how the article looked at this stage. At the bottom of this page, you can change to a particular revision or merge an old revision with the current one." %}
 </p>
 
+  {% include "wiki/includes/pagination.html" %}
+
 <form method="GET">
   <div class="tab-content" style="overflow: visible;">
     {% for revision in revisions %}
@@ -120,10 +122,6 @@
 
     {% include "wiki/includes/pagination.html" %}
 
-    {% if is_paginated %}
-      {% include "base/paginator.html" %}
-    {% endif %}
-
     {% if revisions.count > 1 and article|can_write:user and not article.current_revision.locked %}
 
     <div class="form-group form-actions">
diff --git a/pydis_site/templates/wiki/includes/pagination.html b/pydis_site/templates/wiki/includes/pagination.html
new file mode 100644
index 00000000..bd113dd6
--- /dev/null
+++ b/pydis_site/templates/wiki/includes/pagination.html
@@ -0,0 +1,26 @@
+{% load i18n %}
+{% if is_paginated %}
+  <nav class="pagination" role="navigation" aria-label="pagination">
+    {% if page_obj.has_previous %}
+        <a class="pagination-previous" href="?{% if search_query %}q={{ search_query  }}&{% endif %}page={{ page_obj.previous_page_number }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">Previous</a>
+    {% else %}
+        <a class="pagination-previous tooltip" data-tooltip="This is the first page" disabled>Previous</a>
+    {% endif %}
+
+    {% if page_obj.has_next %}
+        <a class="pagination-next" href="{% if search_query %}q={{ search_query  }}&{% endif %}page={{ page_obj.next_page_number }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">Next</a>
+    {% else %}
+        <a class="pagination-next tooltip" data-tooltip="This is the last page" disabled>Older</a>
+    {% endif %}
+
+    <ul class="pagination-list">
+      {% for pc in paginator.page_range %}
+        {% if pc == 0 %}
+          <li><span class="pagination-ellipsis">&hellip;</span></li>
+        {% else %}
+          <li><a class="pagination-link{% if pc == page_obj.number %} is-current{% endif %}" href="?{% if search_query %}q={{ search_query  }}&{% endif %}page={{ pc }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">{{ pc }}</a></li>
+        {% endif %}
+    {% endfor %}
+    </ul>
+  </nav>
+{% endif %}
diff --git a/pydis_site/templates/wiki/plugins/images/index.html b/pydis_site/templates/wiki/plugins/images/index.html
index 64515208..4973ea6f 100644
--- a/pydis_site/templates/wiki/plugins/images/index.html
+++ b/pydis_site/templates/wiki/plugins/images/index.html
@@ -149,8 +149,6 @@
     {% endfor %}
   </table>
 
-  {% if is_paginated %}
-    {% include "base/paginator.html" with page=page_obj %}
-  {% endif %}
+  {% include "wiki/includes/pagination.html" %}
 
 {% endblock %}
diff --git a/pydis_site/templates/wiki/search.html b/pydis_site/templates/wiki/search.html
index 700ed8c4..80379a1d 100644
--- a/pydis_site/templates/wiki/search.html
+++ b/pydis_site/templates/wiki/search.html
@@ -5,59 +5,55 @@
 {% block wiki_pagetitle %}Search results for: "{{ search_query }}"{% endblock %}
 
 {% block wiki_contents %}
-
-<h1 class="page-header">Search results for: "{{ search_query }}"</h1>
-
-<form class="form-search directory-toolbar">
-  <p>
-    {% if urlpath %}
-      Searching: <strong>in {{ urlpath.article }}</strong>
-    {% else %}
-      Searching: <strong>everywhere</strong>
-    {% endif %}
-  </p>
-
-  <div class="field has-addons">
-    <div class="control has-icons-left is-expanded">
-      <input type="search" class="input" name="q" value="{{ search_query }}" />
-      <span class="icon is-left">
-        <i class="fas fa-search"></i>
-      </span>
-    </div>
-    <div class="control">
-      <button class="button is-primary" type="submit">
-        Search
-      </button>
+  <h1 class="page-header">Search results for: "{{ search_query }}"</h1>
+
+  <form class="form-search directory-toolbar">
+    <p>
+      {% if urlpath %}
+        Searching: <strong>in {{ urlpath.article }}</strong>
+      {% else %}
+        Searching: <strong>everywhere</strong>
+      {% endif %}
+    </p>
+
+    <div class="field has-addons">
+      <div class="control has-icons-left is-expanded">
+        <input type="search" class="input" name="q" value="{{ search_query }}" />
+        <span class="icon is-left">
+          <i class="fas fa-search"></i>
+        </span>
+      </div>
+      <div class="control">
+        <button class="button is-primary" type="submit">
+          Search
+        </button>
+      </div>
     </div>
-  </div>
-
-  <p>
-    {% blocktrans with paginator.object_list.count as cnt %}
-      Your search returned <strong>{{ cnt }}</strong> results.
-    {% endblocktrans %}
-  </p>
-</form>
-
-<table class="table is-striped">
-  <tr>
-    <th>Title</th>
-    <th class="has-text-right">Last modified</th>
-  </tr>
-  {% for article in articles %}
-    {% block wiki_search_loop %}
-      {% include "wiki/includes/searchresult.html" %}
-    {% endblock %}
-    {% empty %}
-      <tr>
-        <td colspan="2">
-          <em>No articles were found for that search query.</em>
-        </td>
-      </tr>
-  {% endfor %}
-</table>
-
-{% if is_paginated %}
-  {% include "base/paginator.html" with page=page_obj %}
-{% endif %}
 
+    <p>
+      {% blocktrans with paginator.object_list.count as cnt %}
+        Your search returned <strong>{{ cnt }}</strong> results.
+      {% endblocktrans %}
+    </p>
+  </form>
+
+  <table class="table is-striped">
+    <tr>
+      <th>Title</th>
+      <th class="has-text-right">Last modified</th>
+    </tr>
+    {% for article in articles %}
+      {% block wiki_search_loop %}
+        {% include "wiki/includes/searchresult.html" %}
+      {% endblock %}
+      {% empty %}
+        <tr>
+          <td colspan="2">
+            <em>No articles were found for that search query.</em>
+          </td>
+        </tr>
+    {% endfor %}
+  </table>
+
+  {% include "wiki/includes/pagination.html" %}
 {% endblock %}
-- 
cgit v1.2.3


From 5e7b7d136a1b91a70ed56dad19454366febe9b0b Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 12:16:57 +0100
Subject: Add paginators at the top of paginated sections

---
 pydis_site/templates/wiki/dir.html                 |  2 +
 pydis_site/templates/wiki/history.html             | 85 +++++++++++-----------
 .../templates/wiki/plugins/images/index.html       |  3 +
 pydis_site/templates/wiki/search.html              |  2 +
 4 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/pydis_site/templates/wiki/dir.html b/pydis_site/templates/wiki/dir.html
index d8560089..3a7e3edb 100644
--- a/pydis_site/templates/wiki/dir.html
+++ b/pydis_site/templates/wiki/dir.html
@@ -42,6 +42,8 @@
     {% endwith %}
   </p>
 
+  {% include "wiki/includes/pagination.html" %}
+
   <table class="table table-striped">
     <tr>
       <th>{% trans "Title" %}</th>
diff --git a/pydis_site/templates/wiki/history.html b/pydis_site/templates/wiki/history.html
index 793b4888..2e909df0 100644
--- a/pydis_site/templates/wiki/history.html
+++ b/pydis_site/templates/wiki/history.html
@@ -5,49 +5,48 @@
 {% block wiki_pagetitle %}{% trans "History" %}: {{ article.current_revision.title }}{% endblock %}
 
 {% block wiki_contents_tab %}
-
-{% include "wiki/includes/modals.html" %}
-
-{% addtoblock "js" %}
-<script type="text/javascript" src="{% static "wiki/js/diffview.js" %}"></script>
-<script type="text/javascript" src="{% static "wiki/js/diff.js" %}"></script>
-{% endaddtoblock %}
-{% addtoblock "css" %}
-<style type="text/css">
-  td.linenumber {
-    width: 20px;
-  }
-  tr.insert td {
-    background-color: #DFC;
-  }
-  tr.delete td {
-    background-color: #FDC;
-  }
-  tr.equal td {
-    background-color: #F2F2F2;
-  }
-
-  .diff-container td {
-    white-space: pre; font-family: monospace;
-  }
-  .diff-container td,
-  .diff-container th {
-    padding: 2px 7px;
-    border-right: 1px solid #DDD;
-  }
-  .diff-container td:last-child,
-  .diff-container th:last-child {
-    border-right: none;
-  }
-  .diff-container table {
-    border-top: 1px solid #DDD;
-  }
-</style>
-{% endaddtoblock %}
-
-<p class="lead">
-  {% trans "Click each revision to see a list of edited lines. Click the Preview button to see how the article looked at this stage. At the bottom of this page, you can change to a particular revision or merge an old revision with the current one." %}
-</p>
+  {% include "wiki/includes/modals.html" %}
+
+  {% addtoblock "js" %}
+    <script type="text/javascript" src="{% static "wiki/js/diffview.js" %}"></script>
+    <script type="text/javascript" src="{% static "wiki/js/diff.js" %}"></script>
+  {% endaddtoblock %}
+  {% addtoblock "css" %}
+    <style type="text/css">
+      td.linenumber {
+        width: 20px;
+      }
+      tr.insert td {
+        background-color: #DFC;
+      }
+      tr.delete td {
+        background-color: #FDC;
+      }
+      tr.equal td {
+        background-color: #F2F2F2;
+      }
+
+      .diff-container td {
+        white-space: pre; font-family: monospace;
+      }
+      .diff-container td,
+      .diff-container th {
+        padding: 2px 7px;
+        border-right: 1px solid #DDD;
+      }
+      .diff-container td:last-child,
+      .diff-container th:last-child {
+        border-right: none;
+      }
+      .diff-container table {
+        border-top: 1px solid #DDD;
+      }
+    </style>
+  {% endaddtoblock %}
+
+  <p class="lead">
+    {% trans "Click each revision to see a list of edited lines. Click the Preview button to see how the article looked at this stage. At the bottom of this page, you can change to a particular revision or merge an old revision with the current one." %}
+  </p>
 
   {% include "wiki/includes/pagination.html" %}
 
diff --git a/pydis_site/templates/wiki/plugins/images/index.html b/pydis_site/templates/wiki/plugins/images/index.html
index 4973ea6f..2b4d9800 100644
--- a/pydis_site/templates/wiki/plugins/images/index.html
+++ b/pydis_site/templates/wiki/plugins/images/index.html
@@ -13,6 +13,9 @@
       {% trans "Back to edit page" %}
     </a>
   </p>
+
+  {% include "wiki/includes/pagination.html" %}
+
   <table class="table is-fullwidth">
     {% for image in images %}
       {% with image.current_revision.imagerevision as revision %}
diff --git a/pydis_site/templates/wiki/search.html b/pydis_site/templates/wiki/search.html
index 80379a1d..296b21b3 100644
--- a/pydis_site/templates/wiki/search.html
+++ b/pydis_site/templates/wiki/search.html
@@ -37,6 +37,8 @@
     </p>
   </form>
 
+  {% include "wiki/includes/pagination.html" %}
+
   <table class="table is-striped">
     <tr>
       <th>Title</th>
-- 
cgit v1.2.3


From bf99d5e06936625e7939d72d0bb922b71ce401eb Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 13:24:41 +0100
Subject: Finish history view page

---
 pydis_site/templates/wiki/edit.html                |   2 +-
 pydis_site/templates/wiki/history.html             | 237 +++++++++------------
 pydis_site/templates/wiki/includes/pagination.html |   2 +-
 .../templates/wiki/includes/revision_info.html     |   3 -
 pydis_site/templates/wiki/preview_inline.html      |  12 +-
 5 files changed, 112 insertions(+), 144 deletions(-)

diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index 0ebfa2f6..c0cb8de6 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -82,7 +82,7 @@
         <iframe name="previewWindow" frameborder="0" style="width: 100%; height: 100%;"></iframe>
       </div>
       <div class="modal-card-foot">
-        <button class="button is-white" aria-label="close">
+        <button class="button is-light" aria-label="close">
           <span class="icon">
             <i class="fas fa-arrow-left"></i>
           </span>
diff --git a/pydis_site/templates/wiki/history.html b/pydis_site/templates/wiki/history.html
index 2e909df0..7946508e 100644
--- a/pydis_site/templates/wiki/history.html
+++ b/pydis_site/templates/wiki/history.html
@@ -50,154 +50,119 @@
 
   {% include "wiki/includes/pagination.html" %}
 
-<form method="GET">
-  <div class="tab-content" style="overflow: visible;">
-    {% for revision in revisions %}
-      <div class="panel-group" id="accordion{{ revision.revision_number }}">
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <a class="panel-toggle" style="float: left;" href="#collapse{{ revision.revision_number }}" onclick="get_diff_json('{% url 'wiki:diff' revision.id %}', $('#collapse{{ revision.revision_number }}'))">
-              {% if revision == article.current_revision %}
-                <i class="fa fa-flag"></i>
-              {% else %}
-                <i class="fa fa-plus"></i>
-              {% endif %}
-              {% include "wiki/includes/revision_info.html" with current_revision=article.current_revision %}
-              <div class="text-muted">
-                <small>
-                {% if revision.user_message %}
-                  {{ revision.user_message }}
-                {% elif revision.automatic_log %}
-                  {{ revision.automatic_log }}
-                {% else %}
-                  ({% trans "no log message" %})
-                {% endif %}
-                </small>
-              </div>
-            </a>
-            <div class="progress progress-striped active" style="display: none; width: 40px; float: left; margin-top: 7px; margin-bottom: -7px;">
-              <div class="bar" style="width: 100%;"></div>
-            </div>
-            <div class="pull-right" style="vertical-align: middle; margin: 8px 8px;">
-              {% if revision == article.current_revision %}
-              <a href="#" class="btn btn-default disabled">
-                <span class="fa fa-lock fa-fw"></span>
-                {% trans "Preview this revision" %}
+<form method="GET" id="historyForm">
+  <table class="table is-striped">
+    <thead>
+      <tr>
+        <th>Updated</th>
+        <th>Summary</th>
+        <th class="has-text-right">Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for revision in revisions %}
+        <tr {% if revision == article.current_revision %}class="is-selected"{% endif %}>
+          <td>
+            {% include "wiki/includes/revision_info.html" with current_revision=article.current_revision %}
+          </td>
+          <td>
+            {% if revision.user_message %}
+              {{ revision.user_message }}
+            {% elif revision.automatic_log %}
+              {{ revision.automatic_log }}
+            {% else %}
+              <em>No summary</em>
+            {% endif %}
+          </td>
+          <td class="has-text-right">
+            {% if revision == article.current_revision %}
+              <a class="button is-static has-text-grey">
+                <span class="icon">
+                  <i class="fas fa-eye"></i>
+                </span>
+                <span>Preview</span>
               </a>
-              {% else %}
-              <button type="submit" class="btn btn-default" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.r.value='{{ revision.id }}'; this.form.action='{% url 'wiki:preview_revision' article.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}')">
-                <span class="fa fa-eye fa-fw"></span>
-                {% trans "Preview this revision" %}
+              <a class="button is-static has-text-grey">
+                <span class="icon">
+                  <i class="fas fa-sync"></i>
+                </span>
+                <span>Switch</span>
+              </a>
+            {% else %}
+              <button type="submit" class="button" onclick="showPreviewModal('{{ revision.id }}', '{% url 'wiki:preview_revision' article.id %}', '{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}'); event.preventDefault();">
+                <span class="icon">
+                  <i class="fas fa-eye"></i>
+                </span>
+                <span>Preview</span>
               </button>
-              {% endif %}
-
-              {% if article|can_write:user and not article.current_revision.locked %}
-              <input type="radio"{% if revision == article.current_revision %} disabled="true"{% endif %} style="margin: 0 10px;" value="{{ revision.id }}" name="revision_id" switch-button-href="{% url 'wiki:change_revision' path=urlpath.path revision_id=revision.id %}" merge-button-href="{% url 'wiki:merge_revision_preview' article_id=article.id revision_id=revision.id %}" merge-button-commit-href="{% url 'wiki:merge_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}" />
-              {% endif %}
-
-            </div>
-            <div style="clear: both"></div>
-          </div>
-          <div id="collapse{{ revision.revision_number }}" class="panel-collapse collapse">
-            <div class="panel-body diff-container" style="padding: 0;">
-              <dl class="dl-horizontal">
-                <dt>{% trans "Auto log:" %}</dt>
-                <dd>{{ revision.automatic_log|default:"-"|linebreaksbr }}</dd>
-              </dl>
-              <table class="table table-condensed" style="margin: 0; border-collapse: collapse;">
-                <thead>
-                  <tr>
-                    <th class="linenumber">{% if revision.previous_revision %}#{{revision.previous_revision.revision_number}}{% endif %}</th>
-                    <th class="linenumber">#{{revision.revision_number}}</th>
-                    <th>{% trans "Change" %}</th>
-                  </tr>
-                </thead>
-              </table>
-            </div>
-          </div>
-        </div>
-      </div>
-    {% endfor %}
+              <a class="button is-primary" href="{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}">
+                <span class="icon">
+                  <i class="fas fa-sync"></i>
+                </span>
+                <span>Switch</span>
+              </a>
+            {% endif %}
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 
-    {% include "wiki/includes/pagination.html" %}
+  {% include "wiki/includes/pagination.html" %}
 
-    {% if revisions.count > 1 and article|can_write:user and not article.current_revision.locked %}
+  <input type="hidden" name="r" value="" id="r" />
 
-    <div class="form-group form-actions">
-      <div class="pull-right">
-        <button type="submit" name="preview" value="1" class="btn btn-default" onclick="$('#mergeModal').modal('show'); this.form.target='mergeWindow'; this.form.action=$('input[type=radio]:checked').attr('merge-button-href'); $('.merge-revision-commit').attr('href', $('input[type=radio]:checked').attr('merge-button-commit-href'))">
-          <span class="fa fa-random"></span>
-          {% trans "Merge selected with current..." %}
-        </button>
-        <button type="submit" name="save" value="1" class="btn btn-primary" onclick="this.form.target='_self'; this.form.action=$('input[type=radio]:checked').attr('switch-button-href')">
-          <span class="fa fa-flag"></span>
-          {% trans "Switch to selected version" %}
-        </button>
+  <div class="modal" id="previewModal">
+    <div class="modal-background"></div>
+    <div class="modal-card" style="height: 80%; width: 80%;">
+      <div class="modal-card-head">
+        <p class="modal-card-title">Revision Preview</p>
       </div>
-      <div style="clear:both"></div>
-    </div>
-
-    {% endif %}
-
-  </div>
-  <input type="hidden" name="r" value="" />
-  <div class="modal fade wiki-modal" id="previewModal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-body">
-          <iframe name="previewWindow" frameborder="0"></iframe>
-        </div>
-        <div class="modal-footer">
-          <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
-            <span class="fa fa-arrow-circle-left"></span>
-            {% trans "Back to history view" %}
-          </a>
-          {% if article|can_write:user %}
-          <a href="#" class="btn btn-lg btn-primary switch-to-revision">
-            <span class="fa fa-flag"></span>
-            {% trans "Switch to this version" %}
-          </a>
-          {% else %}
-            <a href="#" class="btn btn-lg btn-primary disabled">
-              <span class="fa fa-lock"></span>
-              {% trans "Switch to this version" %}
-            </a>
-          {% endif %}
-        </div>
+      <div class="modal-card-body" style="padding: 0; overflow: hidden;">
+        <iframe name="previewWindow" id="previewWindow" frameborder="0" style="width: 100%; height: 100%;"></iframe>
       </div>
-    </div>
-  </div>
-
-  <div class="modal fade wiki-modal" id="mergeModal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h1>{% trans "Merge with current" %}</h1>
-          <p class="lead"><span class="fa fa-info-circle"></span> {% trans "When you merge a revision with the current, all data will be retained from both versions and merged at its approximate location from each revision." %} <strong>{% trans "After this, it's important to do a manual review." %}</strong></p>
-        </div>
-        <div class="modal-body">
-          <iframe name="mergeWindow" frameborder="0" style="min-height: 0;"></iframe>
-        </div>
-        <div class="modal-footer">
-          <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
-            <span class="fa fa-arrow-circle-left"></span>
-            {% trans "Back to history view" %}
+      <div class="modal-card-foot">
+        <button class="button is-light" aria-label="close">
+          <span class="icon">
+            <i class="fas fa-arrow-left"></i>
+          </span>
+          <span>Back</span>
+        </button>
+        {% if article|can_write:user %}
+          <a href="#" class="button is-primary switch-to-revision">
+            <span class="icon">
+              <i class="fas fa-sync"></i>
+            </span>
+            <span>Switch to this version</span>
           </a>
-          {% if article|can_write:user %}
-          <a href="#" class="btn btn-lg btn-primary merge-revision-commit">
-            <span class="fa fa-file"></span>
-            {% trans "Create new merged version" %}
+        {% else %}
+          <a class="button is-static">
+            <span class="icon">
+              <i class="fas fa-check"></i>
+            </span>
+            <span>Switch to this version</span>
           </a>
-          {% else %}
-            <a href="#" class="btn btn-lg btn-primary disabled">
-              <span class="fa fa-lock"></span>
-              {% trans "Create new merged version" %}
-            </a>
-          {% endif %}
-        </div>
+        {% endif %}
       </div>
     </div>
   </div>
 </form>
+  <script src="{% static "js/wiki/modal.js" %}" type="text/javascript"></script>
+  <script type="text/javascript">
+    function showPreviewModal(revision_id, action_url, change_revision_url) {
+      let iframe = $("#previewWindow");
+
+      iframe.attr("src", action_url + "?r=" + revision_id);
+
+      console.log(revision_id);
+      console.log(action_url + "?r=" + revision_id);
+      console.log(change_revision_url);
+
+      $('#previewModal .switch-to-revision').attr('href', change_revision_url);
+      open_modal('previewModal');
+    }
+  </script>
 
 {% endblock %}
+
+
diff --git a/pydis_site/templates/wiki/includes/pagination.html b/pydis_site/templates/wiki/includes/pagination.html
index bd113dd6..0bdcbdc2 100644
--- a/pydis_site/templates/wiki/includes/pagination.html
+++ b/pydis_site/templates/wiki/includes/pagination.html
@@ -8,7 +8,7 @@
     {% endif %}
 
     {% if page_obj.has_next %}
-        <a class="pagination-next" href="{% if search_query %}q={{ search_query  }}&{% endif %}page={{ page_obj.next_page_number }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">Next</a>
+        <a class="pagination-next" href="?{% if search_query %}q={{ search_query  }}&{% endif %}page={{ page_obj.next_page_number }}{% if appended_key %}&{{ appended_key }}={{ appended_value }}{% endif %}">Next</a>
     {% else %}
         <a class="pagination-next tooltip" data-tooltip="This is the last page" disabled>Older</a>
     {% endif %}
diff --git a/pydis_site/templates/wiki/includes/revision_info.html b/pydis_site/templates/wiki/includes/revision_info.html
index 95b01baf..724f7296 100644
--- a/pydis_site/templates/wiki/includes/revision_info.html
+++ b/pydis_site/templates/wiki/includes/revision_info.html
@@ -8,9 +8,6 @@
 
 {% load wiki_tags i18n %}
 {% if not hidedate %}{{ revision.created }}{% endif %} {% if not hidenumber %}(#{{ revision.revision_number }}) {% trans "by" %}{% endif %} {% if revision.user %}{{ revision.user }}{% else %}{% if article|can_moderate:user %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %}
-{% if revision == current_revision %}
-  <strong>*</strong>
-{% endif %}
 {% if revision.deleted %}
 <span class="badge badge-important">{% trans "deleted" %}</span>
 {% endif %}
diff --git a/pydis_site/templates/wiki/preview_inline.html b/pydis_site/templates/wiki/preview_inline.html
index 829fee4c..a130df05 100644
--- a/pydis_site/templates/wiki/preview_inline.html
+++ b/pydis_site/templates/wiki/preview_inline.html
@@ -7,9 +7,15 @@
 
 {% block wiki_body %}
   {% if revision %}
-    <div class="alert alert-info">
-      <strong>{% trans "Previewing revision" %}:</strong>
-      {% include "wiki/includes/revision_info.html" %}
+    <div class="container">
+      <div class="message">
+        <div class="message-header">
+          <p>Previewing Revision</p>
+        </div>
+        <div class="message-body">
+          {% include "wiki/includes/revision_info.html" %}
+        </div>
+      </div>
     </div>
   {% endif %}
 
-- 
cgit v1.2.3


From 3187567dd17934a5c4b5a664e667bef22caa77a3 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 13:34:12 +0100
Subject: Initial template cleanup

---
 pydis_site/templates/wiki/delete.html              |  8 ++--
 pydis_site/templates/wiki/deleted.html             |  4 +-
 pydis_site/templates/wiki/error.html               |  8 ++--
 .../templates/wiki/forms/markitup-admin.html       |  1 -
 pydis_site/templates/wiki/forms/markitup.html      |  1 -
 pydis_site/templates/wiki/forms/select.html        | 15 --------
 pydis_site/templates/wiki/forms/select_option.html |  1 -
 pydis_site/templates/wiki/forms/text.html          |  1 -
 pydis_site/templates/wiki/includes/modals.html     | 31 ---------------
 pydis_site/templates/wiki/includes/move_tree.html  | 16 --------
 pydis_site/templates/wiki/move.html                |  4 +-
 pydis_site/templates/wiki/permission_denied.html   |  4 +-
 .../wiki/plugins/notifications/menubaritem.html    | 25 ------------
 .../wiki/plugins/notifications/settings.html       | 44 ----------------------
 .../wiki/plugins/templatetags/article_list.html    | 20 ----------
 pydis_site/templates/wiki/view.html                |  9 -----
 16 files changed, 14 insertions(+), 178 deletions(-)
 delete mode 100644 pydis_site/templates/wiki/forms/markitup-admin.html
 delete mode 100644 pydis_site/templates/wiki/forms/markitup.html
 delete mode 100644 pydis_site/templates/wiki/forms/select.html
 delete mode 100644 pydis_site/templates/wiki/forms/select_option.html
 delete mode 100644 pydis_site/templates/wiki/forms/text.html
 delete mode 100644 pydis_site/templates/wiki/includes/modals.html
 delete mode 100644 pydis_site/templates/wiki/includes/move_tree.html
 delete mode 100644 pydis_site/templates/wiki/plugins/notifications/menubaritem.html
 delete mode 100644 pydis_site/templates/wiki/plugins/notifications/settings.html
 delete mode 100644 pydis_site/templates/wiki/plugins/templatetags/article_list.html
 delete mode 100644 pydis_site/templates/wiki/view.html

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 %}
-- 
cgit v1.2.3


From e0f837ddd8ff434b1ef3429f6a709263350194ce Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 14:12:28 +0100
Subject: Move JS into files

---
 pydis_site/static/js/wiki/create.js                | 13 ++++
 pydis_site/static/js/wiki/delete.js                |  1 +
 pydis_site/static/js/wiki/edit.js                  | 62 +++++++++++++++++++
 pydis_site/static/js/wiki/editor_sidebar.js        |  1 +
 pydis_site/static/js/wiki/history.js               | 12 ++++
 pydis_site/static/js/wiki/image_sidebar.js         | 32 ++++++++++
 pydis_site/static/js/wiki/links_sidebar.js         | 30 +++++++++
 pydis_site/static/js/wiki/move.js                  | 10 +++
 pydis_site/templates/wiki/create.html              | 17 +----
 pydis_site/templates/wiki/delete.html              |  6 +-
 pydis_site/templates/wiki/edit.html                | 72 +---------------------
 pydis_site/templates/wiki/history.html             | 15 +----
 .../templates/wiki/includes/editor_sidebar.html    |  6 +-
 pydis_site/templates/wiki/move.html                | 15 +----
 .../templates/wiki/plugins/images/sidebar.html     | 37 +----------
 .../templates/wiki/plugins/links/sidebar.html      | 41 ++++--------
 16 files changed, 186 insertions(+), 184 deletions(-)
 create mode 100644 pydis_site/static/js/wiki/create.js
 create mode 100644 pydis_site/static/js/wiki/delete.js
 create mode 100644 pydis_site/static/js/wiki/edit.js
 create mode 100644 pydis_site/static/js/wiki/editor_sidebar.js
 create mode 100644 pydis_site/static/js/wiki/history.js
 create mode 100644 pydis_site/static/js/wiki/image_sidebar.js
 create mode 100644 pydis_site/static/js/wiki/links_sidebar.js
 create mode 100644 pydis_site/static/js/wiki/move.js

diff --git a/pydis_site/static/js/wiki/create.js b/pydis_site/static/js/wiki/create.js
new file mode 100644
index 00000000..e02d75a3
--- /dev/null
+++ b/pydis_site/static/js/wiki/create.js
@@ -0,0 +1,13 @@
+//<![CDATA[
+(function($) {
+  $(document).ready(function (){
+    $("#id_title").keyup(function () {
+      var e = $("#id_slug")[0];
+      if(!e._changed) {
+        slug = URLify(this.value, 50);
+        e.value = slug;
+      }
+      });
+  });
+})(jQuery);
+//]]>
diff --git a/pydis_site/static/js/wiki/delete.js b/pydis_site/static/js/wiki/delete.js
new file mode 100644
index 00000000..91531137
--- /dev/null
+++ b/pydis_site/static/js/wiki/delete.js
@@ -0,0 +1 @@
+$('#id_revision').val('{{ article.current_revision.id }}');
diff --git a/pydis_site/static/js/wiki/edit.js b/pydis_site/static/js/wiki/edit.js
new file mode 100644
index 00000000..3c9c70a4
--- /dev/null
+++ b/pydis_site/static/js/wiki/edit.js
@@ -0,0 +1,62 @@
+$(document).ready(function() {
+  let article_edit_form = $("#article_edit_form");
+  let click_time = 0;
+
+  $("#article_edit_form :input").change(function() {
+     article_edit_form.data("changed",true);
+  });
+
+  if (article_edit_form.find(".alert-danger").length > 0 || article_edit_form.find(".has-error").length > 0 ) {
+    // Set the forms status as "changed" if there was a submission error
+    article_edit_form.data("changed",true);
+  }
+
+  window.onbeforeunload = confirmOnPageExit;
+
+  article_edit_form.on("submit", function (ev) {
+      now = Date.now();
+      elapsed = now-click_time;
+      click_time = now;
+      if (elapsed < 3000)
+          ev.preventDefault();
+      window.onbeforeunload = null;
+      return true;
+  });
+  $("#id_preview").click(function () {
+      open_modal("previewModal");
+      return true;
+  });
+  $("#id_preview_save_changes").on("click", function (ev) {
+      ev.preventDefault();
+      $("#id_save").trigger("click");
+  });
+});
+
+var confirmOnPageExit = function (e) {
+  if ($("#article_edit_form").data("changed")) {
+    e = e || window.event;
+    var message = "You have unsaved changes!";
+    // For IE6-8 and Firefox prior to version 4
+    if (e) {
+        e.returnValue = message;
+    }
+    // For Chrome, Safari, IE8+ and Opera 12+
+    return message;
+  } else {
+    // If the form hasn't been changed, don't display the pop-up
+    return;
+  }
+};
+
+$(document).ready( function() {
+  $('.sidebar-form').each(function () {
+    $(this).submit( function() {
+      this.unsaved_article_title.value = $('#id_title').val();
+      this.unsaved_article_content.value = $('#id_content').val();
+    });
+  });
+});
+
+$(document).ready(function() {
+  $("#id_revision").val('{{ article.current_revision.id }}');
+});
diff --git a/pydis_site/static/js/wiki/editor_sidebar.js b/pydis_site/static/js/wiki/editor_sidebar.js
new file mode 100644
index 00000000..0f17c109
--- /dev/null
+++ b/pydis_site/static/js/wiki/editor_sidebar.js
@@ -0,0 +1 @@
+bulmaAccordion.attach();
diff --git a/pydis_site/static/js/wiki/history.js b/pydis_site/static/js/wiki/history.js
new file mode 100644
index 00000000..1f71e911
--- /dev/null
+++ b/pydis_site/static/js/wiki/history.js
@@ -0,0 +1,12 @@
+function showPreviewModal(revision_id, action_url, change_revision_url) {
+  let iframe = $("#previewWindow");
+
+  iframe.attr("src", action_url + "?r=" + revision_id);
+
+  console.log(revision_id);
+  console.log(action_url + "?r=" + revision_id);
+  console.log(change_revision_url);
+
+  $('#previewModal .switch-to-revision').attr('href', change_revision_url);
+  open_modal('previewModal');
+}
diff --git a/pydis_site/static/js/wiki/image_sidebar.js b/pydis_site/static/js/wiki/image_sidebar.js
new file mode 100644
index 00000000..9ac9f79d
--- /dev/null
+++ b/pydis_site/static/js/wiki/image_sidebar.js
@@ -0,0 +1,32 @@
+$("#id_image_insert").click(function(e) {
+e.preventDefault();
+
+let image_id_element = document.getElementById("img_id"),
+    align_element = document.getElementById("img_align"),
+    size_element = document.getElementById("img_size"),
+    caption_element = document.getElementById("img_caption"),
+
+    editor = window.editors["id_content"];
+
+editor.insert_image_wiki(
+    image_id_element.value, align_element.value,
+    size_element.value, caption_element.value
+);
+
+$("#imgModal").removeClass("is-active");  // Close modal
+
+// Reset form
+image_id_element.value = 0;
+align_element.selectedIndex = 0;
+size_element.selectedIndex = 0;
+caption_element.value = "";
+});
+
+function insert_image(image_id) {
+document.getElementById("img_id").value = image_id;
+open_modal("imgModal");
+}
+
+function add_image(form) {
+  $(form).submit();
+}
diff --git a/pydis_site/static/js/wiki/links_sidebar.js b/pydis_site/static/js/wiki/links_sidebar.js
new file mode 100644
index 00000000..f50d968d
--- /dev/null
+++ b/pydis_site/static/js/wiki/links_sidebar.js
@@ -0,0 +1,30 @@
+$(document).ready(function() {
+  function search(query) {
+    query = encodeURIComponent(query);
+    return fetch(window.links_fetch_url + `?query=${query}`).then(function(response) {
+      return response.json();
+    }).then(function(data){
+      return data.map(function(element) {
+        return {label: element, value: element};
+      })
+    });
+  }
+
+  function selected(state) {
+    let value = state.value;
+    wikiInsertLink(value);
+    document.getElementById("page_title_input").value = "";
+  }
+
+  bulmahead("page_title_input", "page_title_menu", search, selected, 10);
+});
+
+function wikiInsertLink(value) {
+  let editor = window.editors["id_content"];
+
+  editor.insert_text(value);
+}
+
+function setFetchURL(url) {
+  window.links_fetch_url = url;
+}
diff --git a/pydis_site/static/js/wiki/move.js b/pydis_site/static/js/wiki/move.js
new file mode 100644
index 00000000..948917f6
--- /dev/null
+++ b/pydis_site/static/js/wiki/move.js
@@ -0,0 +1,10 @@
+$('#id_destination').after($('#dest_selector').remove());
+$('#id_destination').attr('type', 'hidden');
+$('#id_slug').val('{{ urlpath.slug }}');
+select_path('{{urlpath.parent.pk}}', '{{urlpath.parent}}');
+
+function select_path(path, title) {
+  $('#id_destination').val(path);
+  if (title == "(root)") title = "";
+  $('#dest_selector .dest_selector_title').html(title ? title : "&nbsp;&nbsp;/&nbsp;&nbsp;");
+}
diff --git a/pydis_site/templates/wiki/create.html b/pydis_site/templates/wiki/create.html
index 5cd5e292..5aaa017c 100644
--- a/pydis_site/templates/wiki/create.html
+++ b/pydis_site/templates/wiki/create.html
@@ -8,23 +8,10 @@
 
   {% addtoblock "js" %}
     <script type="text/javascript" src="{% static "admin/js/urlify.js" %}"></script>
-    <script type="text/javascript">
+
     {% if not create_form.slug.value %}
-    //<![CDATA[
-    (function($) {
-      $(document).ready(function (){
-        $("#id_title").keyup(function () {
-          var e = $("#id_slug")[0];
-          if(!e._changed) {
-            slug = URLify(this.value, 50);
-            e.value = slug;
-          }
-          });
-      });
-    })(jQuery);
-    //]]>
+      <script type="text/javascript" src="{% static "js/wiki/create.js" %}"></script>
     {% endif %}
-    </script>
   {% endaddtoblock %}
 
   {% include "wiki/includes/editormedia.html" %}
diff --git a/pydis_site/templates/wiki/delete.html b/pydis_site/templates/wiki/delete.html
index a7f837fe..f4ed9dd7 100644
--- a/pydis_site/templates/wiki/delete.html
+++ b/pydis_site/templates/wiki/delete.html
@@ -1,5 +1,5 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags sekizai_tags %}
+{% load wiki_tags sekizai_tags static %}
 
 
 {% block wiki_pagetitle %}Delete Article{% endblock %}
@@ -89,8 +89,6 @@
   {% endif %}
 
   {% addtoblock "js" %}
-  <script type="text/javascript">
-    $('#id_revision').val('{{ article.current_revision.id }}');
-  </script>
+  <script type="text/javascript" src="{% static "js/wiki/delete.js" %}"></script>
   {% endaddtoblock %}
 {% endblock %}
diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index c0cb8de6..8472d555 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -99,75 +99,5 @@
   </div>
 
   <script src="{% static "js/wiki/modal.js" %}" type="text/javascript"></script>
-
-  <script type="text/javascript">
-    {# I'm sorry this JS sucks, it came with the wiki, just stuck right in here. #}
-
-    $(document).ready(function() {
-      let article_edit_form = $("#article_edit_form");
-      let click_time = 0;
-
-      $("#article_edit_form :input").change(function() {
-         article_edit_form.data("changed",true);
-      });
-
-      if (article_edit_form.find(".alert-danger").length > 0 || article_edit_form.find(".has-error").length > 0 ) {
-        // Set the forms status as "changed" if there was a submission error
-        article_edit_form.data("changed",true);
-      }
-
-      window.onbeforeunload = confirmOnPageExit;
-
-      article_edit_form.on("submit", function (ev) {
-          now = Date.now();
-          elapsed = now-click_time;
-          click_time = now;
-          if (elapsed < 3000)
-              ev.preventDefault();
-          window.onbeforeunload = null;
-          return true;
-      });
-      $("#id_preview").click(function () {
-          open_modal("previewModal");
-          return true;
-      });
-      $("#id_preview_save_changes").on("click", function (ev) {
-          ev.preventDefault();
-          $("#id_save").trigger("click");
-      });
-    });
-
-    var confirmOnPageExit = function (e) {
-      if ($("#article_edit_form").data("changed")) {
-        e = e || window.event;
-        var message = "You have unsaved changes!";
-        // For IE6-8 and Firefox prior to version 4
-        if (e) {
-            e.returnValue = message;
-        }
-        // For Chrome, Safari, IE8+ and Opera 12+
-        return message;
-      } else {
-        // If the form hasn't been changed, don't display the pop-up
-        return;
-      }
-    };
-  </script>
-
-  <script type="text/javascript">
-    $(document).ready( function() {
-      $('.sidebar-form').each(function () {
-        $(this).submit( function() {
-          this.unsaved_article_title.value = $('#id_title').val();
-          this.unsaved_article_content.value = $('#id_content').val();
-        });
-      });
-    });
-  </script>
-
-  <script language="javascript">
-    $(document).ready(function() {
-      $("#id_revision").val('{{ article.current_revision.id }}');
-    });
-  </script>
+  <script src="{% static "js/wiki/edit.js" %}" type="text/javascript"></script>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/history.html b/pydis_site/templates/wiki/history.html
index 7946508e..6d609516 100644
--- a/pydis_site/templates/wiki/history.html
+++ b/pydis_site/templates/wiki/history.html
@@ -148,20 +148,7 @@
   </div>
 </form>
   <script src="{% static "js/wiki/modal.js" %}" type="text/javascript"></script>
-  <script type="text/javascript">
-    function showPreviewModal(revision_id, action_url, change_revision_url) {
-      let iframe = $("#previewWindow");
-
-      iframe.attr("src", action_url + "?r=" + revision_id);
-
-      console.log(revision_id);
-      console.log(action_url + "?r=" + revision_id);
-      console.log(change_revision_url);
-
-      $('#previewModal .switch-to-revision').attr('href', change_revision_url);
-      open_modal('previewModal');
-    }
-  </script>
+  <script src="{% static "js/wiki/history.js" %}" type="text/javascript"></script>
 
 {% endblock %}
 
diff --git a/pydis_site/templates/wiki/includes/editor_sidebar.html b/pydis_site/templates/wiki/includes/editor_sidebar.html
index 2eebb80f..5c24e74d 100644
--- a/pydis_site/templates/wiki/includes/editor_sidebar.html
+++ b/pydis_site/templates/wiki/includes/editor_sidebar.html
@@ -1,4 +1,4 @@
-{% load i18n sekizai_tags %}
+{% load i18n sekizai_tags static %}
 
 <section class="accordions">
 {% for plugin, plugin_form in sidebar %}
@@ -35,6 +35,4 @@
 {% endfor %}
 </section>
 
-<script type="application/javascript">
-  bulmaAccordion.attach();
-</script>
+<script type="application/javascript" src="{% static "js/wiki/editor_sidebar.js" %}"></script>
diff --git a/pydis_site/templates/wiki/move.html b/pydis_site/templates/wiki/move.html
index 0d5cec31..1d797e86 100644
--- a/pydis_site/templates/wiki/move.html
+++ b/pydis_site/templates/wiki/move.html
@@ -1,5 +1,5 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n sekizai_tags %}
+{% load wiki_tags i18n sekizai_tags static %}
 
 {% block wiki_pagetitle %}{% trans "Move" %}: {{ article.current_revision.title }}{% endblock %}
 
@@ -60,18 +60,7 @@
 
 {% addtoblock "js" %}
 
-  <script type="text/javascript">
-    $('#id_destination').after($('#dest_selector').remove());
-    $('#id_destination').attr('type', 'hidden');
-    $('#id_slug').val('{{ urlpath.slug }}');
-    select_path('{{urlpath.parent.pk}}', '{{urlpath.parent}}');
-
-    function select_path(path, title) {
-      $('#id_destination').val(path);
-      if (title == "(root)") title = "";
-      $('#dest_selector .dest_selector_title').html(title ? title : "&nbsp;&nbsp;/&nbsp;&nbsp;");
-    }
-  </script>
+  <script type="text/javascript" src="{% static "js/wiki/move.js" %}"></script>
 
 {% endaddtoblock %}
 
diff --git a/pydis_site/templates/wiki/plugins/images/sidebar.html b/pydis_site/templates/wiki/plugins/images/sidebar.html
index b4e58e6d..2aa77c9e 100644
--- a/pydis_site/templates/wiki/plugins/images/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/images/sidebar.html
@@ -1,4 +1,4 @@
-{% load i18n wiki_tags wiki_images_tags humanize wiki_thumbnails sekizai_tags %}
+{% load i18n wiki_tags wiki_images_tags humanize wiki_thumbnails sekizai_tags static %}
 
 {% with article|images_for_article as images %}
   {% if article|images_can_add:user %}
@@ -200,37 +200,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $("#id_image_insert").click(function(e) {
-    e.preventDefault();
-
-    let image_id_element = document.getElementById("img_id"),
-        align_element = document.getElementById("img_align"),
-        size_element = document.getElementById("img_size"),
-        caption_element = document.getElementById("img_caption"),
-
-        editor = window.editors["id_content"];
-
-    editor.insert_image_wiki(
-        image_id_element.value, align_element.value,
-        size_element.value, caption_element.value
-    );
-
-    $("#imgModal").removeClass("is-active");  // Close modal
-
-    // Reset form
-    image_id_element.value = 0;
-    align_element.selectedIndex = 0;
-    size_element.selectedIndex = 0;
-    caption_element.value = "";
-  });
-
-  function insert_image(image_id) {
-    document.getElementById("img_id").value = image_id;
-    open_modal("imgModal");
-  }
-
-  function add_image(form) {
-      $(form).submit();
-  }
-</script>
+<script type="text/javascript" src="{% static "js/wiki/image_sidebar.js" %}"></script>
diff --git a/pydis_site/templates/wiki/plugins/links/sidebar.html b/pydis_site/templates/wiki/plugins/links/sidebar.html
index fd948af1..d44e27fb 100644
--- a/pydis_site/templates/wiki/plugins/links/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/links/sidebar.html
@@ -37,35 +37,20 @@
 <pre>[Clickable text](http://example.com)</pre>
 
 {% addtoblock "js" %}
-  <script src="https://cdn.rawgit.com/mattmezza/bulmahead/master/dist/bulmahead.bundle.js"></script>
-
-  <script type="text/javascript">
-    $(document).ready(function() {
-      function search(query) {
-        query = encodeURIComponent(query);
-        return fetch(`{% url 'wiki:links_query_urlpath' path=urlpath.path article_id=article.id %}?query=${query}`).then(function(response) {
-          return response.json();
-        }).then(function(data){
-          return data.map(function(element) {
-            return {label: element, value: element};
-          })
-        });
-      }
-
-      function selected(state) {
-        let value = state.value;
-        wikiInsertLink(value);
-        document.getElementById("page_title_input").value = "";
-      }
+  {% comment %}
+    So, for whatever reason, bulmahead doesn't have a LICENSE file. There is one in
+    the package.json, but that isn't a standard most projects adhere to - so I've
+    declined to include it within the project directly.
 
-      bulmahead("page_title_input", "page_title_menu", search, selected, 10);
-    });
+    The package.json states MIT - but there is no prose or license
+    text available for the project itself.
+  {% endcomment %}
 
-    function wikiInsertLink(value) {
-      let editor = window.editors["id_content"];
-
-      editor.insert_text(value);
-    }
+  <script src="https://cdn.rawgit.com/mattmezza/bulmahead/master/dist/bulmahead.bundle.js"></script>
+  <script src="{% static "js/wiki/links_sidebar.js" %}"></script>
 
-</script>
+  <script type="text/javascript">
+    {# If you figure out a way to do this without putting some JS directly in the page... let me know #}
+    setFetchURL("{% url 'wiki:links_query_urlpath' path=urlpath.path article_id=article.id %}");
+  </script>
 {% endaddtoblock %}
-- 
cgit v1.2.3


From 6bd4ba5359a8eddd07dddf24bf341eac362a324e Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 14:22:51 +0100
Subject: Continued cleanup

---
 pydis_site/apps/home/templatetags/wiki_extra.py | 50 ++++++++++++-------------
 pydis_site/static/js/wiki/delete.js             |  1 -
 pydis_site/static/js/wiki/edit.js               |  4 --
 pydis_site/static/js/wiki/move.js               |  2 -
 pydis_site/templates/wiki/delete.html           |  6 +--
 pydis_site/templates/wiki/edit.html             |  5 +++
 pydis_site/templates/wiki/move.html             |  6 ++-
 7 files changed, 35 insertions(+), 39 deletions(-)
 delete mode 100644 pydis_site/static/js/wiki/delete.js

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index 58612cc8..16539ded 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -19,34 +19,34 @@ TEMPLATE_PATH = "wiki/forms/fields/{0}.html"
 TEMPLATES = {
     BooleanField: TEMPLATE_PATH.format("boolean"),
     CharField: TEMPLATE_PATH.format("char"),
-    ChoiceField: TEMPLATE_PATH.format("choice"),
-    TypedChoiceField: TEMPLATE_PATH.format("typed_choice"),
-    DateField: TEMPLATE_PATH.format("date"),
-    DateTimeField: TEMPLATE_PATH.format("date_time"),
-    DecimalField: TEMPLATE_PATH.format("decimal"),
-    DurationField: TEMPLATE_PATH.format("duration"),
-    EmailField: TEMPLATE_PATH.format("email"),
-    FileField: TEMPLATE_PATH.format("file"),
-    FilePathField: TEMPLATE_PATH.format("file_path"),
-    FloatField: TEMPLATE_PATH.format("float"),
+    ChoiceField: TEMPLATE_PATH.format("in_place_render"),
+    TypedChoiceField: TEMPLATE_PATH.format("in_place_render"),
+    DateField: TEMPLATE_PATH.format("in_place_render"),
+    DateTimeField: TEMPLATE_PATH.format("in_place_render"),
+    DecimalField: TEMPLATE_PATH.format("in_place_render"),
+    DurationField: TEMPLATE_PATH.format("in_place_render"),
+    EmailField: TEMPLATE_PATH.format("in_place_render"),
+    FileField: TEMPLATE_PATH.format("in_place_render"),
+    FilePathField: TEMPLATE_PATH.format("in_place_render"),
+    FloatField: TEMPLATE_PATH.format("in_place_render"),
     ImageField: TEMPLATE_PATH.format("image"),
-    IntegerField: TEMPLATE_PATH.format("integer"),
-    GenericIPAddressField: TEMPLATE_PATH.format("generic_ip_address"),
-    MultipleChoiceField: TEMPLATE_PATH.format("multiple_choice"),
-    TypedMultipleChoiceField: TEMPLATE_PATH.format("typed_multiple_choice"),
-    NullBooleanField: TEMPLATE_PATH.format("null_boolean"),
-    RegexField: TEMPLATE_PATH.format("regex"),
-    SlugField: TEMPLATE_PATH.format("slug"),
-    TimeField: TEMPLATE_PATH.format("time"),
-    URLField: TEMPLATE_PATH.format("url"),
-    UUIDField: TEMPLATE_PATH.format("uuid"),
-
-    ComboField: TEMPLATE_PATH.format("combo"),
-    MultiValueField: TEMPLATE_PATH.format("multi_value"),
-    SplitDateTimeField: TEMPLATE_PATH.format("split_date_time"),
+    IntegerField: TEMPLATE_PATH.format("in_place_render"),
+    GenericIPAddressField: TEMPLATE_PATH.format("in_place_render"),
+    MultipleChoiceField: TEMPLATE_PATH.format("in_place_render"),
+    TypedMultipleChoiceField: TEMPLATE_PATH.format("in_place_render"),
+    NullBooleanField: TEMPLATE_PATH.format("in_place_render"),
+    RegexField: TEMPLATE_PATH.format("in_place_render"),
+    SlugField: TEMPLATE_PATH.format("in_place_render"),
+    TimeField: TEMPLATE_PATH.format("in_place_render"),
+    URLField: TEMPLATE_PATH.format("in_place_render"),
+    UUIDField: TEMPLATE_PATH.format("in_place_render"),
+
+    ComboField: TEMPLATE_PATH.format("in_place_render"),
+    MultiValueField: TEMPLATE_PATH.format("in_place_render"),
+    SplitDateTimeField: TEMPLATE_PATH.format("in_place_render"),
 
     ModelChoiceField: TEMPLATE_PATH.format("model_choice"),
-    ModelMultipleChoiceField: TEMPLATE_PATH.format("model_multiple_choice"),
+    ModelMultipleChoiceField: TEMPLATE_PATH.format("in_place_render"),
 
     SettingsModelChoiceField: TEMPLATE_PATH.format("model_choice"),
     WikiSlugField: TEMPLATE_PATH.format("wiki_slug_render"),
diff --git a/pydis_site/static/js/wiki/delete.js b/pydis_site/static/js/wiki/delete.js
deleted file mode 100644
index 91531137..00000000
--- a/pydis_site/static/js/wiki/delete.js
+++ /dev/null
@@ -1 +0,0 @@
-$('#id_revision').val('{{ article.current_revision.id }}');
diff --git a/pydis_site/static/js/wiki/edit.js b/pydis_site/static/js/wiki/edit.js
index 3c9c70a4..0af44431 100644
--- a/pydis_site/static/js/wiki/edit.js
+++ b/pydis_site/static/js/wiki/edit.js
@@ -56,7 +56,3 @@ $(document).ready( function() {
     });
   });
 });
-
-$(document).ready(function() {
-  $("#id_revision").val('{{ article.current_revision.id }}');
-});
diff --git a/pydis_site/static/js/wiki/move.js b/pydis_site/static/js/wiki/move.js
index 948917f6..ddab06f5 100644
--- a/pydis_site/static/js/wiki/move.js
+++ b/pydis_site/static/js/wiki/move.js
@@ -1,7 +1,5 @@
 $('#id_destination').after($('#dest_selector').remove());
 $('#id_destination').attr('type', 'hidden');
-$('#id_slug').val('{{ urlpath.slug }}');
-select_path('{{urlpath.parent.pk}}', '{{urlpath.parent}}');
 
 function select_path(path, title) {
   $('#id_destination').val(path);
diff --git a/pydis_site/templates/wiki/delete.html b/pydis_site/templates/wiki/delete.html
index f4ed9dd7..755e8d7a 100644
--- a/pydis_site/templates/wiki/delete.html
+++ b/pydis_site/templates/wiki/delete.html
@@ -41,7 +41,7 @@
     {% endif %}
 
     {% if delete_children %}
-      <div class="message">
+      <div class="message is-danger">
         <div class="message-body">
           <p>
             You are deleting an article with children. If you delete this article, then its children will also be deleted.
@@ -87,8 +87,4 @@
       </form>
     {% endif %}
   {% endif %}
-
-  {% addtoblock "js" %}
-  <script type="text/javascript" src="{% static "js/wiki/delete.js" %}"></script>
-  {% endaddtoblock %}
 {% endblock %}
diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index 8472d555..622e98eb 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -100,4 +100,9 @@
 
   <script src="{% static "js/wiki/modal.js" %}" type="text/javascript"></script>
   <script src="{% static "js/wiki/edit.js" %}" type="text/javascript"></script>
+  <script type="text/javascript">
+    $(document).ready(function() {
+      $("#id_revision").val('{{ article.current_revision.id }}');
+    });
+  </script>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/move.html b/pydis_site/templates/wiki/move.html
index 1d797e86..6452ffa2 100644
--- a/pydis_site/templates/wiki/move.html
+++ b/pydis_site/templates/wiki/move.html
@@ -59,9 +59,11 @@
 </form>
 
 {% addtoblock "js" %}
-
   <script type="text/javascript" src="{% static "js/wiki/move.js" %}"></script>
-
+  <script type="text/javascript">
+    $('#id_slug').val('{{ urlpath.slug }}');
+    select_path('{{urlpath.parent.pk}}', '{{urlpath.parent}}');
+  </script>
 {% endaddtoblock %}
 
 {% endblock %}
-- 
cgit v1.2.3


From 94e0559bc45d7a1ef35f0850ab65474665b2a4ab Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 14:23:34 +0100
Subject: Settings: PARENT_HOST will be added to ALLOWED_HOSTS in debug mode

---
 pydis_site/settings.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index b938b36d..0bd4957b 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -202,6 +202,11 @@ DEFAULT_HOST = 'home'
 
 if DEBUG:
     PARENT_HOST = env('PARENT_HOST', default='pythondiscord.local:8000')
+
+    if ":" in PARENT_HOST:
+        ALLOWED_HOSTS.append(PARENT_HOST.split(":", 1)[0])
+    else:
+        ALLOWED_HOSTS.append(PARENT_HOST)
 else:
     PARENT_HOST = env('PARENT_HOST', default='pythondiscord.com')
 
-- 
cgit v1.2.3


From e43d5f97bb27d13bb75f22edd8fd2e19e2d22f8d Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 14:54:48 +0100
Subject: First testing attempt

---
 pydis_site/apps/home/tests.py                      |  9 -----
 pydis_site/apps/home/tests/__init__.py             |  0
 .../apps/home/tests/test_wiki_templatetags.py      | 39 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 9 deletions(-)
 delete mode 100644 pydis_site/apps/home/tests.py
 create mode 100644 pydis_site/apps/home/tests/__init__.py
 create mode 100644 pydis_site/apps/home/tests/test_wiki_templatetags.py

diff --git a/pydis_site/apps/home/tests.py b/pydis_site/apps/home/tests.py
deleted file mode 100644
index 54fac6e8..00000000
--- a/pydis_site/apps/home/tests.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from django.test import TestCase
-from django_hosts.resolvers import reverse
-
-
-class TestIndexReturns200(TestCase):
-    def test_index_returns_200(self):
-        url = reverse('index')
-        resp = self.client.get(url)
-        self.assertEqual(resp.status_code, 200)
diff --git a/pydis_site/apps/home/tests/__init__.py b/pydis_site/apps/home/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pydis_site/apps/home/tests/test_wiki_templatetags.py b/pydis_site/apps/home/tests/test_wiki_templatetags.py
new file mode 100644
index 00000000..af85339f
--- /dev/null
+++ b/pydis_site/apps/home/tests/test_wiki_templatetags.py
@@ -0,0 +1,39 @@
+from unittest.mock import Mock
+
+from django.test import TestCase
+from django.template import Template
+from wiki.models import URLPath as _URLPath
+
+
+URLPath = Mock(_URLPath)
+
+
+class TestURLPathFilter(TestCase):
+    TEMPLATE = Template(
+        """
+        {% load wiki_extra %}
+        {{ obj|render_urlpath }}
+        """
+    )
+
+    def test_str(self):
+        context = {"obj": "path"}
+        rendered = self.TEMPLATE.render(context)
+
+    def test_str_empty(self):
+        context = {"obj": ""}
+        rendered = self.TEMPLATE.render(context)
+
+    def test_urlpath(self):
+        url_path = URLPath()
+        url_path.path = None
+
+        context = {"obj": url_path}
+        rendered = self.TEMPLATE.render(context)
+
+    def test_urlpath_root(self):
+        url_path = URLPath()
+        url_path.path = "/path/"
+
+        context = {"obj": url_path}
+        rendered = self.TEMPLATE.render(context)
-- 
cgit v1.2.3


From 4664d705f2fcb3d152408cbf3915044d193d38dc Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 15:20:06 +0100
Subject: Wiki requires notification plugin, so we're stuck with it

---
 .../apps/home/tests/test_wiki_templatetags.py      | 24 ++++++++++++++--------
 pydis_site/settings.py                             |  1 +
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pydis_site/apps/home/tests/test_wiki_templatetags.py b/pydis_site/apps/home/tests/test_wiki_templatetags.py
index af85339f..5cd673bf 100644
--- a/pydis_site/apps/home/tests/test_wiki_templatetags.py
+++ b/pydis_site/apps/home/tests/test_wiki_templatetags.py
@@ -1,7 +1,7 @@
 from unittest.mock import Mock
 
 from django.test import TestCase
-from django.template import Template
+from django.template import Template, Context
 from wiki.models import URLPath as _URLPath
 
 
@@ -17,23 +17,31 @@ class TestURLPathFilter(TestCase):
     )
 
     def test_str(self):
-        context = {"obj": "path"}
-        rendered = self.TEMPLATE.render(context)
+        context = {"obj": "/path/"}
+        rendered = self.TEMPLATE.render(Context(context))
+
+        self.assertEqual(rendered.strip(), "/path/")
 
     def test_str_empty(self):
         context = {"obj": ""}
-        rendered = self.TEMPLATE.render(context)
+        rendered = self.TEMPLATE.render(Context(context))
+
+        self.assertEqual(rendered.strip(), "/")
 
     def test_urlpath(self):
         url_path = URLPath()
-        url_path.path = None
+        url_path.path = "/path/"
 
         context = {"obj": url_path}
-        rendered = self.TEMPLATE.render(context)
+        rendered = self.TEMPLATE.render(Context(context))
+
+        self.assertEqual(rendered.strip(), "/path/")
 
     def test_urlpath_root(self):
         url_path = URLPath()
-        url_path.path = "/path/"
+        url_path.path = None
 
         context = {"obj": url_path}
-        rendered = self.TEMPLATE.render(context)
+        rendered = self.TEMPLATE.render(Context(context))
+
+        self.assertEqual(rendered.strip(), "/")
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 0bd4957b..4ffb06a1 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -93,6 +93,7 @@ INSTALLED_APPS = [
     'wiki.plugins.images.apps.ImagesConfig',
     'wiki.plugins.links.apps.LinksConfig',
     'wiki.plugins.redlinks.apps.RedlinksConfig',
+    'wiki.plugins.notifications.apps.NotificationsConfig',  # Required for migrations
 ]
 
 MIDDLEWARE = [
-- 
cgit v1.2.3


From af7f04a21ca1a701a69e3b3c1e7b0f7c7bbb6b0b Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 16:08:10 +0100
Subject: Tests for templatetags

---
 pydis_site/apps/home/templatetags/wiki_extra.py    |  53 ++----
 .../apps/home/tests/test_wiki_templatetags.py      | 187 ++++++++++++++++++++-
 2 files changed, 195 insertions(+), 45 deletions(-)

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index 16539ded..a6861fd9 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -1,12 +1,8 @@
-from typing import Union
+from typing import Union, Dict, Type, Any
 
 from django import template
-from django.forms import (
-    BooleanField, BoundField, CharField, ChoiceField, ComboField, DateField, DateTimeField, DecimalField, DurationField,
-    EmailField, Field, FileField, FilePathField, FloatField, GenericIPAddressField, ImageField, IntegerField,
-    ModelChoiceField, ModelMultipleChoiceField, MultiValueField, MultipleChoiceField, NullBooleanField, RegexField,
-    SlugField, SplitDateTimeField, TimeField, TypedChoiceField, TypedMultipleChoiceField, URLField, UUIDField)
-from django.template import Template, Context
+from django.forms import BooleanField, BoundField, CharField, Field, ImageField, ModelChoiceField
+from django.template import Context
 from django.template.loader import get_template
 from django.utils.safestring import mark_safe
 from wiki.editors.markitup import MarkItUpWidget
@@ -16,38 +12,12 @@ from wiki.plugins.notifications.forms import SettingsModelChoiceField
 
 TEMPLATE_PATH = "wiki/forms/fields/{0}.html"
 
-TEMPLATES = {
+TEMPLATES: Dict[Type, str] = {
     BooleanField: TEMPLATE_PATH.format("boolean"),
     CharField: TEMPLATE_PATH.format("char"),
-    ChoiceField: TEMPLATE_PATH.format("in_place_render"),
-    TypedChoiceField: TEMPLATE_PATH.format("in_place_render"),
-    DateField: TEMPLATE_PATH.format("in_place_render"),
-    DateTimeField: TEMPLATE_PATH.format("in_place_render"),
-    DecimalField: TEMPLATE_PATH.format("in_place_render"),
-    DurationField: TEMPLATE_PATH.format("in_place_render"),
-    EmailField: TEMPLATE_PATH.format("in_place_render"),
-    FileField: TEMPLATE_PATH.format("in_place_render"),
-    FilePathField: TEMPLATE_PATH.format("in_place_render"),
-    FloatField: TEMPLATE_PATH.format("in_place_render"),
     ImageField: TEMPLATE_PATH.format("image"),
-    IntegerField: TEMPLATE_PATH.format("in_place_render"),
-    GenericIPAddressField: TEMPLATE_PATH.format("in_place_render"),
-    MultipleChoiceField: TEMPLATE_PATH.format("in_place_render"),
-    TypedMultipleChoiceField: TEMPLATE_PATH.format("in_place_render"),
-    NullBooleanField: TEMPLATE_PATH.format("in_place_render"),
-    RegexField: TEMPLATE_PATH.format("in_place_render"),
-    SlugField: TEMPLATE_PATH.format("in_place_render"),
-    TimeField: TEMPLATE_PATH.format("in_place_render"),
-    URLField: TEMPLATE_PATH.format("in_place_render"),
-    UUIDField: TEMPLATE_PATH.format("in_place_render"),
-
-    ComboField: TEMPLATE_PATH.format("in_place_render"),
-    MultiValueField: TEMPLATE_PATH.format("in_place_render"),
-    SplitDateTimeField: TEMPLATE_PATH.format("in_place_render"),
 
     ModelChoiceField: TEMPLATE_PATH.format("model_choice"),
-    ModelMultipleChoiceField: TEMPLATE_PATH.format("in_place_render"),
-
     SettingsModelChoiceField: TEMPLATE_PATH.format("model_choice"),
     WikiSlugField: TEMPLATE_PATH.format("wiki_slug_render"),
 }
@@ -56,13 +26,17 @@ TEMPLATES = {
 register = template.Library()
 
 
-def get_unbound_field(field: BoundField):
+def get_unbound_field(field: BoundField) -> Field:
     while isinstance(field, BoundField):
         field = field.field
 
     return field
 
 
+def render(template_path: str, context: Dict[str, Any]):
+    return mark_safe(get_template(template_path).render(context))
+
+
 @register.simple_tag
 def render_field(field: Field, render_labels: bool = True):
     if isinstance(field, BoundField):
@@ -73,16 +47,11 @@ def render_field(field: Field, render_labels: bool = True):
     if not isinstance(render_labels, bool):
         render_labels = True
 
-    template_path = TEMPLATES.get(unbound_field.__class__)
+    template_path = TEMPLATES.get(unbound_field.__class__, TEMPLATE_PATH.format("in_place_render"))
     is_markitup = isinstance(unbound_field.widget, MarkItUpWidget)
-
-    if not template_path:
-        raise NotImplementedError(f"Unknown field type: {unbound_field.__class__}")
-
-    template_obj: Template = get_template(template_path)
     context = {"field": field, "is_markitup": is_markitup, "render_labels": render_labels}
 
-    return mark_safe(template_obj.render(context))
+    return render(template_path, context)
 
 
 @register.simple_tag(takes_context=True)
diff --git a/pydis_site/apps/home/tests/test_wiki_templatetags.py b/pydis_site/apps/home/tests/test_wiki_templatetags.py
index 5cd673bf..6399c0b6 100644
--- a/pydis_site/apps/home/tests/test_wiki_templatetags.py
+++ b/pydis_site/apps/home/tests/test_wiki_templatetags.py
@@ -1,9 +1,14 @@
-from unittest.mock import Mock
+from unittest.mock import Mock, create_autospec
 
+from django.forms import BooleanField, BoundField, CharField, ChoiceField, Field, Form, ImageField, ModelChoiceField
+from django.template import Context, Template
 from django.test import TestCase
-from django.template import Template, Context
-from wiki.models import URLPath as _URLPath
+from wiki.editors.markitup import MarkItUpWidget
+from wiki.forms import WikiSlugField
+from wiki.models import Article, URLPath as _URLPath
+from wiki.plugins.notifications.forms import SettingsModelChoiceField
 
+from pydis_site.apps.home.templatetags import wiki_extra
 
 URLPath = Mock(_URLPath)
 
@@ -45,3 +50,179 @@ class TestURLPathFilter(TestCase):
         rendered = self.TEMPLATE.render(Context(context))
 
         self.assertEqual(rendered.strip(), "/")
+
+
+class TestRenderField(TestCase):
+    TEMPLATE = Template(
+        """
+        {% load wiki_extra %}
+        {% render_field field %}
+        """
+    )
+
+    TEMPLATE_NO_LABELS = Template(
+        """
+        {% load wiki_extra %}
+        {% render_field field render_labels=False %}
+        """
+    )
+
+    TEMPLATE_LABELS_NOT_BOOLEAN = Template(
+        """
+        {% load wiki_extra %}
+        {% render_field field render_labels="" %}
+        """
+    )
+
+    def test_bound_field(self):
+        unbound_field = Field()
+        field = BoundField(Form(), unbound_field, "field")
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
+
+    def test_bound_field_no_labels(self):
+        unbound_field = Field()
+        field = BoundField(Form(), unbound_field, "field")
+
+        context = Context({"field": field})
+        self.TEMPLATE_NO_LABELS.render(context)
+
+    def test_bound_field_labels_not_boolean(self):
+        unbound_field = Field()
+        field = BoundField(Form(), unbound_field, "field")
+
+        context = Context({"field": field})
+        self.TEMPLATE_LABELS_NOT_BOOLEAN.render(context)
+
+    def test_unbound_field(self):
+        field = Field()
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
+
+    def test_unbound_field_no_labels(self):
+        field = Field()
+
+        context = Context({"field": field})
+        self.TEMPLATE_NO_LABELS.render(context)
+
+    def test_unbound_field_labels_not_boolean(self):
+        field = Field()
+
+        context = Context({"field": field})
+        self.TEMPLATE_LABELS_NOT_BOOLEAN.render(context)
+
+
+class TestRenderFieldTypes(TestCase):
+    TEMPLATE = Template(
+        """
+        {% load wiki_extra %}
+        {% render_field field %}
+        """
+    )
+
+    @classmethod
+    def setUpClass(cls):
+        cls._wiki_extra_render = wiki_extra.render
+        wiki_extra.render = create_autospec(wiki_extra.render, return_value="")
+
+    @classmethod
+    def tearDownClass(cls):
+        wiki_extra.render = cls._wiki_extra_render
+        del cls._wiki_extra_render
+
+    def test_field_boolean(self):
+        field = BooleanField()
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
+
+        template_path = "wiki/forms/fields/boolean.html"
+        context = {"field": field, "is_markitup": False, "render_labels": True}
+
+        wiki_extra.render.assert_called_with(template_path, context)
+
+    def test_field_char(self):
+        field = CharField()
+        field.widget = None
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
+
+        template_path = "wiki/forms/fields/char.html"
+        context = {"field": field, "is_markitup": False, "render_labels": True}
+
+        wiki_extra.render.assert_called_with(template_path, context)
+
+    def test_field_char_markitup(self):
+        field = CharField()
+        field.widget = MarkItUpWidget()
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
+
+        template_path = "wiki/forms/fields/char.html"
+        context = {"field": field, "is_markitup": True, "render_labels": True}
+
+        wiki_extra.render.assert_called_with(template_path, context)
+
+    def test_field_image(self):
+        field = ImageField()
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
+
+        template_path = "wiki/forms/fields/image.html"
+        context = {"field": field, "is_markitup": False, "render_labels": True}
+
+        wiki_extra.render.assert_called_with(template_path, context)
+
+    def test_field_model_choice(self):
+        field = ModelChoiceField(Article.objects.all())
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
+
+        template_path = "wiki/forms/fields/model_choice.html"
+        context = {"field": field, "is_markitup": False, "render_labels": True}
+
+        wiki_extra.render.assert_called_with(template_path, context)
+
+    def test_field_settings_model_choice(self):
+        field = SettingsModelChoiceField(Article.objects.all())
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
+
+        template_path = "wiki/forms/fields/model_choice.html"
+        context = {"field": field, "is_markitup": False, "render_labels": True}
+
+        wiki_extra.render.assert_called_with(template_path, context)
+
+    def test_field_wiki_slug(self):
+        field = WikiSlugField()
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
+
+        template_path = "wiki/forms/fields/wiki_slug_render.html"
+        context = {"field": field, "is_markitup": False, "render_labels": True}
+
+        wiki_extra.render.assert_called_with(template_path, context)
+
+
+class TestGetFieldOptions(TestCase):
+    TEMPLATE = Template(
+        """
+        {% load wiki_extra %}
+        {% get_field_options field %}
+        """
+    )
+
+    def test_get_field_options(self):
+        unbound_field = ChoiceField()
+        field = BoundField(Form(), unbound_field, "field")
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
-- 
cgit v1.2.3


From 14e98f1e790c85e761c9ead44160ac1174f808d2 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 17:59:55 +0100
Subject: Lint and update django-simple-bulma

---
 Pipfile                                            |  2 +-
 Pipfile.lock                                       | 77 +++++++++++-----------
 pydis_site/apps/home/templatetags/wiki_extra.py    |  4 +-
 .../apps/home/tests/test_wiki_templatetags.py      |  5 +-
 pydis_site/apps/home/urls.py                       |  2 +-
 pydis_site/settings.py                             |  8 +--
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/Pipfile b/Pipfile
index c6f210ab..d45db4d5 100644
--- a/Pipfile
+++ b/Pipfile
@@ -25,7 +25,7 @@ djangorestframework = "~=3.9.2"
 djangorestframework-bulk = "~=0.2.1"
 uwsgi = "~=2.0.18"
 psycopg2-binary = "~=2.8"
-django-simple-bulma = ">=1.1.6,<2.0"
+django-simple-bulma = ">=1.1.7,<2.0"
 django-crispy-bulma = ">=0.1.2,<2.0"
 wiki = "~=0.4.4"
 pygments = "~=2.3.1"
diff --git a/Pipfile.lock b/Pipfile.lock
index 777dbd38..071c3887 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "d6bbf11476ca021d14ef03475ef6154b148d75a3ceada522194a56e80a27ccf1"
+            "sha256": "3e41d1f5aeff03b49de55ef5086b975ecb0f74341870622237e553e7a1190116"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -101,18 +101,17 @@
         },
         "django-sekizai": {
             "hashes": [
-                "sha256:39c5d16ad694aa78278ca84fdc7b9f953ebcf94e2fc95b68c875d02014303260",
-                "sha256:cbd48e7be29e8cc4108476b9420d7c391fc509a504bc20b60616b116ba6ea51e"
+                "sha256:642a3356fe92fe9b5ccc97f320b64edd2cfcb3b2fbb113e8a26dad9a1f3b5e14"
             ],
-            "version": "==0.10.0"
+            "version": "==1.0.0"
         },
         "django-simple-bulma": {
             "hashes": [
-                "sha256:420042e26dd4bc70b148fc721bd77a48130b62b3d91b977e56f8232a4cfac555",
-                "sha256:beb323aa1c51e5efee398b6e5a2b481b31a0be7505e3118d140c65349f637100"
+                "sha256:7dcc04a11b5a3aefb6ec57cb211c161df8421ea333638e03c9e7db87465fead2",
+                "sha256:f4bb4833c3272ec49e4901a53254de8e8d267da48b88f6f79af4c32f9f70c504"
             ],
             "index": "pypi",
-            "version": "==1.1.6"
+            "version": "==1.1.7"
         },
         "djangorestframework": {
             "hashes": [
@@ -197,37 +196,37 @@
         },
         "psycopg2-binary": {
             "hashes": [
-                "sha256:163d3ee445a0b4c0109877da9e46271aacf4e5e3d60ae7368669555c30f13e7c",
-                "sha256:1af0bfe7b0c13a0e613a27311fd4f9c5d024e8fc0f4b3d284e7df02a58a11fc0",
-                "sha256:2169c3a1bf52d5b30cc98625b5919a964c571a32e8646be20be6c7e3e82079de",
-                "sha256:218f079fa48e2ef812dc3d3ce6ec2f67ac56427ba4b038d5d6331f2cceb489c2",
-                "sha256:26a958930687e94c4c6c73c171e4d4783b82ae4e16aa3424e6bcd4529bceedf0",
-                "sha256:2c7c195aef3acdbc853942bc674844031a732890d2fee88a324298ed376b6c2b",
-                "sha256:2ecdbfed7004669472bfa27c8d51012c717c241c7154ae17e4c8f93024043525",
-                "sha256:345fc31b71a90ada1b51826537917b19a1af685a91c0f066787069c184d7d00f",
-                "sha256:378a06649503f548be5f1e9eec2e94cc1d6138250b82a08dcc6151bca8cec107",
-                "sha256:3f300bf2930e501dde09605de85cb2b84c2638e2c954be02a3c86f28176d3525",
-                "sha256:6c2f66c653ce8bbd7e789d0f7f92c3f9fea881b55226f0ae5ee550cce9e3cf0e",
-                "sha256:6fccbac2633831b877a8fbf865f7082d34895e82a015795a9f80f99a2efe2576",
-                "sha256:7a166f8ccb6888358d3e67795b057540ea7caa71ab9e089b0cb0097f01088965",
-                "sha256:8f6b84f887ec6fef6c1796779f8ec2603dc7e9ef52bc9269de719d4bcbdaebbb",
-                "sha256:92cf3ceb7bb90cf35b8bd993c640b15d4832ba0e142a3b9da5006ef217da595d",
-                "sha256:a20dfdf73f56da674926a3811929cff9fd23b9af90be9a6c36ac246a3486eef3",
-                "sha256:a84415df4689251556c961e4fe3b25d30e32f00faa8064ce0909458dbe0d67b2",
-                "sha256:ab1aa1cd50df3860f624c9713ee9e690eefd4e049d3a4d86577bab6e741e9616",
-                "sha256:abc9dcf85e75a8687f2a6d560c0c1a2593e8e34ba6f9ad6721f8212c5de179a2",
-                "sha256:c10454710a81a2f4b1ff4d1c83ac2cec63e0e55845a56324991514af5b1299d0",
-                "sha256:c38f80719e4dfae7a6311a4f091f07f4fb2fb5d602352015d5639f63f8fabb68",
-                "sha256:d75cf00605630b2cfefa5c62373c605dcda1cc0d607902847dbb8e8e9b67c1ce",
-                "sha256:dce15cb6ef604c9e38fdaa848f58f83153ade9f4aa5e4cf5812aa27163561750",
-                "sha256:e7e0db4311bb76bf3f6e0380f71912cfa6d0be7cc635e3772476050b0dabdabd",
-                "sha256:eac59cae78dfe3fbf7ece25c170d7a152f88df7643381aa5e7344c2028a8d8d4",
-                "sha256:ead7b3e1567bd14cacd44279c5e42cd19f54b9feed39180220253f4fbe3abd56",
-                "sha256:ed772a5e8e7e5dd6bede960a86940c17cf653c7f158dafa5d52e919b676f10ba",
-                "sha256:f2d73131acb94afa45de8b6b8a4bfb21bbe3736633d6478e53247f19dd8c299c"
+                "sha256:007ca0df127b1862fc010125bc4100b7a630efc6841047bd11afceadb4754611",
+                "sha256:03c49e02adf0b4d68f422fdbd98f7a7c547beb27e99a75ed02298f85cb48406a",
+                "sha256:0a1232cdd314e08848825edda06600455ad2a7adaa463ebfb12ece2d09f3370e",
+                "sha256:131c80d0958c89273d9720b9adf9df1d7600bb3120e16019a7389ab15b079af5",
+                "sha256:2de34cc3b775724623f86617d2601308083176a495f5b2efc2bbb0da154f483a",
+                "sha256:2eddc31500f73544a2a54123d4c4b249c3c711d31e64deddb0890982ea37397a",
+                "sha256:484f6c62bdc166ee0e5be3aa831120423bf399786d1f3b0304526c86180fbc0b",
+                "sha256:4c2d9369ed40b4a44a8ccd6bc3a7db6272b8314812d2d1091f95c4c836d92e06",
+                "sha256:70f570b5fa44413b9f30dbc053d17ef3ce6a4100147a10822f8662e58d473656",
+                "sha256:7a2b5b095f3bd733aab101c89c0e1a3f0dfb4ebdc26f6374805c086ffe29d5b2",
+                "sha256:804914a669186e2843c1f7fbe12b55aad1b36d40a28274abe6027deffad9433d",
+                "sha256:8520c03172da18345d012949a53617a963e0191ccb3c666f23276d5326af27b5",
+                "sha256:90da901fc33ea393fc644607e4a3916b509387e9339ec6ebc7bfded45b7a0ae9",
+                "sha256:a582416ad123291a82c300d1d872bdc4136d69ad0b41d57dc5ca3df7ef8e3088",
+                "sha256:ac8c5e20309f4989c296d62cac20ee456b69c41fd1bc03829e27de23b6fa9dd0",
+                "sha256:b2cf82f55a619879f8557fdaae5cec7a294fac815e0087c4f67026fdf5259844",
+                "sha256:b59d6f8cfca2983d8fdbe457bf95d2192f7b7efdb2b483bf5fa4e8981b04e8b2",
+                "sha256:be08168197021d669b9964bd87628fa88f910b1be31e7010901070f2540c05fd",
+                "sha256:be0f952f1c365061041bad16e27e224e29615d4eb1fb5b7e7760a1d3d12b90b6",
+                "sha256:c1c9a33e46d7c12b9c96cf2d4349d783e3127163fd96254dcd44663cf0a1d438",
+                "sha256:d18c89957ac57dd2a2724ecfe9a759912d776f96ecabba23acb9ecbf5c731035",
+                "sha256:d7e7b0ff21f39433c50397e60bf0995d078802c591ca3b8d99857ea18a7496ee",
+                "sha256:da0929b2bf0d1f365345e5eb940d8713c1d516312e010135b14402e2a3d2404d",
+                "sha256:de24a4962e361c512d3e528ded6c7480eab24c655b8ca1f0b761d3b3650d2f07",
+                "sha256:e45f93ff3f7dae2202248cf413a87aeb330821bf76998b3cf374eda2fc893dd7",
+                "sha256:f046aeae1f7a845041b8661bb7a52449202b6c5d3fb59eb4724e7ca088811904",
+                "sha256:f1dc2b7b2748084b890f5d05b65a47cd03188824890e9a60818721fd492249fb",
+                "sha256:fcbe7cf3a786572b73d2cd5f34ed452a5f5fac47c9c9d1e0642c457a148f9f88"
             ],
             "index": "pypi",
-            "version": "==2.8.1"
+            "version": "==2.8.2"
         },
         "pygments": {
             "hashes": [
@@ -239,10 +238,10 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:32b0891edff07e28efe91284ed9c31e123d84bea3fd98e1f72be2508f43ef8d9",
-                "sha256:d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c"
+                "sha256:303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda",
+                "sha256:d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141"
             ],
-            "version": "==2018.9"
+            "version": "==2019.1"
         },
         "six": {
             "hashes": [
diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index a6861fd9..9847ef5a 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -1,4 +1,4 @@
-from typing import Union, Dict, Type, Any
+from typing import Any, Dict, Type, Union
 
 from django import template
 from django.forms import BooleanField, BoundField, CharField, Field, ImageField, ModelChoiceField
@@ -34,7 +34,7 @@ def get_unbound_field(field: BoundField) -> Field:
 
 
 def render(template_path: str, context: Dict[str, Any]):
-    return mark_safe(get_template(template_path).render(context))
+    return mark_safe(get_template(template_path).render(context))  # noqa: S703 S308
 
 
 @register.simple_tag
diff --git a/pydis_site/apps/home/tests/test_wiki_templatetags.py b/pydis_site/apps/home/tests/test_wiki_templatetags.py
index 6399c0b6..201d3df4 100644
--- a/pydis_site/apps/home/tests/test_wiki_templatetags.py
+++ b/pydis_site/apps/home/tests/test_wiki_templatetags.py
@@ -1,6 +1,9 @@
 from unittest.mock import Mock, create_autospec
 
-from django.forms import BooleanField, BoundField, CharField, ChoiceField, Field, Form, ImageField, ModelChoiceField
+from django.forms import (
+    BooleanField, BoundField, CharField, ChoiceField, Field, Form, ImageField,
+    ModelChoiceField
+)
 from django.template import Context, Template
 from django.test import TestCase
 from wiki.editors.markitup import MarkItUpWidget
diff --git a/pydis_site/apps/home/urls.py b/pydis_site/apps/home/urls.py
index 34ceda40..6d144aaa 100644
--- a/pydis_site/apps/home/urls.py
+++ b/pydis_site/apps/home/urls.py
@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.urls import path, include
+from django.urls import include, path
 from django.views.generic import TemplateView
 
 
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 4ffb06a1..c4c8a535 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -14,10 +14,8 @@ import os
 import sys
 
 import environ
-
 from django.contrib.messages import constants as messages
 
-
 env = environ.Env(
     DEBUG=(bool, False)
 )
@@ -190,10 +188,10 @@ MEDIA_URL = '/media/'
 MEDIA_ROOT = env('MEDIA_ROOT', default='media')
 
 STATICFILES_FINDERS = [
-  'django.contrib.staticfiles.finders.FileSystemFinder',
-  'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 
-  'django_simple_bulma.finders.SimpleBulmaFinder',
+    'django_simple_bulma.finders.SimpleBulmaFinder',
 ]
 
 # django-hosts
-- 
cgit v1.2.3


From e9b48dfc743b8d6b1d2c4c426a4b745802ae6ae3 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 18:18:22 +0100
Subject: Char input has placeholder, finish dir listing

---
 pydis_site/templates/wiki/dir.html               | 80 ++++++++++++++----------
 pydis_site/templates/wiki/forms/fields/char.html |  2 +
 2 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/pydis_site/templates/wiki/dir.html b/pydis_site/templates/wiki/dir.html
index 3a7e3edb..163a9d29 100644
--- a/pydis_site/templates/wiki/dir.html
+++ b/pydis_site/templates/wiki/dir.html
@@ -1,5 +1,5 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n humanize %}
+{% load wiki_tags wiki_extra i18n humanize %}
 
 
 {% block wiki_pagetitle %}{% trans "Listing articles in" %} {{ article.current_revision.title }}{% endblock %}
@@ -8,32 +8,35 @@
   {% url 'wiki:dir' urlpath.path as self_url %}
 
   <form class="form-search directory-toolbar">
-  <div class="well well-small">
-    <div class="btn-group pull-left">
-      {% if urlpath.parent %}
-      <a href="{% url 'wiki:dir' path=urlpath.parent.path %}" class="btn btn-default">
-        <span class="fa fa-arrow-up"></span>
-        {% trans "Up one level" %}
-      </a>
-      {% endif %}
-      <a href="{% url 'wiki:create' path=urlpath.path %}" class="btn btn-default">
-        <span class="fa fa-plus"></span>
-        {% trans "Add article" %}
-      </a>
+    <div class="is-pulled-right">
+      {% render_field filter_form.query render_labels=False %}
     </div>
-    <div class="pull-right">
-      {{ filter_form.query }}
-    </div>
-    {% if filter_query %}
-      <div class="pull-right filter-clear">
-        <a href="{{ self_url }}">({% trans "clear" %})</a>
+    <div class="field is-grouped">
+      <div class="field-body">
+        <div class="control">
+          {% if urlpath.parent %}
+            <a href="{% url 'wiki:dir' path=urlpath.parent.path %}" class="button">
+              <span class="icon">
+                <i class="fas fa-arrow-up"></i>
+              </span>
+              <span>Up one level</span>
+            </a>
+          {% endif %}
+        </div>
+        <div class="control">
+          <a href="{% url 'wiki:create' path=urlpath.path %}" class="button is-primary">
+            <span class="icon">
+              <i class="fas fa-plus"></i>
+            </span>
+            <span>Add Article</span>
+          </a>
+        </div>
       </div>
-    {% endif %}
-
-    <div class="clearfix"></div>
-  </div>
+    </div>
   </form>
 
+  <br />
+
   <p>
     {% with paginator.object_list.count as cnt %}
       {% blocktrans with urlpath.path as path and cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb trimmed %}
@@ -44,22 +47,33 @@
 
   {% include "wiki/includes/pagination.html" %}
 
-  <table class="table table-striped">
+  <table class="table is-striped">
     <tr>
-      <th>{% trans "Title" %}</th>
-      <th>{% trans "Slug" %}</th>
-      <th>{% trans "Last modified" %}</th>
+      <th>Title</th>
+      <th>Slug</th>
+      <th>Last modified</th>
     </tr>
     {% for urlpath in directory %}
       <tr>
         <td>
-          <a href="{% url 'wiki:get' path=urlpath.path %}"> {{ urlpath.article.current_revision.title }} </a>
-          <a href="{% url 'wiki:dir' path=urlpath.path %}" class="list-children"> › </a>
+          <a href="{% url 'wiki:get' path=urlpath.path %}">{{ urlpath.article.current_revision.title }}</a>
+
+          <a href="{% url 'wiki:dir' path=urlpath.path %}" class="list-children">
+            <span class="icon">
+              <i class="fas fa-arrow-right"></i>
+            </span>
+          </a>
+
           {% if urlpath.article.current_revision.deleted %}
-            <span class="fa fa-trash"></span>
+            <span class="icon tooltip" data-tooltip="This article has been deleted">
+              <i class="fas fa-trash"></i>
+            </span>
           {% endif %}
+
           {% if urlpath.article.current_revision.locked %}
-            <span class="fa fa-lock"></span>
+            <span class="icon tooltip" data-tooltip="This article is locked">
+              <i class="fas fa-lock"></i>
+            </span>
           {% endif %}
         </td>
         <td>
@@ -71,8 +85,8 @@
       </tr>
       {% empty%}
       <tr>
-        <td colspan="100">
-          <em>{% trans "There are no articles in this level" %}</em>
+        <td colspan="3">
+          <em>There are no articles at this level</em>
         </td>
       </tr>
     {% endfor %}
diff --git a/pydis_site/templates/wiki/forms/fields/char.html b/pydis_site/templates/wiki/forms/fields/char.html
index 83600dae..06e9f1b7 100644
--- a/pydis_site/templates/wiki/forms/fields/char.html
+++ b/pydis_site/templates/wiki/forms/fields/char.html
@@ -26,6 +26,7 @@
                     {% if field.required %}required{% endif %}
                     {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
                     {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
+                    {% if field.field.widget.attrs.placeholder %}placeholder="{{ field.field.widget.attrs.placeholderplaceholder }}"{% endif %}
                     {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
           >{% if field.value %}{{ field.value }}{% endif %}</textarea>
         {% else %}
@@ -37,6 +38,7 @@
                  {% if field.required %}required{% endif %}
                  {% if field.max_length %}maxlength="{{ field.max_length }}"{% endif %}
                  {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %}
+                 {% if field.field.widget.attrs.placeholder %}placeholder="{{ field.field.widget.attrs.placeholder }}"{% endif %}
                  {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %}
                  {% if field.value %}value="{{ field.value }}"{% endif %}
           />
-- 
cgit v1.2.3


From 95f58097c5a00243786e4a84f74f89d67f84adf8 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Fri, 19 Apr 2019 18:25:40 +0100
Subject: Update Pipfile.lock and move home app tests

---
 Pipfile.lock                                  | 38 +--------------------------
 pydis_site/apps/home/tests.py                 | 16 -----------
 pydis_site/apps/home/tests/test_app_basics.py | 16 +++++++++++
 3 files changed, 17 insertions(+), 53 deletions(-)
 delete mode 100644 pydis_site/apps/home/tests.py
 create mode 100644 pydis_site/apps/home/tests/test_app_basics.py

diff --git a/Pipfile.lock b/Pipfile.lock
index f076bb16..3d29dde8 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "3e41d1f5aeff03b49de55ef5086b975ecb0f74341870622237e553e7a1190116"
+            "sha256": "ae0a876a94064471b34aa7bfac7d64a589d43e1719690e043edacf3e30fb23fb"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -196,34 +196,6 @@
         },
         "psycopg2-binary": {
             "hashes": [
-                "sha256:163d3ee445a0b4c0109877da9e46271aacf4e5e3d60ae7368669555c30f13e7c",
-                "sha256:1af0bfe7b0c13a0e613a27311fd4f9c5d024e8fc0f4b3d284e7df02a58a11fc0",
-                "sha256:2169c3a1bf52d5b30cc98625b5919a964c571a32e8646be20be6c7e3e82079de",
-                "sha256:218f079fa48e2ef812dc3d3ce6ec2f67ac56427ba4b038d5d6331f2cceb489c2",
-                "sha256:26a958930687e94c4c6c73c171e4d4783b82ae4e16aa3424e6bcd4529bceedf0",
-                "sha256:2c7c195aef3acdbc853942bc674844031a732890d2fee88a324298ed376b6c2b",
-                "sha256:2ecdbfed7004669472bfa27c8d51012c717c241c7154ae17e4c8f93024043525",
-                "sha256:345fc31b71a90ada1b51826537917b19a1af685a91c0f066787069c184d7d00f",
-                "sha256:378a06649503f548be5f1e9eec2e94cc1d6138250b82a08dcc6151bca8cec107",
-                "sha256:3f300bf2930e501dde09605de85cb2b84c2638e2c954be02a3c86f28176d3525",
-                "sha256:6c2f66c653ce8bbd7e789d0f7f92c3f9fea881b55226f0ae5ee550cce9e3cf0e",
-                "sha256:6fccbac2633831b877a8fbf865f7082d34895e82a015795a9f80f99a2efe2576",
-                "sha256:7a166f8ccb6888358d3e67795b057540ea7caa71ab9e089b0cb0097f01088965",
-                "sha256:8f6b84f887ec6fef6c1796779f8ec2603dc7e9ef52bc9269de719d4bcbdaebbb",
-                "sha256:92cf3ceb7bb90cf35b8bd993c640b15d4832ba0e142a3b9da5006ef217da595d",
-                "sha256:a20dfdf73f56da674926a3811929cff9fd23b9af90be9a6c36ac246a3486eef3",
-                "sha256:a84415df4689251556c961e4fe3b25d30e32f00faa8064ce0909458dbe0d67b2",
-                "sha256:ab1aa1cd50df3860f624c9713ee9e690eefd4e049d3a4d86577bab6e741e9616",
-                "sha256:abc9dcf85e75a8687f2a6d560c0c1a2593e8e34ba6f9ad6721f8212c5de179a2",
-                "sha256:c10454710a81a2f4b1ff4d1c83ac2cec63e0e55845a56324991514af5b1299d0",
-                "sha256:c38f80719e4dfae7a6311a4f091f07f4fb2fb5d602352015d5639f63f8fabb68",
-                "sha256:d75cf00605630b2cfefa5c62373c605dcda1cc0d607902847dbb8e8e9b67c1ce",
-                "sha256:dce15cb6ef604c9e38fdaa848f58f83153ade9f4aa5e4cf5812aa27163561750",
-                "sha256:e7e0db4311bb76bf3f6e0380f71912cfa6d0be7cc635e3772476050b0dabdabd",
-                "sha256:eac59cae78dfe3fbf7ece25c170d7a152f88df7643381aa5e7344c2028a8d8d4",
-                "sha256:ead7b3e1567bd14cacd44279c5e42cd19f54b9feed39180220253f4fbe3abd56",
-                "sha256:ed772a5e8e7e5dd6bede960a86940c17cf653c7f158dafa5d52e919b676f10ba",
-                "sha256:f2d73131acb94afa45de8b6b8a4bfb21bbe3736633d6478e53247f19dd8c299c"
                 "sha256:007ca0df127b1862fc010125bc4100b7a630efc6841047bd11afceadb4754611",
                 "sha256:03c49e02adf0b4d68f422fdbd98f7a7c547beb27e99a75ed02298f85cb48406a",
                 "sha256:0a1232cdd314e08848825edda06600455ad2a7adaa463ebfb12ece2d09f3370e",
@@ -263,7 +235,6 @@
             ],
             "index": "pypi",
             "version": "==2.3.1"
-            "version": "==2.8.1"
         },
         "pytz": {
             "hashes": [
@@ -286,13 +257,6 @@
             ],
             "version": "==12.5.0"
         },
-        "uwsgi": {
-            "hashes": [
-                "sha256:4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583"
-            ],
-            "index": "pypi",
-            "version": "==2.0.18"
-        },
         "webencodings": {
             "hashes": [
                 "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
diff --git a/pydis_site/apps/home/tests.py b/pydis_site/apps/home/tests.py
deleted file mode 100644
index 733ddaa3..00000000
--- a/pydis_site/apps/home/tests.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.test import TestCase
-from django_hosts.resolvers import reverse
-
-from pydis_site.apps.home.templatetags import extra_filters
-
-
-class TestIndexReturns200(TestCase):
-    def test_index_returns_200(self):
-        url = reverse('home.index')
-        resp = self.client.get(url)
-        self.assertEqual(resp.status_code, 200)
-
-
-class TestExtraFilterTemplateTags(TestCase):
-    def test_starts_with(self):
-        self.assertTrue(extra_filters.starts_with('foo', 'f'))
diff --git a/pydis_site/apps/home/tests/test_app_basics.py b/pydis_site/apps/home/tests/test_app_basics.py
new file mode 100644
index 00000000..733ddaa3
--- /dev/null
+++ b/pydis_site/apps/home/tests/test_app_basics.py
@@ -0,0 +1,16 @@
+from django.test import TestCase
+from django_hosts.resolvers import reverse
+
+from pydis_site.apps.home.templatetags import extra_filters
+
+
+class TestIndexReturns200(TestCase):
+    def test_index_returns_200(self):
+        url = reverse('home.index')
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+
+
+class TestExtraFilterTemplateTags(TestCase):
+    def test_starts_with(self):
+        self.assertTrue(extra_filters.starts_with('foo', 'f'))
-- 
cgit v1.2.3


From bbeb451ac6750c526166db12080b1b6bc040c860 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 20 Apr 2019 14:32:53 +0100
Subject: Address reviews

---
 pydis_site/apps/home/templatetags/wiki_extra.py    |   7 +-
 pydis_site/settings.py                             |   5 +-
 pydis_site/static/js/wiki/dropdown.js              |   2 -
 pydis_site/templates/wiki/article.html             |   3 +-
 pydis_site/templates/wiki/base.html                |   7 +-
 pydis_site/templates/wiki/base_site.html           | 170 ---------------
 pydis_site/templates/wiki/create.html              |  11 +-
 pydis_site/templates/wiki/create_root.html         |   7 +-
 pydis_site/templates/wiki/delete.html              |   4 +-
 pydis_site/templates/wiki/deleted.html             |   4 +-
 pydis_site/templates/wiki/deleted_list.html        |   3 +-
 pydis_site/templates/wiki/dir.html                 |  15 +-
 pydis_site/templates/wiki/edit.html                |  17 +-
 pydis_site/templates/wiki/error.html               |   7 +-
 pydis_site/templates/wiki/history.html             | 227 +++++++++------------
 .../templates/wiki/includes/article_menu.html      |   2 +-
 pydis_site/templates/wiki/includes/editor.html     |   2 +-
 .../templates/wiki/includes/editor_sidebar.html    |  60 +++---
 .../templates/wiki/includes/editormedia.html       |  20 +-
 pydis_site/templates/wiki/includes/form.html       |   9 +-
 pydis_site/templates/wiki/includes/pagination.html |   1 +
 pydis_site/templates/wiki/includes/render.html     |   4 +-
 .../templates/wiki/includes/revision_info.html     |  18 +-
 .../templates/wiki/includes/searchresult.html      |  22 +-
 pydis_site/templates/wiki/move.html                |  73 +++----
 .../templates/wiki/plugins/images/index.html       |  28 ++-
 .../templates/wiki/plugins/images/purge.html       |   6 +-
 .../templates/wiki/plugins/images/render.html      |   2 +-
 .../wiki/plugins/images/revision_add.html          |   5 +-
 .../templates/wiki/plugins/images/sidebar.html     |   5 +-
 .../templates/wiki/plugins/links/sidebar.html      |   4 +-
 pydis_site/templates/wiki/preview_inline.html      |  20 +-
 pydis_site/templates/wiki/root_missing.html        |   3 +-
 pydis_site/templates/wiki/search.html              |   5 +-
 pydis_site/templates/wiki/settings.html            |  42 ++--
 pydis_site/templates/wiki/source.html              |   3 +-
 36 files changed, 325 insertions(+), 498 deletions(-)
 delete mode 100644 pydis_site/templates/wiki/base_site.html

diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index 9847ef5a..289b0279 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -26,7 +26,7 @@ TEMPLATES: Dict[Type, str] = {
 register = template.Library()
 
 
-def get_unbound_field(field: BoundField) -> Field:
+def get_unbound_field(field: Union[BoundField, Field]) -> Field:
     while isinstance(field, BoundField):
         field = field.field
 
@@ -39,10 +39,7 @@ def render(template_path: str, context: Dict[str, Any]):
 
 @register.simple_tag
 def render_field(field: Field, render_labels: bool = True):
-    if isinstance(field, BoundField):
-        unbound_field = get_unbound_field(field)
-    else:
-        unbound_field = field
+    unbound_field = get_unbound_field(field)
 
     if not isinstance(render_labels, bool):
         render_labels = True
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index c4c8a535..a9fef6b7 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -277,12 +277,11 @@ CRISPY_TEMPLATE_PACK = "bulma"
 # Custom settings for django-simple-bulma
 BULMA_SETTINGS = {
     "variables": {
+        "green": "#21c65c",  # Accessibility: Better contrast with the light text
         "primary": "#7289DA",
         "link": "$primary",
 
-        "green": "#21c65c",  # Better contrast with the light text
-
-        "dimensions": "16 24 32 48 64 96 128 256 512"  # Image dimensions
+        "dimensions": "16 24 32 48 64 96 128 256 512"  # Possible image dimensions
     }
 }
 
diff --git a/pydis_site/static/js/wiki/dropdown.js b/pydis_site/static/js/wiki/dropdown.js
index 55b2e9fc..a914a4ab 100644
--- a/pydis_site/static/js/wiki/dropdown.js
+++ b/pydis_site/static/js/wiki/dropdown.js
@@ -1,5 +1,3 @@
-// TODO: Move to django-simple-bulma
-
 (function() {
     window.dropdowns = {};
 
diff --git a/pydis_site/templates/wiki/article.html b/pydis_site/templates/wiki/article.html
index 39e1728d..890e4300 100644
--- a/pydis_site/templates/wiki/article.html
+++ b/pydis_site/templates/wiki/article.html
@@ -1,6 +1,5 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n sekizai_tags %}
-
+{% load wiki_tags %}
 
 {% block wiki_pagetitle %}{{ article.current_revision.title }}{% endblock %}
 
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index 112523cd..c47f6bfb 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -1,5 +1,6 @@
 {% extends "base/base.html" %}
-{% load sekizai_tags i18n wiki_tags static %}
+{% load static %}
+{% load wiki_tags %}
 
 {% block title %}
   Wiki | {% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %}{% endblock %}
@@ -41,7 +42,9 @@
   {% endblock %}
 
   {% block site_footer %}
-    {% include "base/footer.html" %}
+    {% block wiki_footer_prepend %}{% endblock %}
+
+    {{ block.super }}
   {% endblock %}
 
   <script src="{% static "js/wiki/dropdown.js" %}" type="text/javascript"></script>
diff --git a/pydis_site/templates/wiki/base_site.html b/pydis_site/templates/wiki/base_site.html
deleted file mode 100644
index afa2b41d..00000000
--- a/pydis_site/templates/wiki/base_site.html
+++ /dev/null
@@ -1,170 +0,0 @@
-{% extends "base/base.html" %}
-{% load sekizai_tags i18n wiki_tags static %}
-
-{# This template is no longer used - we can remove it later when the rest are done #}
-
-{% block title %}
-  {% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %} - django-\/\/  i K |{% endblock %}
-{% endblock %}
-
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Wiki | {% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %}{% endblock %}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="description" content="">
-    <meta name="author" content="www.django-wiki.org">
-
-    <!-- Le styles -->
-    <link href="{% static "wiki/bootstrap/css/wiki-bootstrap.min.css" %}" rel="stylesheet">
-
-    {% render_block "css" %}
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-  </head>
-
-  <body>
-
-    {% block wiki_body %}
-
-    {% block wiki_navbar %}
-    <div class="navbar navbar-fixed-top navbar-inverse">
-      <div class="container">
-        <div class="navbar-header">
-          <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          {% block wiki_header_branding %}
-          <a class="navbar-brand" href="{% url 'wiki:root' %}">django-\/\/ i K |</a>
-          {% endblock %}
-        </div>
-        <div class="navbar-collapse collapse">
-          <form class="navbar-form navbar-right" id="wiki-search-form" method="GET" action="{% spaceless %}
-              {% if article or urlpath %}
-                {% url 'wiki:search' article_id=article.id path=urlpath.path %}
-              {% else %}
-                {% url 'wiki:search' %}
-              {% endif %}
-            {% endspaceless %}"
-          >
-            <div class="input-group">
-              <input type="search" class="form-control search-query" name="q" placeholder="{% spaceless %}
-                {% if article or urlpath %}
-                   {% trans "Search from current article..." %}
-                {% else %}
-                  {% trans "Search whole wiki..." %}
-                {% endif %}
-              {% endspaceless %}" />
-              <span class="input-group-btn">
-                <button class="btn btn-default" type="submit">
-                  <span class="fa fa-search"></span>
-                </button>
-              </span>
-            </div><!-- /input-group -->
-          </form>
-          <div class="navbar-right">
-            {% if user.is_authenticated %}
-            <ul class="nav navbar-nav">
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                  <span class="badge notification-cnt">0</span>
-                  {{ user }}
-                  <b class="caret"></b>
-                </a>
-                <ul class="dropdown-menu">
-                  {% if "ACCOUNT_HANDLING"|wiki_settings %}
-                  <li>
-                    <a href="{% url 'wiki:profile_update' %}">
-                      <i class="fa fa-gear"></i>
-                      {% trans "Account Settings" %}
-                    </a>
-                  </li>
-                  {% endif %}
-                  <li>
-                    <a href="{{ "LOGOUT_URL"|wiki_settings }}">
-                      <i class="fa fa-power-off"></i>
-                      {% trans "Log out" %}
-                    </a>
-                  </li>
-                  {% if user.is_superuser %}
-                  <li>
-                    <a href="{% url 'wiki:deleted_list' %}">
-                      <i class="fa fa-trash-o"></i>
-                      {% trans "Deleted articles" %}
-                    </a>
-                  </li>
-                  {% endif %}
-                  {% if "wiki.plugins.notifications"|plugin_enabled %}
-                    {% include "wiki/plugins/notifications/menubaritem.html" %}
-                  {% endif %}
-                  {% if "wiki.plugins.globalhistory"|plugin_enabled %}
-                    {% include "wiki/plugins/globalhistory/menubaritem.html" %}
-                  {% endif %}
-                </ul>
-              </li>
-            </ul>
-            {% else %}
-            <ul class="nav navbar-nav">
-              <li>
-                <a href="{% login_url as wiki_login_url %}{{ wiki_login_url }}">{% trans "Log in" %}</a>
-              </li>
-              {% if "ACCOUNT_HANDLING"|wiki_settings %}
-              <li>
-                <a href="{% url 'wiki:signup' %}">{% trans "Sign up" %}</a>
-              </li>
-              {% endif %}
-            </ul>
-            {% endif %}
-          </div>
-          {% block wiki_header_navlinks %}
-          <ul class="nav navbar-nav">
-            <li class="active"><a href="/">{% trans "Home" %}</a></li>
-            <li><a href="https://github.com/django-wiki/django-wiki" target="_blank">{% trans "About" %}</a></li>
-          </ul>
-          {% endblock %}
-        </div>
-      </div>
-    </div>
-    {% endblock %}
-
-    <div class="container" style="margin-top: 60px;">
-
-      {% wiki_messages %}
-
-      <!-- Reserved for breadcrumbs -->
-      {% block wiki_breadcrumbs %}{% endblock %}
-
-      <!-- Main page contents go here -->
-      {% block wiki_contents %}{% endblock %}
-
-      <footer id="wiki-footer">
-        <hr />
-        {% block wiki_footer_logo %}
-        <a href="https://github.com/django-wiki/django-wiki" class="pull-right"><img src="{% static "wiki/img/github_icon.png" %}" /></a>
-        {% endblock %}
-        {% block wiki_footer_prepend %}
-        {% endblock %}
-        <p>{% blocktrans %}Powered by <a href="http://www.django-wiki.org">django-wiki</a>, an open source application under the <a href="http://www.gnu.org/licenses/quick-guide-gplv3.html">GPLv3</a> license. Let knowledge be the cure.{% endblocktrans %}</p>
-        <div style="clear: both"></div>
-      </footer>
-      </div>
-
-    {% endblock %}
-
-    <script src="{% static "wiki/js/jquery-3.3.1.min.js" %}"></script>
-    <script src="{% static "wiki/js/core.js" %}"></script>
-    <script src="{% static "wiki/bootstrap/js/bootstrap.min.js" %}"></script>
-    <!-- Optionally enable responsive features in IE8 -->
-    <script src="{% static "wiki/js/respond.min.js" %}"></script>
-    {% render_block "js" %}
-
-  </body>
-</html>
diff --git a/pydis_site/templates/wiki/create.html b/pydis_site/templates/wiki/create.html
index 5aaa017c..3fbba969 100644
--- a/pydis_site/templates/wiki/create.html
+++ b/pydis_site/templates/wiki/create.html
@@ -1,11 +1,11 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n sekizai_tags static %}
+{% load sekizai_tags %}
+{% load static %}
+{% load wiki_tags %}
 
-
-{% block wiki_pagetitle %}{% trans "Add new article" %}{% endblock %}
+{% block wiki_pagetitle %}Add new article{% endblock %}
 
 {% block wiki_contents %}
-
   {% addtoblock "js" %}
     <script type="text/javascript" src="{% static "admin/js/urlify.js" %}"></script>
 
@@ -15,7 +15,7 @@
   {% endaddtoblock %}
 
   {% include "wiki/includes/editormedia.html" %}
-  <h1 class="page-header">{% trans "Add new article" %}</h1>
+  <h1 class="page-header">Add new article</h1>
 
   <form method="POST" class="form-horizontal">
     {% wiki_form create_form %}
@@ -39,5 +39,4 @@
       </div>
     </div>
   </form>
-
 {% endblock %}
diff --git a/pydis_site/templates/wiki/create_root.html b/pydis_site/templates/wiki/create_root.html
index 376321c6..330fea33 100644
--- a/pydis_site/templates/wiki/create_root.html
+++ b/pydis_site/templates/wiki/create_root.html
@@ -1,7 +1,8 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags crispy_forms_tags i18n sekizai_tags static %}
+{% load static %}
+{% load wiki_tags %}
 
-{% block wiki_pagetitle %}{% trans "Create root article" %}{% endblock %}
+{% block wiki_pagetitle %}{Create root article{% endblock %}
 
 {% block head %}
   {{ block.super }}
@@ -17,7 +18,6 @@
   {% endfor %}
 {% endblock %}
 
-
 {% block wiki_contents %}
   <h2 class="title is-2">Create First Article</h2>
 
@@ -49,5 +49,4 @@
       </div>
     </div>
   </form>
-
 {% endblock %}
diff --git a/pydis_site/templates/wiki/delete.html b/pydis_site/templates/wiki/delete.html
index 755e8d7a..bb7a7966 100644
--- a/pydis_site/templates/wiki/delete.html
+++ b/pydis_site/templates/wiki/delete.html
@@ -1,6 +1,6 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags sekizai_tags static %}
-
+{% load static %}
+{% load wiki_tags %}
 
 {% block wiki_pagetitle %}Delete Article{% endblock %}
 
diff --git a/pydis_site/templates/wiki/deleted.html b/pydis_site/templates/wiki/deleted.html
index 75705cbb..cdde2c47 100644
--- a/pydis_site/templates/wiki/deleted.html
+++ b/pydis_site/templates/wiki/deleted.html
@@ -1,6 +1,5 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n sekizai_tags %}
-
+{% load wiki_tags %}
 
 {% block wiki_pagetitle %}Article deleted{% endblock %}
 
@@ -17,7 +16,6 @@
   </article>
 
   {% if not article.current_revision.locked or article|can_delete:user %}
-
     <h2 class="title is-2">
       Restore Article
     </h2>
diff --git a/pydis_site/templates/wiki/deleted_list.html b/pydis_site/templates/wiki/deleted_list.html
index 6ec2a8df..1a8d203c 100644
--- a/pydis_site/templates/wiki/deleted_list.html
+++ b/pydis_site/templates/wiki/deleted_list.html
@@ -1,5 +1,5 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags sekizai_tags %}
+{% load wiki_tags %}
 
 {% block wiki_pagetitle %}Deleted Articles{% endblock %}
 
@@ -15,6 +15,7 @@
           <th>Restore Article</th>
         </tr>
       </thead>
+
       <tbody>
         {% for article in deleted_articles %}
           <tr>
diff --git a/pydis_site/templates/wiki/dir.html b/pydis_site/templates/wiki/dir.html
index 163a9d29..5a30de7b 100644
--- a/pydis_site/templates/wiki/dir.html
+++ b/pydis_site/templates/wiki/dir.html
@@ -1,8 +1,10 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags wiki_extra i18n humanize %}
+{% load humanize %}
+{% load i18n %}
+{% load wiki_extra %}
+{% load wiki_tags %}
 
-
-{% block wiki_pagetitle %}{% trans "Listing articles in" %} {{ article.current_revision.title }}{% endblock %}
+{% block wiki_pagetitle %}Listing articles in {{ article.current_revision.title }}{% endblock %}
 
 {% block wiki_contents_tab %}
   {% url 'wiki:dir' urlpath.path as self_url %}
@@ -11,6 +13,7 @@
     <div class="is-pulled-right">
       {% render_field filter_form.query render_labels=False %}
     </div>
+
     <div class="field is-grouped">
       <div class="field-body">
         <div class="control">
@@ -53,6 +56,7 @@
       <th>Slug</th>
       <th>Last modified</th>
     </tr>
+
     {% for urlpath in directory %}
       <tr>
         <td>
@@ -76,14 +80,17 @@
             </span>
           {% endif %}
         </td>
+
         <td>
           {{ urlpath.slug }}
         </td>
+
         <td>
           {{ urlpath.article.current_revision.created|naturaltime }}
         </td>
       </tr>
-      {% empty%}
+
+      {% empty %}
       <tr>
         <td colspan="3">
           <em>There are no articles at this level</em>
diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html
index 622e98eb..c378362a 100644
--- a/pydis_site/templates/wiki/edit.html
+++ b/pydis_site/templates/wiki/edit.html
@@ -1,22 +1,13 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n sekizai_tags static %}
-
+{% load static %}
+{% load wiki_tags %}
 
 {% block wiki_pagetitle %}
   Edit: {{ article.current_revision.title }}
 {% endblock %}
 
 {% block wiki_contents_tab %}
-
-  {% if not user.is_authenticated %}
-    <p class="alert alert-warning">
-      {% trans "<strong>Warning:</strong> You are not logged in. Your IP address will be logged." %}
-      <a href="{% url 'wiki:login' %}?next={% url 'wiki:edit' article_id=article.id path=urlpath.path %}">{% trans "Click here to log in" %} &raquo;</a>
-    </p>
-  {% endif %}
-
   <div class="columns">
-
     <div class="column is-two-thirds">
       <form method="POST" class="form-horizontal" id="article_edit_form">
         {% with edit_form as form %}
@@ -60,18 +51,14 @@
 
         <br />
         <br />
-
       </form>
     </div>
 
     <div class="column is-one-third" id="wiki-edit-sidebar">
       {% include "wiki/includes/editor_sidebar.html" %}
     </div>
-
   </div>
 
-  <div style="clear: both"></div>
-
   <div class="modal" id="previewModal">
     <div class="modal-background"></div>
     <div class="modal-card" style="height: 80%; width: 80%;">
diff --git a/pydis_site/templates/wiki/error.html b/pydis_site/templates/wiki/error.html
index c6778b7e..d7ee70fd 100644
--- a/pydis_site/templates/wiki/error.html
+++ b/pydis_site/templates/wiki/error.html
@@ -1,11 +1,10 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n %}
+{% load wiki_tags %}
 
-
-{% block wiki_pagetitle %}{% if article %}{{ article.current_revision.title }}{% else %}{% trans "Error" %}{% endif %}{% endblock %}
+{% block wiki_pagetitle %}{% if article %}{{ article.current_revision.title }}{% else %}Error{% endif %}{% endblock %}
 
 {% block wiki_breadcrumbs %}
-{% include "wiki/includes/breadcrumbs.html" %}
+  {% include "wiki/includes/breadcrumbs.html" %}
 {% endblock %}
 
 {% block wiki_contents %}
diff --git a/pydis_site/templates/wiki/history.html b/pydis_site/templates/wiki/history.html
index 6d609516..3788385f 100644
--- a/pydis_site/templates/wiki/history.html
+++ b/pydis_site/templates/wiki/history.html
@@ -1,8 +1,9 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n sekizai_tags static %}
+{% load sekizai_tags %}
+{% load static %}
+{% load wiki_tags %}
 
-
-{% block wiki_pagetitle %}{% trans "History" %}: {{ article.current_revision.title }}{% endblock %}
+{% block wiki_pagetitle %}History: {{ article.current_revision.title }}{% endblock %}
 
 {% block wiki_contents_tab %}
   {% include "wiki/includes/modals.html" %}
@@ -11,145 +12,117 @@
     <script type="text/javascript" src="{% static "wiki/js/diffview.js" %}"></script>
     <script type="text/javascript" src="{% static "wiki/js/diff.js" %}"></script>
   {% endaddtoblock %}
-  {% addtoblock "css" %}
-    <style type="text/css">
-      td.linenumber {
-        width: 20px;
-      }
-      tr.insert td {
-        background-color: #DFC;
-      }
-      tr.delete td {
-        background-color: #FDC;
-      }
-      tr.equal td {
-        background-color: #F2F2F2;
-      }
-
-      .diff-container td {
-        white-space: pre; font-family: monospace;
-      }
-      .diff-container td,
-      .diff-container th {
-        padding: 2px 7px;
-        border-right: 1px solid #DDD;
-      }
-      .diff-container td:last-child,
-      .diff-container th:last-child {
-        border-right: none;
-      }
-      .diff-container table {
-        border-top: 1px solid #DDD;
-      }
-    </style>
-  {% endaddtoblock %}
 
-  <p class="lead">
-    {% trans "Click each revision to see a list of edited lines. Click the Preview button to see how the article looked at this stage. At the bottom of this page, you can change to a particular revision or merge an old revision with the current one." %}
+  <p>
+    Click each revision to see a list of edited lines. Click the Preview
+    button to see how the article looked at this stage. At the bottom of
+    this page, you can change to a particular revision or merge an old
+    revision with the current one.
   </p>
 
   {% include "wiki/includes/pagination.html" %}
 
-<form method="GET" id="historyForm">
-  <table class="table is-striped">
-    <thead>
-      <tr>
-        <th>Updated</th>
-        <th>Summary</th>
-        <th class="has-text-right">Actions</th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for revision in revisions %}
-        <tr {% if revision == article.current_revision %}class="is-selected"{% endif %}>
-          <td>
-            {% include "wiki/includes/revision_info.html" with current_revision=article.current_revision %}
-          </td>
-          <td>
-            {% if revision.user_message %}
-              {{ revision.user_message }}
-            {% elif revision.automatic_log %}
-              {{ revision.automatic_log }}
-            {% else %}
-              <em>No summary</em>
-            {% endif %}
-          </td>
-          <td class="has-text-right">
-            {% if revision == article.current_revision %}
-              <a class="button is-static has-text-grey">
-                <span class="icon">
-                  <i class="fas fa-eye"></i>
-                </span>
-                <span>Preview</span>
-              </a>
-              <a class="button is-static has-text-grey">
-                <span class="icon">
-                  <i class="fas fa-sync"></i>
-                </span>
-                <span>Switch</span>
-              </a>
-            {% else %}
-              <button type="submit" class="button" onclick="showPreviewModal('{{ revision.id }}', '{% url 'wiki:preview_revision' article.id %}', '{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}'); event.preventDefault();">
-                <span class="icon">
-                  <i class="fas fa-eye"></i>
-                </span>
-                <span>Preview</span>
-              </button>
-              <a class="button is-primary" href="{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}">
-                <span class="icon">
-                  <i class="fas fa-sync"></i>
-                </span>
-                <span>Switch</span>
-              </a>
-            {% endif %}
-          </td>
+  <form method="GET" id="historyForm">
+    <table class="table is-striped">
+      <thead>
+        <tr>
+          <th>Updated</th>
+          <th>Summary</th>
+          <th class="has-text-right">Actions</th>
         </tr>
-      {% endfor %}
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        {% for revision in revisions %}
+          <tr {% if revision == article.current_revision %}class="is-selected"{% endif %}>
+            <td>
+              {% include "wiki/includes/revision_info.html" with current_revision=article.current_revision %}
+            </td>
+            <td>
+              {% if revision.user_message %}
+                {{ revision.user_message }}
+              {% elif revision.automatic_log %}
+                {{ revision.automatic_log }}
+              {% else %}
+                <em>No summary</em>
+              {% endif %}
+            </td>
+            <td class="has-text-right">
+              {% if revision == article.current_revision %}
+                <a class="button is-static has-text-grey">
+                  <span class="icon">
+                    <i class="fas fa-eye"></i>
+                  </span>
+                  <span>Preview</span>
+                </a>
+                <a class="button is-static has-text-grey">
+                  <span class="icon">
+                    <i class="fas fa-sync"></i>
+                  </span>
+                  <span>Switch</span>
+                </a>
+              {% else %}
+                <button type="submit" class="button" onclick="showPreviewModal('{{ revision.id }}', '{% url 'wiki:preview_revision' article.id %}', '{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}'); event.preventDefault();">
+                  <span class="icon">
+                    <i class="fas fa-eye"></i>
+                  </span>
+                  <span>Preview</span>
+                </button>
+                <a class="button is-primary" href="{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}">
+                  <span class="icon">
+                    <i class="fas fa-sync"></i>
+                  </span>
+                  <span>Switch</span>
+                </a>
+              {% endif %}
+            </td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
 
-  {% include "wiki/includes/pagination.html" %}
+    {% include "wiki/includes/pagination.html" %}
 
-  <input type="hidden" name="r" value="" id="r" />
+    <input type="hidden" name="r" value="" id="r" />
 
-  <div class="modal" id="previewModal">
-    <div class="modal-background"></div>
-    <div class="modal-card" style="height: 80%; width: 80%;">
-      <div class="modal-card-head">
-        <p class="modal-card-title">Revision Preview</p>
-      </div>
-      <div class="modal-card-body" style="padding: 0; overflow: hidden;">
-        <iframe name="previewWindow" id="previewWindow" frameborder="0" style="width: 100%; height: 100%;"></iframe>
-      </div>
-      <div class="modal-card-foot">
-        <button class="button is-light" aria-label="close">
-          <span class="icon">
-            <i class="fas fa-arrow-left"></i>
-          </span>
-          <span>Back</span>
-        </button>
-        {% if article|can_write:user %}
-          <a href="#" class="button is-primary switch-to-revision">
+    <div class="modal" id="previewModal">
+      <div class="modal-background"></div>
+      <div class="modal-card" style="height: 80%; width: 80%;">
+        <div class="modal-card-head">
+          <p class="modal-card-title">Revision Preview</p>
+        </div>
+        <div class="modal-card-body" style="padding: 0; overflow: hidden;">
+          <iframe name="previewWindow" id="previewWindow" frameborder="0" style="width: 100%; height: 100%;"></iframe>
+        </div>
+        <div class="modal-card-foot">
+          <button class="button is-light" aria-label="close">
             <span class="icon">
-              <i class="fas fa-sync"></i>
+              <i class="fas fa-arrow-left"></i>
             </span>
-            <span>Switch to this version</span>
-          </a>
-        {% else %}
-          <a class="button is-static">
-            <span class="icon">
-              <i class="fas fa-check"></i>
-            </span>
-            <span>Switch to this version</span>
-          </a>
-        {% endif %}
+            <span>Back</span>
+          </button>
+
+          {% if article|can_write:user %}
+            <a href="#" class="button is-primary switch-to-revision">
+              <span class="icon">
+                <i class="fas fa-sync"></i>
+              </span>
+              <span>Switch to this version</span>
+            </a>
+          {% else %}
+            <a class="button is-static">
+              <span class="icon">
+                <i class="fas fa-check"></i>
+              </span>
+              <span>Switch to this version</span>
+            </a>
+          {% endif %}
+        </div>
       </div>
     </div>
-  </div>
-</form>
+  </form>
+
   <script src="{% static "js/wiki/modal.js" %}" type="text/javascript"></script>
   <script src="{% static "js/wiki/history.js" %}" type="text/javascript"></script>
-
 {% endblock %}
 
 
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index 5429f6a8..473df483 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -1,4 +1,4 @@
-{% load i18n wiki_tags %}
+{% load wiki_tags %}
 
 {% if article|can_write:user %}
   {% with selected_tab as selected %}
diff --git a/pydis_site/templates/wiki/includes/editor.html b/pydis_site/templates/wiki/includes/editor.html
index bc1da1a0..6eb6cd45 100644
--- a/pydis_site/templates/wiki/includes/editor.html
+++ b/pydis_site/templates/wiki/includes/editor.html
@@ -1,4 +1,4 @@
-{% load wiki_tags i18n sekizai_tags %}
+{% load wiki_tags %}
 {% include "wiki/includes/editormedia.html" %}
 
 {% wiki_form form %}
diff --git a/pydis_site/templates/wiki/includes/editor_sidebar.html b/pydis_site/templates/wiki/includes/editor_sidebar.html
index 5c24e74d..45ac87a1 100644
--- a/pydis_site/templates/wiki/includes/editor_sidebar.html
+++ b/pydis_site/templates/wiki/includes/editor_sidebar.html
@@ -1,38 +1,38 @@
-{% load i18n sekizai_tags static %}
+{% load static %}
 
 <section class="accordions">
-{% for plugin, plugin_form in sidebar %}
+  {% for plugin, plugin_form in sidebar %}
+    <article class="accordion is-primary">
+      <div class="accordion-header toggle">
+        <p>
+          {% if plugin.sidebar.icon_class %}
+            <span class="icon">
+              {% if plugin.sidebar.icon_class == "fa-picture-o" %}
+                <i class="fas fa-images"></i>
+              {% else %}
+                <i class="fas {{ plugin.sidebar.icon_class }}"></i>
+              {% endif %}
+            </span>
+          {% endif %}
 
-  <article class="accordion is-primary">
-    <div class="accordion-header toggle">
-      <p>
-        {% if plugin.sidebar.icon_class %}
-          <span class="icon">
-            {% if plugin.sidebar.icon_class == "fa-picture-o" %}
-              <i class="fas fa-images"></i>
-            {% else %}
-              <i class="fas {{ plugin.sidebar.icon_class }}"></i>
-            {% endif %}
-          </span>
-        {% endif %}
-        {{ plugin.sidebar.headline }}
-      </p>
+          {{ plugin.sidebar.headline }}
+        </p>
 
-    </div>
-    <div class="accordion-body">
-      <div class="accordion-content">
-        {% if plugin.sidebar.template %}
-          {% with plugin_form as form %}
-            <form method="POST" class="form-horizontal sidebar-form" action="?f={{ plugin_form.form_id }}" enctype="multipart/form-data">
-              {% csrf_token %}
-              {% include plugin.sidebar.template %}
-            </form>
-          {% endwith %}
-        {% endif %}
       </div>
-    </div>
-  </article>
-{% endfor %}
+      <div class="accordion-body">
+        <div class="accordion-content">
+          {% if plugin.sidebar.template %}
+            {% with plugin_form as form %}
+              <form method="POST" class="form-horizontal sidebar-form" action="?f={{ plugin_form.form_id }}" enctype="multipart/form-data">
+                {% csrf_token %}
+                {% include plugin.sidebar.template %}
+              </form>
+            {% endwith %}
+          {% endif %}
+        </div>
+      </div>
+    </article>
+  {% endfor %}
 </section>
 
 <script type="application/javascript" src="{% static "js/wiki/editor_sidebar.js" %}"></script>
diff --git a/pydis_site/templates/wiki/includes/editormedia.html b/pydis_site/templates/wiki/includes/editormedia.html
index 307a3078..c10fbef8 100644
--- a/pydis_site/templates/wiki/includes/editormedia.html
+++ b/pydis_site/templates/wiki/includes/editormedia.html
@@ -1,15 +1,17 @@
-{% load sekizai_tags static %}
+{% load sekizai_tags %}
+{% load static %}
+
 {% addtoblock "js" %}
-<script type="text/javascript" src="{% static "wiki/js/editor.js" %}"></script>
-{% for js in editor.Media.js %}
-<script type="text/javascript" src="{% static js %}"></script>
-{% endfor %}
+  <script type="text/javascript" src="{% static "wiki/js/editor.js" %}"></script>
+  {% for js in editor.Media.js %}
+    <script type="text/javascript" src="{% static js %}"></script>
+  {% endfor %}
 {% endaddtoblock %}
 
 {% addtoblock "css" %}
-{% for media, srcs in editor.Media.css.items %}
-  {% for src in srcs %}
-    <link rel="stylesheet" media="{{ media }}" href="{% static src %}" />
+  {% for media, srcs in editor.Media.css.items %}
+    {% for src in srcs %}
+      <link rel="stylesheet" media="{{ media }}" href="{% static src %}" />
+    {% endfor %}
   {% endfor %}
-{% endfor %}
 {% endaddtoblock %}
diff --git a/pydis_site/templates/wiki/includes/form.html b/pydis_site/templates/wiki/includes/form.html
index 3e1abb67..4ea08de4 100644
--- a/pydis_site/templates/wiki/includes/form.html
+++ b/pydis_site/templates/wiki/includes/form.html
@@ -1,17 +1,16 @@
-{% csrf_token %}{% load sekizai_tags %}
+{% load sekizai_tags %}
+{% csrf_token %}
 
 {% include "wiki/includes/formerrors.html" %}
 
 {% addtoblock "js" %}
-{{ form.media.js }}
+  {{ form.media.js }}
 {% endaddtoblock %}
 
 {% addtoblock "css" %}
-{{ form.media.css }}
+  {{ form.media.css }}
 {% endaddtoblock %}
 
 {% for field in form %}
-
   {% include "wiki/includes/formfield.html" %}
-
 {% endfor %}
diff --git a/pydis_site/templates/wiki/includes/pagination.html b/pydis_site/templates/wiki/includes/pagination.html
index 0bdcbdc2..35dac538 100644
--- a/pydis_site/templates/wiki/includes/pagination.html
+++ b/pydis_site/templates/wiki/includes/pagination.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+
 {% if is_paginated %}
   <nav class="pagination" role="navigation" aria-label="pagination">
     {% if page_obj.has_previous %}
diff --git a/pydis_site/templates/wiki/includes/render.html b/pydis_site/templates/wiki/includes/render.html
index 28ab76c9..c0334d98 100644
--- a/pydis_site/templates/wiki/includes/render.html
+++ b/pydis_site/templates/wiki/includes/render.html
@@ -1,4 +1,5 @@
-{% load wiki_tags i18n cache sekizai_tags static %}
+{% load sekizai_tags %}
+{% load static %}
 
 {% addtoblock "js" %}
   <script type="text/javascript" src="{% static "wiki/js/article.js" %}"></script>
@@ -16,6 +17,7 @@
       {% endfor %}
     {% endaddtoblock %}
   {% endif %}
+
   {% if plugin.RenderMedia.js %}
     {% addtoblock "js" %}
       {% for url in plugin.RenderMedia.js %}
diff --git a/pydis_site/templates/wiki/includes/revision_info.html b/pydis_site/templates/wiki/includes/revision_info.html
index 724f7296..f2964034 100644
--- a/pydis_site/templates/wiki/includes/revision_info.html
+++ b/pydis_site/templates/wiki/includes/revision_info.html
@@ -1,22 +1,24 @@
 {% comment %}
-
   This reusable code is shared between different templates and different inheritors of
   BaseRevision.
-
 {% endcomment %}
 
+{% load wiki_tags %}
+
+{% if not hidedate %}{{ revision.created }}{% endif %} {% if not hidenumber %}(#{{ revision.revision_number }}) by{% endif %} {% if revision.user %}{{ revision.user }}{% else %}{% if article|can_moderate:user %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}anonymous (IP logged){% endif %}{% endif %}
 
-{% load wiki_tags i18n %}
-{% if not hidedate %}{{ revision.created }}{% endif %} {% if not hidenumber %}(#{{ revision.revision_number }}) {% trans "by" %}{% endif %} {% if revision.user %}{{ revision.user }}{% else %}{% if article|can_moderate:user %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %}
 {% if revision.deleted %}
-<span class="badge badge-important">{% trans "deleted" %}</span>
+  <span class="tag is-danger">deleted</span>
 {% endif %}
+
 {% if revision.previous_revision.deleted and not revision.deleted %}
-<span class="badge badge-success">{% trans "restored" %}</span>
+  <span class="tag is-success">restored</span>
 {% endif %}
+
 {% if revision.locked %}
-<span class="badge">{% trans "locked" %}</span>
+  <span class="tag is-danger">locked</span>
 {% endif %}
+
 {% if revision.previous_revision.locked and not revision.locked %}
-<span class="badge">{% trans "unlocked" %}</span>
+  <span class="tag is-success">unlocked</span>
 {% endif %}
diff --git a/pydis_site/templates/wiki/includes/searchresult.html b/pydis_site/templates/wiki/includes/searchresult.html
index 350280a0..897ee4a6 100644
--- a/pydis_site/templates/wiki/includes/searchresult.html
+++ b/pydis_site/templates/wiki/includes/searchresult.html
@@ -1,22 +1,32 @@
-{% load wiki_tags i18n humanize %}
-
+{% load humanize %}
 
 <tr>
   <td>
     {% for urlpath in article.urlpath_set.all %}
-      <a href="{% url 'wiki:get' path=urlpath.path %}">{{ article.current_revision.title }}<br /><small class="has-text-grey">Slug: /{{ urlpath.path }}</small></a>
+      <a href="{% url 'wiki:get' path=urlpath.path %}">
+        {{ article.current_revision.title }}
+        <br />
+        <small class="has-text-grey">Slug: /{{ urlpath.path }}</small>
+      </a>
     {% empty %}
-      <a href="{% url 'wiki:get' article_id=article.id %}">{{ article.current_revision.title }}</a>
+      <a href="{% url 'wiki:get' article_id=article.id %}">
+        {{ article.current_revision.title }}
+      </a>
     {% endfor %}
 
     {% if article.current_revision.deleted %}
-      <span class="fa fa-trash"></span>
+      <span class="icon">
+        <i class="fas fa-trash"></i>
+      </span>
     {% endif %}
 
     {% if article.current_revision.locked %}
-      <span class="fa fa-lock"></span>
+      <span class="icon">
+        <i class="fas fa-lock"></i>
+      </span>
     {% endif %}
   </td>
+
   <td class="has-text-right">
     {{ article.current_revision.created|naturaltime }}
   </td>
diff --git a/pydis_site/templates/wiki/move.html b/pydis_site/templates/wiki/move.html
index 6452ffa2..a3f7a5d8 100644
--- a/pydis_site/templates/wiki/move.html
+++ b/pydis_site/templates/wiki/move.html
@@ -1,10 +1,12 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n sekizai_tags static %}
+{% load i18n %}
+{% load sekizai_tags %}
+{% load static %}
+{% load wiki_tags %}
 
-{% block wiki_pagetitle %}{% trans "Move" %}: {{ article.current_revision.title }}{% endblock %}
+{% block wiki_pagetitle %}Move: {{ article.current_revision.title }}{% endblock %}
 
 {% block wiki_contents_tab %}
-
   <article class="message is-warning">
     <div class="message-body">
       {% if urlpath.get_descendants %}
@@ -30,40 +32,41 @@
     </div>
   </article>
 
-<form method="POST" class="form-horizontal" id="article_move_form">
-  {% wiki_form form %}
+  <form method="POST" class="form-horizontal" id="article_move_form">
+    {% wiki_form form %}
 
-  {# Not gonna lie, I have no idea what this is or what it's for #}
-  <div class="btn-group" id="dest_selector">
-    <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
-      <span class="dest_selector_title"></span>
-      <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-        {% with current_path=root_path %}{% include "wiki/includes/move_tree.html" %}{% endwith %}
-    </ul>
-  </div>
+    {# Not gonna lie, I have no idea what this is or what it's for #}
+    <div class="btn-group" id="dest_selector">
+      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
+        <span class="dest_selector_title"></span>
+        <span class="caret"></span>
+      </a>
 
-  <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="button is-white">
-    <span class="icon">
-      <i class="fas fa-arrow-left"></i>
-    </span>
-    <span>Go back</span>
-  </a>
-  <button class="button is-warning" type="submit" name="move" id="id_move">
-    <span class="icon">
-      <i class="fas fa-random"></i>
-    </span>
-    <span>Move article</span>
-  </button>
-</form>
+      <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+          {% with current_path=root_path %}{% include "wiki/includes/move_tree.html" %}{% endwith %}
+      </ul>
+    </div>
+
+    <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="button is-white">
+      <span class="icon">
+        <i class="fas fa-arrow-left"></i>
+      </span>
+      <span>Go back</span>
+    </a>
 
-{% addtoblock "js" %}
-  <script type="text/javascript" src="{% static "js/wiki/move.js" %}"></script>
-  <script type="text/javascript">
-    $('#id_slug').val('{{ urlpath.slug }}');
-    select_path('{{urlpath.parent.pk}}', '{{urlpath.parent}}');
-  </script>
-{% endaddtoblock %}
+    <button class="button is-warning" type="submit" name="move" id="id_move">
+      <span class="icon">
+        <i class="fas fa-random"></i>
+      </span>
+      <span>Move article</span>
+    </button>
+  </form>
 
+  {% addtoblock "js" %}
+    <script type="text/javascript" src="{% static "js/wiki/move.js" %}"></script>
+    <script type="text/javascript">
+      $('#id_slug').val('{{ urlpath.slug }}');
+      select_path('{{urlpath.parent.pk}}', '{{urlpath.parent}}');
+    </script>
+  {% endaddtoblock %}
 {% endblock %}
diff --git a/pydis_site/templates/wiki/plugins/images/index.html b/pydis_site/templates/wiki/plugins/images/index.html
index 2b4d9800..a76703aa 100644
--- a/pydis_site/templates/wiki/plugins/images/index.html
+++ b/pydis_site/templates/wiki/plugins/images/index.html
@@ -1,16 +1,21 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n humanize wiki_thumbnails %}
+{% load humanize %}
+{% load wiki_tags %}
+{% load wiki_thumbnails %}
 
 {# TODO: This page needs re-styling, but it's functional for now so we're not touching it until after wiki completion #}
 
-{% block wiki_pagetitle %}{% trans "Images" %}: {{ article.current_revision.title }}{% endblock %}
+{% block wiki_pagetitle %}Images: {{ article.current_revision.title }}{% endblock %}
 
 {% block wiki_contents_tab %}
-  <p class="lead">{% trans "The following images are available for this article. Copy the markdown tag to directly refer to an image from the article text." %}</p>
+  <p>The following images are available for this article. Copy the markdown tag to directly refer to an image from the article text.</p>
+
   <p>
-    <a href="{% url 'wiki:edit' path=urlpath.path article_id=article.id %}">
-      <span class="fa fa-arrow-left"></span>
-      {% trans "Back to edit page" %}
+    <a href="{% url 'wiki:edit' path=urlpath.path article_id=article.id %}" class="button is-white">
+      <span class="icon">
+        <i class="fas fa-arrow-left"></i>
+      </span>
+      <span>Back to edit page</span>
     </a>
   </p>
 
@@ -27,6 +32,7 @@
             <th>Size</th>
           </tr>
         </thead>
+
         <tbody>
           <tr>
             <td rowspan="3">
@@ -76,21 +82,26 @@
                 {% endif %}
               {% endif %}
             </td>
+
             <td>
               <code>[image:{{ image.id }}]</code>
             </td>
+
             <td colspan="3">
               {% include "wiki/includes/revision_info.html" %}
             </td>
+
             <td>
               {{ revision.get_size|filesizeformat }}<br />{{ revision.width }}x{{ revision.height }} pixels
             </td>
           </tr>
+
           <tr>
             <th colspan="5">
               History
             </th>
           </tr>
+
           <tr>
             <td class="is-paddingless" colspan="5">
               <table class="table is-striped">
@@ -115,15 +126,19 @@
                           {% endthumbnail %}
                         </figure>
                       </td>
+
                       <td>
                         {% include "wiki/includes/revision_info.html" with current_revision=image.current_revision revision=old_revision %}
                       </td>
+
                       <td>
                         {{ old_revision.imagerevision.get_size|filesizeformat }}
                       </td>
+
                       <td>
                         {{ old_revision.imagerevision.width }}x{{ old_revision.imagerevision.height }} pixels
                       </td>
+
                       <td>
                         {% if image|can_write:user and old_revision != image.current_revision %}
                           <a class="button is-primary" href="{% url 'wiki:images_set_revision' path=urlpath.path article_id=article.id image_id=image.id rev_id=old_revision.id %}">
@@ -153,5 +168,4 @@
   </table>
 
   {% include "wiki/includes/pagination.html" %}
-
 {% endblock %}
diff --git a/pydis_site/templates/wiki/plugins/images/purge.html b/pydis_site/templates/wiki/plugins/images/purge.html
index 2789f536..3b514e4c 100644
--- a/pydis_site/templates/wiki/plugins/images/purge.html
+++ b/pydis_site/templates/wiki/plugins/images/purge.html
@@ -1,8 +1,8 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n humanize wiki_thumbnails %}
+{% load wiki_tags %}
+{% load wiki_thumbnails %}
 
-
-{% block wiki_pagetitle %}{% trans "Purge deletion" %}: {{ image }}{% endblock %}
+{% block wiki_pagetitle %}Purge image: {{ image }}{% endblock %}
 
 {% block wiki_contents_tab %}
   <div class="columns">
diff --git a/pydis_site/templates/wiki/plugins/images/render.html b/pydis_site/templates/wiki/plugins/images/render.html
index c34616cb..d14b3de4 100644
--- a/pydis_site/templates/wiki/plugins/images/render.html
+++ b/pydis_site/templates/wiki/plugins/images/render.html
@@ -1,4 +1,4 @@
-{% load wiki_thumbnails i18n %}{% comment %}
+{% load wiki_thumbnails %}{% comment %}
   This template is used for the markdown extension that renders images and captions.
 
   NB! Watch out for line breaks, markdown might add <br />s and <p>s.
diff --git a/pydis_site/templates/wiki/plugins/images/revision_add.html b/pydis_site/templates/wiki/plugins/images/revision_add.html
index 6b17587a..eb872eab 100644
--- a/pydis_site/templates/wiki/plugins/images/revision_add.html
+++ b/pydis_site/templates/wiki/plugins/images/revision_add.html
@@ -1,5 +1,6 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags wiki_thumbnails %}
+{% load wiki_tags %}
+{% load wiki_thumbnails %}
 
 {% block wiki_pagetitle %}Replace Image: {{ image }}{% endblock %}
 
@@ -9,6 +10,7 @@
       <p>
         Upload an image to replace the current one.
       </p>
+
       <form method="POST" class="form-horizontal" enctype="multipart/form-data">
         {% wiki_form form %}
 
@@ -27,6 +29,7 @@
         </button>
       </form>
     </div>
+
     <div class="column is-one-third">
       {% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %}
         <figure class="image">
diff --git a/pydis_site/templates/wiki/plugins/images/sidebar.html b/pydis_site/templates/wiki/plugins/images/sidebar.html
index 2aa77c9e..b29ef240 100644
--- a/pydis_site/templates/wiki/plugins/images/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/images/sidebar.html
@@ -1,4 +1,7 @@
-{% load i18n wiki_tags wiki_images_tags humanize wiki_thumbnails sekizai_tags static %}
+{% load static %}
+{% load wiki_images_tags %}
+{% load wiki_tags %}
+{% load wiki_thumbnails %}
 
 {% with article|images_for_article as images %}
   {% if article|images_can_add:user %}
diff --git a/pydis_site/templates/wiki/plugins/links/sidebar.html b/pydis_site/templates/wiki/plugins/links/sidebar.html
index d44e27fb..4fdbac72 100644
--- a/pydis_site/templates/wiki/plugins/links/sidebar.html
+++ b/pydis_site/templates/wiki/plugins/links/sidebar.html
@@ -1,4 +1,5 @@
-{% load sekizai_tags static %}
+{% load sekizai_tags %}
+{% load static %}
 
 <h4 class="title is-4">Link to another wiki page</h4>
 
@@ -50,7 +51,6 @@
   <script src="{% static "js/wiki/links_sidebar.js" %}"></script>
 
   <script type="text/javascript">
-    {# If you figure out a way to do this without putting some JS directly in the page... let me know #}
     setFetchURL("{% url 'wiki:links_query_urlpath' path=urlpath.path article_id=article.id %}");
   </script>
 {% endaddtoblock %}
diff --git a/pydis_site/templates/wiki/preview_inline.html b/pydis_site/templates/wiki/preview_inline.html
index a130df05..a01c963a 100644
--- a/pydis_site/templates/wiki/preview_inline.html
+++ b/pydis_site/templates/wiki/preview_inline.html
@@ -1,6 +1,9 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n sekizai_tags static %}
+{% load sekizai_tags %}
+{% load static %}
+{% load wiki_tags %}
 
+{# We make these empty so they don't appear in the preview #}
 {% block site_navbar %}{% endblock %}
 {% block site_footer %}{% endblock %}
 {% block wiki_breadcrumbs %}{% endblock %}
@@ -21,31 +24,29 @@
 
   {% if merge %}
     <div class="alert alert-info">
-      <strong>{% trans "Previewing merge between" %}:</strong>
+      <strong>Previewing merge between:</strong>
       {% include "wiki/includes/revision_info.html" with revision=merge1 %}
-      <strong>{% trans "and" %}</strong>
+      <strong>and</strong>
       {% include "wiki/includes/revision_info.html" with revision=merge2 %}
     </div>
 
     {% if merge1.deleted %}
       <div class="alert alert-danger">
-        <strong>{% trans "You cannot merge with a deleted revision" %}</strong>
+        <strong>You cannot merge with a deleted revision</strong>
       </div>
     {% endif %}
   {% endif %}
 
   {% if revision and revision.deleted %}
     <div class="warning">
-      <strong>{% trans "This revision has been deleted." %}</strong>
-      <p>{% trans "Restoring to this revision will mark the article as deleted." %}</p>
+      <strong>This revision has been deleted.</strong>
+      <p>Restoring to this revision will mark the article as deleted.</p>
     </div>
   {% else %}
-
     <section class="section">
       <div class="container">
         <div class="content">
-
-  <h1 class="title">{{ article.current_revision.title }}</h1>
+          <h1 class="title">{{ article.current_revision.title }}</h1>
 
           {% wiki_render article content %}
         </div>
@@ -69,5 +70,4 @@
       {% endif %}
     {% endfor %}
   {% endif %}
-
 {% endblock %}
diff --git a/pydis_site/templates/wiki/root_missing.html b/pydis_site/templates/wiki/root_missing.html
index c3b89c45..31ef2eab 100644
--- a/pydis_site/templates/wiki/root_missing.html
+++ b/pydis_site/templates/wiki/root_missing.html
@@ -1,5 +1,5 @@
 {% extends "wiki/create_root.html" %}
-{% load i18n wiki_tags %}
+{% load wiki_tags %}
 
 {% block wiki_contents %}
   <div class="columns">
@@ -38,5 +38,4 @@
       </article>
     </div>
   </div>
-
 {% endblock %}
diff --git a/pydis_site/templates/wiki/search.html b/pydis_site/templates/wiki/search.html
index 296b21b3..154b6934 100644
--- a/pydis_site/templates/wiki/search.html
+++ b/pydis_site/templates/wiki/search.html
@@ -1,5 +1,6 @@
 {% extends "wiki/base.html" %}
-{% load wiki_tags i18n humanize %}
+{% load i18n %}
+{% load wiki_tags %}
 
 
 {% block wiki_pagetitle %}Search results for: "{{ search_query }}"{% endblock %}
@@ -44,10 +45,12 @@
       <th>Title</th>
       <th class="has-text-right">Last modified</th>
     </tr>
+
     {% for article in articles %}
       {% block wiki_search_loop %}
         {% include "wiki/includes/searchresult.html" %}
       {% endblock %}
+
       {% empty %}
         <tr>
           <td colspan="2">
diff --git a/pydis_site/templates/wiki/settings.html b/pydis_site/templates/wiki/settings.html
index c26e4ccd..e291621d 100644
--- a/pydis_site/templates/wiki/settings.html
+++ b/pydis_site/templates/wiki/settings.html
@@ -1,32 +1,30 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags i18n %}
+{% load wiki_tags %}
 
-
-{% block wiki_pagetitle %}{% trans "Settings" %}: {{ article.current_revision.title }}{% endblock %}
+{% block wiki_pagetitle %}Settings: {{ article.current_revision.title }}{% endblock %}
 
 {% block wiki_contents_tab %}
-
   {% for form in forms %}
-  <form method="POST" class="form-horizontal" action="?f={{form.action}}">
-    <h3 class="page-header">{{ form.settings_form_headline }}</h3>
-    {% wiki_form form %}
+    <form method="POST" class="form-horizontal" action="?f={{form.action}}">
+      <h3 class="page-header">{{ form.settings_form_headline }}</h3>
 
-    <div class="field is-horizontal">
-      <div class="field-label">
-        {# Empty for spacing #}
-      </div>
-      <div class="field-body">
-        <div class="control">
-          <button type="submit" class="button is-primary" name="save">
-            <span class="icon">
-              <i class="fas fa-save"></i>
-            </span>
-            <span>Save Changes</span>
-          </button>
+      {% wiki_form form %}
+
+      <div class="field is-horizontal">
+        <div class="field-label">
+          {# Empty for spacing #}
+        </div>
+        <div class="field-body">
+          <div class="control">
+            <button type="submit" class="button is-primary" name="save">
+              <span class="icon">
+                <i class="fas fa-save"></i>
+              </span>
+              <span>Save Changes</span>
+            </button>
+          </div>
         </div>
       </div>
-    </div>
-  </form>
+    </form>
   {% endfor %}
-
 {% endblock %}
diff --git a/pydis_site/templates/wiki/source.html b/pydis_site/templates/wiki/source.html
index caae077e..a6611233 100644
--- a/pydis_site/templates/wiki/source.html
+++ b/pydis_site/templates/wiki/source.html
@@ -1,6 +1,5 @@
 {% extends "wiki/article.html" %}
-{% load wiki_tags humanize %}
-
+{% load wiki_tags %}
 
 {% block wiki_pagetitle %}Source of "{{ article.current_revision.title }}"{% endblock %}
 
-- 
cgit v1.2.3


From 61f34e195d76111ff22155b283cc0ff64d17fb9c Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 20 Apr 2019 14:44:39 +0100
Subject: Merge settings/Pipfile.lock

---
 Pipfile.lock           | 125 +++++++++++++++++++++++++++++++++++++++++++++----
 pydis_site/settings.py |   2 +-
 2 files changed, 118 insertions(+), 9 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index a20d1687..539932e9 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "0ff5e3b68fa729ba88aa32dc3aae4012d1d54e5ad620f635bc5136603900ebc0"
+            "sha256": "2c8dbf435c3e38ed18ef63ed511399a5e4964d41eb4d5acd34a714eec2881220"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -16,6 +16,13 @@
         ]
     },
     "default": {
+        "bleach": {
+            "hashes": [
+                "sha256:0ee95f6167129859c5dce9b1ca291ebdb5d8cd7e382ca0e237dfd0dad63f63d8",
+                "sha256:24754b9a7d530bf30ce7cbc805bc6cce785660b4a10ff3a43633728438c105ab"
+            ],
+            "version": "==2.1.4"
+        },
         "certifi": {
             "hashes": [
                 "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5",
@@ -32,11 +39,18 @@
         },
         "django": {
             "hashes": [
-                "sha256:7c3543e4fb070d14e10926189a7fcf42ba919263b7473dceaefce34d54e8a119",
-                "sha256:a2814bffd1f007805b19194eb0b9a331933b82bd5da1c3ba3d7b7ba16e06dc4b"
+                "sha256:0fd54e4f27bc3e0b7054a11e6b3a18fa53f2373f6b2df8a22e8eadfe018970a5",
+                "sha256:f3b28084101d516f56104856761bc247f85a2a5bbd9da39d9f6197ff461b3ee4"
             ],
             "index": "pypi",
-            "version": "==2.2"
+            "version": "==2.1.8"
+        },
+        "django-classy-tags": {
+            "hashes": [
+                "sha256:792f9161d0e22d55b4fab6fc297bab8ab072ffaa3075b227613a6d8473624db8",
+                "sha256:f6d12f5a4df3e387795a0d9ef2836af389cae9a1fbebda035dac043d4722b1f7"
+            ],
+            "version": "==0.8.0"
         },
         "django-crispy-bulma": {
             "hashes": [
@@ -78,6 +92,33 @@
             "index": "pypi",
             "version": "==3.0"
         },
+        "django-js-asset": {
+            "hashes": [
+                "sha256:8ec12017f26eec524cab436c64ae73033368a372970af4cf42d9354fcb166bdd",
+                "sha256:c163ae80d2e0b22d8fb598047cd0dcef31f81830e127cfecae278ad574167260"
+            ],
+            "version": "==1.2.2"
+        },
+        "django-mptt": {
+            "hashes": [
+                "sha256:18a41d1b56ca7c02a5b04d246e33ee2d18f6ee5459c02ed1d945f5abdef23a2e",
+                "sha256:689a04cce0981671d6061a9928c33a16b47abb0d4cd43cf7dec31ae284fdae9d"
+            ],
+            "version": "==0.9.1"
+        },
+        "django-nyt": {
+            "hashes": [
+                "sha256:02c828e483606addbaeea8c08d4c7301be6fdba5e00f03b7a984b4cbae353e21",
+                "sha256:bf65e3d7e138b3c00879b6a7420c1f4f897e6bd6a9d2f09d7cd7ac5f623d8448"
+            ],
+            "version": "==1.1.2"
+        },
+        "django-sekizai": {
+            "hashes": [
+                "sha256:642a3356fe92fe9b5ccc97f320b64edd2cfcb3b2fbb113e8a26dad9a1f3b5e14"
+            ],
+            "version": "==1.0.0"
+        },
         "django-simple-bulma": {
             "hashes": [
                 "sha256:7dcc04a11b5a3aefb6ec57cb211c161df8421ea333638e03c9e7db87465fead2",
@@ -101,6 +142,13 @@
             "index": "pypi",
             "version": "==0.2.1"
         },
+        "html5lib": {
+            "hashes": [
+                "sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3",
+                "sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"
+            ],
+            "version": "==1.0.1"
+        },
         "idna": {
             "hashes": [
                 "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
@@ -129,6 +177,44 @@
             ],
             "version": "==0.18.0"
         },
+        "markdown": {
+            "hashes": [
+                "sha256:9ba587db9daee7ec761cfc656272be6aabe2ed300fece21208e4aab2e457bc8f",
+                "sha256:a856869c7ff079ad84a3e19cd87a64998350c2b94e9e08e44270faef33400f81"
+            ],
+            "version": "==2.6.11"
+        },
+        "pillow": {
+            "hashes": [
+                "sha256:15c056bfa284c30a7f265a41ac4cbbc93bdbfc0dfe0613b9cb8a8581b51a9e55",
+                "sha256:1a4e06ba4f74494ea0c58c24de2bb752818e9d504474ec95b0aa94f6b0a7e479",
+                "sha256:1c3c707c76be43c9e99cb7e3d5f1bee1c8e5be8b8a2a5eeee665efbf8ddde91a",
+                "sha256:1fd0b290203e3b0882d9605d807b03c0f47e3440f97824586c173eca0aadd99d",
+                "sha256:24114e4a6e1870c5a24b1da8f60d0ba77a0b4027907860188ea82bd3508c80eb",
+                "sha256:258d886a49b6b058cd7abb0ab4b2b85ce78669a857398e83e8b8e28b317b5abb",
+                "sha256:33c79b6dd6bc7f65079ab9ca5bebffb5f5d1141c689c9c6a7855776d1b09b7e8",
+                "sha256:367385fc797b2c31564c427430c7a8630db1a00bd040555dfc1d5c52e39fcd72",
+                "sha256:3c1884ff078fb8bf5f63d7d86921838b82ed4a7d0c027add773c2f38b3168754",
+                "sha256:44e5240e8f4f8861d748f2a58b3f04daadab5e22bfec896bf5434745f788f33f",
+                "sha256:46aa988e15f3ea72dddd81afe3839437b755fffddb5e173886f11460be909dce",
+                "sha256:74d90d499c9c736d52dd6d9b7221af5665b9c04f1767e35f5dd8694324bd4601",
+                "sha256:809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5",
+                "sha256:85d1ef2cdafd5507c4221d201aaf62fc9276f8b0f71bd3933363e62a33abc734",
+                "sha256:8c3889c7681af77ecfa4431cd42a2885d093ecb811e81fbe5e203abc07e0995b",
+                "sha256:9218d81b9fca98d2c47d35d688a0cea0c42fd473159dfd5612dcb0483c63e40b",
+                "sha256:9aa4f3827992288edd37c9df345783a69ef58bd20cc02e64b36e44bcd157bbf1",
+                "sha256:9d80f44137a70b6f84c750d11019a3419f409c944526a95219bea0ac31f4dd91",
+                "sha256:b7ebd36128a2fe93991293f997e44be9286503c7530ace6a55b938b20be288d8",
+                "sha256:c4c78e2c71c257c136cdd43869fd3d5e34fc2162dc22e4a5406b0ebe86958239",
+                "sha256:c6a842537f887be1fe115d8abb5daa9bc8cc124e455ff995830cc785624a97af",
+                "sha256:cf0a2e040fdf5a6d95f4c286c6ef1df6b36c218b528c8a9158ec2452a804b9b8",
+                "sha256:cfd28aad6fc61f7a5d4ee556a997dc6e5555d9381d1390c00ecaf984d57e4232",
+                "sha256:dca5660e25932771460d4688ccbb515677caaf8595f3f3240ec16c117deff89a",
+                "sha256:de7aedc85918c2f887886442e50f52c1b93545606317956d65f342bd81cb4fc3",
+                "sha256:e6c0bbf8e277b74196e3140c35f9a1ae3eafd818f7f2d3a15819c49135d6c062"
+            ],
+            "version": "==6.0.0"
+        },
         "psycopg2-binary": {
             "hashes": [
                 "sha256:007ca0df127b1862fc010125bc4100b7a630efc6841047bd11afceadb4754611",
@@ -163,6 +249,14 @@
             "index": "pypi",
             "version": "==2.8.2"
         },
+        "pygments": {
+            "hashes": [
+                "sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a",
+                "sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d"
+            ],
+            "index": "pypi",
+            "version": "==2.3.1"
+        },
         "pytz": {
             "hashes": [
                 "sha256:303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda",
@@ -185,12 +279,12 @@
             ],
             "version": "==1.12.0"
         },
-        "sqlparse": {
+        "sorl-thumbnail": {
             "hashes": [
-                "sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177",
-                "sha256:7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873"
+                "sha256:8dfe5fda91a5047d1d35a0b9effe7b000764a01d648e15ca076f44e9c34b6dbd",
+                "sha256:d9e3f018d19293824803e4ffead96b19dfcd44fa7987cea392f50436817bef34"
             ],
-            "version": "==0.3.0"
+            "version": "==12.5.0"
         },
         "urllib3": {
             "hashes": [
@@ -198,6 +292,21 @@
                 "sha256:9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3"
             ],
             "version": "==1.24.2"
+        },
+        "webencodings": {
+            "hashes": [
+                "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
+                "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
+            ],
+            "version": "==0.5.1"
+        },
+        "wiki": {
+            "hashes": [
+                "sha256:8a3130c50aa6e92a579968d154ce7e66dda85d0b10358d479066ed957f6f4dfc",
+                "sha256:df9c73d4185433d9f375c1646b7c08e099e86172faf93d6afc16389db075440a"
+            ],
+            "index": "pypi",
+            "version": "==0.4.4"
         }
     },
     "develop": {
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 21cc5534..d6c7ed96 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -281,7 +281,7 @@ BULMA_SETTINGS = {
         "primary": "#7289DA",
         "link": "$primary",
 
-        "dimensions": "16 24 32 48 64 96 128 256 512"  # Possible image dimensions
+        "dimensions": "16 24 32 48 64 96 128 256 512",  # Possible image dimensions
         "navbar-height": "4.75rem",
         "footer-padding": "1rem 1.5rem 1rem",
     }
-- 
cgit v1.2.3


From 867fcfbdcd382e417a60aae2f809d184a2529aed Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 20 Apr 2019 14:46:24 +0100
Subject: base.html: Load tags on multiple lines

---
 pydis_site/templates/base/base.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html
index 99e00fe4..d7e764a2 100644
--- a/pydis_site/templates/base/base.html
+++ b/pydis_site/templates/base/base.html
@@ -1,5 +1,7 @@
 {# Base template, with a few basic style definitions. #}
-{% load django_simple_bulma sekizai_tags static %}
+{% load django_simple_bulma %}
+{% load sekizai_tags %}
+{% load static %}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -33,7 +35,9 @@
   {% endblock %}
 </main>
 
-{% include "base/footer.html" %}
+{% block site_footer %}
+  {% include "base/footer.html" %}
+{% endblock %}
 
 {% render_block "js" %}
 </body>
-- 
cgit v1.2.3


From 0b6f16c023e587894def1e6e06913466a5af46bb Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 20 Apr 2019 14:56:37 +0100
Subject: Styling fixes and cleanup

---
 pydis_site/static/css/wiki/style.css                 | 12 ++++++++++++
 pydis_site/templates/base/navbar.html                |  1 -
 pydis_site/templates/wiki/article.html               |  4 ----
 pydis_site/templates/wiki/base.html                  |  9 ++-------
 pydis_site/templates/wiki/includes/article_menu.html |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pydis_site/static/css/wiki/style.css b/pydis_site/static/css/wiki/style.css
index c5dbd7c3..db6b4050 100644
--- a/pydis_site/static/css/wiki/style.css
+++ b/pydis_site/static/css/wiki/style.css
@@ -1,3 +1,15 @@
+#wikiNavbar {
+    min-height: 3rem;
+}
+
+#wikiNavbar .container {
+    min-height: 3rem;
+}
+
+#wikiNavbar .navbar-brand {
+    min-height: 3rem;
+}
+
 .breadcrumb-section {
     padding: 1rem;
 }
diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index 5e76b3a6..bee503ee 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -1,4 +1,3 @@
-{% load extra_filters %}
 {% load static %}
 
 <nav class="navbar is-primary" role="navigation" aria-label="main navigation">
diff --git a/pydis_site/templates/wiki/article.html b/pydis_site/templates/wiki/article.html
index 890e4300..7f2b3af6 100644
--- a/pydis_site/templates/wiki/article.html
+++ b/pydis_site/templates/wiki/article.html
@@ -22,7 +22,3 @@
     </div>
   </div>
 {% endblock %}
-
-{% block wiki_footer_prepend %}
-  <p style="margin-bottom: 10px;"><em>This article was last modified: {{ article.current_revision.modified }}</em></p>
-{% endblock %}
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index c47f6bfb..f1b70fdd 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -16,11 +16,12 @@
   <link rel="stylesheet" href="{% static "css/wiki/simplemde.min.css" %}">
   <link rel="stylesheet" href="{% static "css/wiki/simplemde-fixes.css" %}">
   <link rel="stylesheet" href="{% static "css/wiki/style.css" %}">
+  <link rel="stylesheet" href="{% static "css/home/index.css" %}">
 {% endblock %}
 
 {% block content %}
   {% block site_navbar %}
-    {% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="far" use_logo=True %}
+    {% include "base/navbar.html" %}
   {% endblock %}
 
   {% block wiki_navbar %}{% endblock %}
@@ -41,12 +42,6 @@
     </section>
   {% endblock %}
 
-  {% block site_footer %}
-    {% block wiki_footer_prepend %}{% endblock %}
-
-    {{ block.super }}
-  {% endblock %}
-
   <script src="{% static "js/wiki/dropdown.js" %}" type="text/javascript"></script>
   <script src="{% static "js/wiki/load_editor.js" %}" type="text/javascript"></script>
 {% endblock %}
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html
index 473df483..966e8120 100644
--- a/pydis_site/templates/wiki/includes/article_menu.html
+++ b/pydis_site/templates/wiki/includes/article_menu.html
@@ -2,7 +2,7 @@
 
 {% if article|can_write:user %}
   {% with selected_tab as selected %}
-    <nav class="navbar is-light" role="navigation" aria-label="wiki navigation">
+    <nav class="navbar is-light" role="navigation" aria-label="wiki navigation" id="wikiNavbar">
       <div class="container">
         <div class="navbar-brand">
           {% if not user.is_anonymous %}
-- 
cgit v1.2.3


From 383b3fd568b4b7ce0368e85854172e6f49860c15 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 20 Apr 2019 15:08:16 +0100
Subject: 100% coverage

---
 pydis_site/apps/home/tests/test_wiki_templatetags.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pydis_site/apps/home/tests/test_wiki_templatetags.py b/pydis_site/apps/home/tests/test_wiki_templatetags.py
index 201d3df4..e1e2a02c 100644
--- a/pydis_site/apps/home/tests/test_wiki_templatetags.py
+++ b/pydis_site/apps/home/tests/test_wiki_templatetags.py
@@ -229,3 +229,10 @@ class TestGetFieldOptions(TestCase):
 
         context = Context({"field": field})
         self.TEMPLATE.render(context)
+
+    def test_get_field_options_value(self):
+        unbound_field = ChoiceField()
+        field = BoundField(Form(initial={"field": "Value"}), unbound_field, "field")
+
+        context = Context({"field": field})
+        self.TEMPLATE.render(context)
-- 
cgit v1.2.3


From c8ceda475744bdfaf5ec55bfb3df0e0a9702562b Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 20 Apr 2019 16:35:07 +0100
Subject: Remove unneeded sites.py and move navbar CSS to base.css

---
 pydis_site/sites.py                  |  5 -----
 pydis_site/static/css/base/base.css  | 24 ++++++++++++++++++++++++
 pydis_site/static/css/home/index.css | 24 ------------------------
 pydis_site/templates/wiki/base.html  |  1 -
 4 files changed, 24 insertions(+), 30 deletions(-)
 delete mode 100644 pydis_site/sites.py

diff --git a/pydis_site/sites.py b/pydis_site/sites.py
deleted file mode 100644
index b3370049..00000000
--- a/pydis_site/sites.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from wiki.sites import WikiSite
-
-
-class PyDisWikiSite(WikiSite):
-    pass
diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css
index 4f656189..84af21f2 100644
--- a/pydis_site/static/css/base/base.css
+++ b/pydis_site/static/css/base/base.css
@@ -18,6 +18,30 @@ div.card.has-equal-height {
     flex-direction: column;
 }
 
+.navbar-item.is-fullsize {
+    padding: 0;
+}
+
+.navbar-item.is-fullsize img {
+    max-height: 4.75rem;
+}
+
+.navbar-item.has-no-highlight:hover {
+    background-color: transparent;
+}
+
+.navbar-item.has-left-margin-1 {
+    margin-left: 1rem;
+}
+
+.navbar-item.has-left-margin-2 {
+    margin-left: 2rem;
+}
+
+.navbar-item.has-left-margin-3 {
+    margin-left: 3rem;
+}
+
 #django-logo {
     padding-bottom: 2px;
     background: url(https://static.djangoproject.com/img/logos/django-logo-negative.png) no-repeat center;
diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css
index 0ad2e6b5..3bcd39ab 100644
--- a/pydis_site/static/css/home/index.css
+++ b/pydis_site/static/css/home/index.css
@@ -17,30 +17,6 @@
     margin-right: 2rem;
 }
 
-.navbar-item.is-fullsize {
-    padding: 0;
-}
-
-.navbar-item.is-fullsize img {
-    max-height: 4.75rem;
-}
-
-.navbar-item.has-no-highlight:hover {
-    background-color: transparent;
-}
-
-.navbar-item.has-left-margin-1 {
-    margin-left: 1rem;
-}
-
-.navbar-item.has-left-margin-2 {
-    margin-left: 2rem;
-}
-
-.navbar-item.has-left-margin-3 {
-    margin-left: 3rem;
-}
-
 .video-container iframe,
 .video-container object,
 .video-container embed {
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index f1b70fdd..192c25f6 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -16,7 +16,6 @@
   <link rel="stylesheet" href="{% static "css/wiki/simplemde.min.css" %}">
   <link rel="stylesheet" href="{% static "css/wiki/simplemde-fixes.css" %}">
   <link rel="stylesheet" href="{% static "css/wiki/style.css" %}">
-  <link rel="stylesheet" href="{% static "css/home/index.css" %}">
 {% endblock %}
 
 {% block content %}
-- 
cgit v1.2.3


From 5a18564cd42641d7bbdb52accae79c32f3bcca71 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 20 Apr 2019 22:03:00 +0100
Subject: Replace wiki dep with PyDis fork, add git to Docker

---
 Pipfile               |   4 +-
 Pipfile.lock          | 117 +++++---------------------------------------------
 docker/app/Dockerfile |   1 +
 3 files changed, 13 insertions(+), 109 deletions(-)

diff --git a/Pipfile b/Pipfile
index 62eb84a2..59f660a4 100644
--- a/Pipfile
+++ b/Pipfile
@@ -16,7 +16,7 @@ coverage = "~=4.5.3"
 unittest-xml-reporting = "~=2.5.1"
 
 [packages]
-django = "~=2.1"
+django = "~=2.2"
 django-crispy-forms = "~=1.7.2"
 django-environ = "~=0.4.5"
 django-filter = "~=2.1.0"
@@ -27,8 +27,8 @@ psycopg2-binary = "~=2.8"
 django-simple-bulma = ">=1.1.7,<2.0"
 django-crispy-bulma = ">=0.1.2,<2.0"
 requests = "~=2.21"
-wiki = "~=0.4.4"
 pygments = "~=2.3.1"
+wiki = {git = "https://github.com/python-discord/django-wiki.git"}
 
 [requires]
 python_version = "3.7"
diff --git a/Pipfile.lock b/Pipfile.lock
index 539932e9..30103336 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "2c8dbf435c3e38ed18ef63ed511399a5e4964d41eb4d5acd34a714eec2881220"
+            "sha256": "78085b805ff9d797c2ce4720c4fc84a91347233b93e4b85615c9833e6b208ed8"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -16,13 +16,6 @@
         ]
     },
     "default": {
-        "bleach": {
-            "hashes": [
-                "sha256:0ee95f6167129859c5dce9b1ca291ebdb5d8cd7e382ca0e237dfd0dad63f63d8",
-                "sha256:24754b9a7d530bf30ce7cbc805bc6cce785660b4a10ff3a43633728438c105ab"
-            ],
-            "version": "==2.1.4"
-        },
         "certifi": {
             "hashes": [
                 "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5",
@@ -39,18 +32,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:0fd54e4f27bc3e0b7054a11e6b3a18fa53f2373f6b2df8a22e8eadfe018970a5",
-                "sha256:f3b28084101d516f56104856761bc247f85a2a5bbd9da39d9f6197ff461b3ee4"
+                "sha256:7c3543e4fb070d14e10926189a7fcf42ba919263b7473dceaefce34d54e8a119",
+                "sha256:a2814bffd1f007805b19194eb0b9a331933b82bd5da1c3ba3d7b7ba16e06dc4b"
             ],
             "index": "pypi",
-            "version": "==2.1.8"
-        },
-        "django-classy-tags": {
-            "hashes": [
-                "sha256:792f9161d0e22d55b4fab6fc297bab8ab072ffaa3075b227613a6d8473624db8",
-                "sha256:f6d12f5a4df3e387795a0d9ef2836af389cae9a1fbebda035dac043d4722b1f7"
-            ],
-            "version": "==0.8.0"
+            "version": "==2.2"
         },
         "django-crispy-bulma": {
             "hashes": [
@@ -92,33 +78,6 @@
             "index": "pypi",
             "version": "==3.0"
         },
-        "django-js-asset": {
-            "hashes": [
-                "sha256:8ec12017f26eec524cab436c64ae73033368a372970af4cf42d9354fcb166bdd",
-                "sha256:c163ae80d2e0b22d8fb598047cd0dcef31f81830e127cfecae278ad574167260"
-            ],
-            "version": "==1.2.2"
-        },
-        "django-mptt": {
-            "hashes": [
-                "sha256:18a41d1b56ca7c02a5b04d246e33ee2d18f6ee5459c02ed1d945f5abdef23a2e",
-                "sha256:689a04cce0981671d6061a9928c33a16b47abb0d4cd43cf7dec31ae284fdae9d"
-            ],
-            "version": "==0.9.1"
-        },
-        "django-nyt": {
-            "hashes": [
-                "sha256:02c828e483606addbaeea8c08d4c7301be6fdba5e00f03b7a984b4cbae353e21",
-                "sha256:bf65e3d7e138b3c00879b6a7420c1f4f897e6bd6a9d2f09d7cd7ac5f623d8448"
-            ],
-            "version": "==1.1.2"
-        },
-        "django-sekizai": {
-            "hashes": [
-                "sha256:642a3356fe92fe9b5ccc97f320b64edd2cfcb3b2fbb113e8a26dad9a1f3b5e14"
-            ],
-            "version": "==1.0.0"
-        },
         "django-simple-bulma": {
             "hashes": [
                 "sha256:7dcc04a11b5a3aefb6ec57cb211c161df8421ea333638e03c9e7db87465fead2",
@@ -142,13 +101,6 @@
             "index": "pypi",
             "version": "==0.2.1"
         },
-        "html5lib": {
-            "hashes": [
-                "sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3",
-                "sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"
-            ],
-            "version": "==1.0.1"
-        },
         "idna": {
             "hashes": [
                 "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
@@ -177,44 +129,6 @@
             ],
             "version": "==0.18.0"
         },
-        "markdown": {
-            "hashes": [
-                "sha256:9ba587db9daee7ec761cfc656272be6aabe2ed300fece21208e4aab2e457bc8f",
-                "sha256:a856869c7ff079ad84a3e19cd87a64998350c2b94e9e08e44270faef33400f81"
-            ],
-            "version": "==2.6.11"
-        },
-        "pillow": {
-            "hashes": [
-                "sha256:15c056bfa284c30a7f265a41ac4cbbc93bdbfc0dfe0613b9cb8a8581b51a9e55",
-                "sha256:1a4e06ba4f74494ea0c58c24de2bb752818e9d504474ec95b0aa94f6b0a7e479",
-                "sha256:1c3c707c76be43c9e99cb7e3d5f1bee1c8e5be8b8a2a5eeee665efbf8ddde91a",
-                "sha256:1fd0b290203e3b0882d9605d807b03c0f47e3440f97824586c173eca0aadd99d",
-                "sha256:24114e4a6e1870c5a24b1da8f60d0ba77a0b4027907860188ea82bd3508c80eb",
-                "sha256:258d886a49b6b058cd7abb0ab4b2b85ce78669a857398e83e8b8e28b317b5abb",
-                "sha256:33c79b6dd6bc7f65079ab9ca5bebffb5f5d1141c689c9c6a7855776d1b09b7e8",
-                "sha256:367385fc797b2c31564c427430c7a8630db1a00bd040555dfc1d5c52e39fcd72",
-                "sha256:3c1884ff078fb8bf5f63d7d86921838b82ed4a7d0c027add773c2f38b3168754",
-                "sha256:44e5240e8f4f8861d748f2a58b3f04daadab5e22bfec896bf5434745f788f33f",
-                "sha256:46aa988e15f3ea72dddd81afe3839437b755fffddb5e173886f11460be909dce",
-                "sha256:74d90d499c9c736d52dd6d9b7221af5665b9c04f1767e35f5dd8694324bd4601",
-                "sha256:809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5",
-                "sha256:85d1ef2cdafd5507c4221d201aaf62fc9276f8b0f71bd3933363e62a33abc734",
-                "sha256:8c3889c7681af77ecfa4431cd42a2885d093ecb811e81fbe5e203abc07e0995b",
-                "sha256:9218d81b9fca98d2c47d35d688a0cea0c42fd473159dfd5612dcb0483c63e40b",
-                "sha256:9aa4f3827992288edd37c9df345783a69ef58bd20cc02e64b36e44bcd157bbf1",
-                "sha256:9d80f44137a70b6f84c750d11019a3419f409c944526a95219bea0ac31f4dd91",
-                "sha256:b7ebd36128a2fe93991293f997e44be9286503c7530ace6a55b938b20be288d8",
-                "sha256:c4c78e2c71c257c136cdd43869fd3d5e34fc2162dc22e4a5406b0ebe86958239",
-                "sha256:c6a842537f887be1fe115d8abb5daa9bc8cc124e455ff995830cc785624a97af",
-                "sha256:cf0a2e040fdf5a6d95f4c286c6ef1df6b36c218b528c8a9158ec2452a804b9b8",
-                "sha256:cfd28aad6fc61f7a5d4ee556a997dc6e5555d9381d1390c00ecaf984d57e4232",
-                "sha256:dca5660e25932771460d4688ccbb515677caaf8595f3f3240ec16c117deff89a",
-                "sha256:de7aedc85918c2f887886442e50f52c1b93545606317956d65f342bd81cb4fc3",
-                "sha256:e6c0bbf8e277b74196e3140c35f9a1ae3eafd818f7f2d3a15819c49135d6c062"
-            ],
-            "version": "==6.0.0"
-        },
         "psycopg2-binary": {
             "hashes": [
                 "sha256:007ca0df127b1862fc010125bc4100b7a630efc6841047bd11afceadb4754611",
@@ -279,12 +193,12 @@
             ],
             "version": "==1.12.0"
         },
-        "sorl-thumbnail": {
+        "sqlparse": {
             "hashes": [
-                "sha256:8dfe5fda91a5047d1d35a0b9effe7b000764a01d648e15ca076f44e9c34b6dbd",
-                "sha256:d9e3f018d19293824803e4ffead96b19dfcd44fa7987cea392f50436817bef34"
+                "sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177",
+                "sha256:7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873"
             ],
-            "version": "==12.5.0"
+            "version": "==0.3.0"
         },
         "urllib3": {
             "hashes": [
@@ -293,20 +207,9 @@
             ],
             "version": "==1.24.2"
         },
-        "webencodings": {
-            "hashes": [
-                "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
-                "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
-            ],
-            "version": "==0.5.1"
-        },
         "wiki": {
-            "hashes": [
-                "sha256:8a3130c50aa6e92a579968d154ce7e66dda85d0b10358d479066ed957f6f4dfc",
-                "sha256:df9c73d4185433d9f375c1646b7c08e099e86172faf93d6afc16389db075440a"
-            ],
-            "index": "pypi",
-            "version": "==0.4.4"
+            "git": "https://github.com/python-discord/django-wiki.git",
+            "ref": "66d443248279fb8decf23f68c5363ecf6362ee09"
         }
     },
     "develop": {
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index 5b965740..52cc6b32 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -15,6 +15,7 @@ RUN apt-get update -y \
                 gcc \
                 libc-dev \
                 libpq-dev \
+                git \
     && \
         apt-get clean \
     && \
-- 
cgit v1.2.3