From ab1b31e9091a173bf22712df9133328d0408ecee Mon Sep 17 00:00:00 2001 From: Gareth Coles 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 %} -

{% trans "Account Settings" %}

-
{% csrf_token %} - {% wiki_form 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 %} -
-
-
-

{% trans "Please log in" %}

-
- {% wiki_form form %} -
-
-
- -
-
-
- -

- {% trans "Don't have an account?" %} {% trans "Sign up" %} » -

- -
-
-
- -{% addtoblock "js" %} - -{% 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 %} -

{% trans "Sign up" %}

-
-{% wiki_form form %} -
-
-
- -
-
-
-{% addtoblock "js" %} - -{% 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 @@ + - + {% 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 %} - - -{% endwith %} + + {% 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 %} -
+{% if urlpath and article and not user.is_anonymous %} +