{% trans "Congratulations!" %}

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

Create first article

+ Please create the root article. This article will be available at the root of your wiki, + so consider creating a landing page here. +

+ 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. +

{% trans "Root article" %}

Congratulations!

No articles found

- {% 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.

{% if not user.is_superuser %}

- {% 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.

{% login_url as wiki_login_url %} {% if wiki_login_url %}

- {% trans "Click here to login" %} + Login

{% endif %} {% else %}

- {% 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 + django-wiki documentation.

Create Article -- cgit v1.2.3 From ed8311057579de883fc010f9dd5e1bb331970418 Mon Sep 17 00:00:00 2001 From: Gareth Coles 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 (limited to 'pydis_site/templates/wiki/includes') 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 }} + + + +{% 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 %} + + {% endfor %} + + {% for media, srcs in editor.Media.css.items %} + {% for src in srcs %} + + {% endfor %} + {% endfor %} +{% endblock %} + + {% block wiki_contents %}

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 %} + +{% else %} + +{% 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 %}*{% endif %} {% endif %} + {% if field.help_text %}

{% endif %}

- {{ field }} + {% render_field field %}

@@ -30,25 +34,4 @@ {% endif %}

- -{#

#} -{#

#} -{# {% if field.label %}#} -{# #} -{# {{ field.label|safe }}#} -{# #} -{# {% endif %}#} -{#

#} -{#

#} -{# {{ field }} {% if field.field.required %}*{% endif %}#} -{# {% if field.errors %}#} -{# {% for error in field.errors %}#} -{#

{{ error }}

#} -{# {% endfor %}#} -{# {% endif %}#} -{# {% if field.help_text %}#} -{#

#} -{# {% endif %}#} -{#

#} -{#

#} {% endif %} -- cgit v1.2.3 From a27d88923c6451d450d9155adb0ccd9fd0dcaa5f Mon Sep 17 00:00:00 2001 From: Gareth Coles 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(-) (limited to 'pydis_site/templates/wiki/includes') 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 %} -

Create first article

- Please create the root article. This article will be available at the root of your wiki, - so consider creating a landing page here. -

- 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. -

Create First Article

{% trans "Root article" %}

+ Please create the root article. This article will be available at the root of your wiki, + so consider creating a landing page here. +

+ 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. +

- +

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 (limited to 'pydis_site/templates/wiki/includes') 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 @@ +

+ + {{ field.label | safe }} {% if field.field.required %}*{% endif %} + + + {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ +

+ + + + +

+ + {% if field.errors %} +

+ {% for error in field.errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %} +

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 %} - -{% else %} - + {{ field.help_text|safe }} +

+ {% 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 %} - /> -{% endif %} +

+ {% if is_markitup %} + + {% else %} + + {% endif %} +

+ + {% if field.errors %} +

+ {% for error in field.errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %} +

+ 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 @@ +

+ {% if field.label %} + + IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}*{% endif %} + + {% endif %} + + {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ +

+ {{ field }} +

+ + {% if field.errors %} +

+ {% for error in field.errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %} +

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 @@ +

+ {% if field.label %} + + MODEL CHOICE: {{ field.label | safe }} {% if field.field.required %}*{% endif %} + + {% endif %} + + {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ +

+ {{ field }} +

+ + {% if field.errors %} +

+ {% for error in field.errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %} +

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 %} -

- {% if field.label %} - - {{ field.label | safe }} {% if field.field.required %}*{% endif %} - - {% endif %} - - {% if field.help_text %} -

- {{ field.help_text|safe }} -

- {% endif %} -

- -

- {% render_field field %} -

- - {% if field.errors %} -

- {% for error in field.errors %} - {{ error }}
- {% endfor %} -

- {% endif %} -

+ {% render_field field %} {% endif %} -- cgit v1.2.3 From 34b72419c312d21b77185b72a47cb49508ed47e9 Mon Sep 17 00:00:00 2001 From: Gareth Coles 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(-) (limited to 'pydis_site/templates/wiki/includes') 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 @@

- +

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 }} + + + + + + +{% endblock %} + {% block wiki_contents_tab %} {% if not user.is_authenticated %} -

- {% trans "Warning: You are not logged in. Your IP address will be logged." %} - {% trans "Click here to log in" %} » -

+ {% trans "Warning: You are not logged in. Your IP address will be logged." %} + {% trans "Click here to log in" %} » +

{% endif %}

@@ -23,39 +93,44 @@ {% include "wiki/includes/editor.html" %} {% endwith %} -

- - - - -

+ + + +

+ {% if user.is_authenticated and urlpath.path %} + + + + + Move Article + + {% endif %} + {% if article|can_delete:user %} + + + + + Delete Article + + {% endif %}

+
+
+

@@ -88,53 +163,4 @@

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

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 @@

- +

-- cgit v1.2.3 From ed0313e57a5729097c04763dbc5d12c6434433eb Mon Sep 17 00:00:00 2001 From: Gareth Coles 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(-) (limited to 'pydis_site/templates/wiki/includes') 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 %} -

- +

+ {{ article.current_revision.title }} + + {% if urlpath.parent %} + {{ urlpath.slug }} + {% endif %} + + {% if article.current_revision.locked %} + + + locked + {% endif %} + +

{% block wiki_contents_tab %} {% endblock %}

- {% endblock %} {% block wiki_footer_prepend %} -

{% trans "This article was last modified:" %} {{ article.current_revision.modified }}

This article was last modified: {{ article.current_revision.modified }}

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

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 %} + {% endwith %} -- cgit v1.2.3 From cc5f3b7321c6992e0c7e324c735bb5272d8e5ae3 Mon Sep 17 00:00:00 2001 From: Gareth Coles 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 (limited to 'pydis_site/templates/wiki/includes') 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 %} -

{% wiki_messages %} - {% block wiki_breadcrumbs %}{% endblock %} -

{% block wiki_contents %}{% endblock %}

@@ -38,7 +37,9 @@

{% endblock %} - {% include "base/footer.html" %} + {% block site_footer %} + {% include "base/footer.html" %} + {% endblock %} {% 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 }} - - - - - - -{% endblock %} - {% block wiki_contents_tab %} {% if not user.is_authenticated %} @@ -144,23 +74,89 @@ {% include "wiki/includes/modals.html" %} -

- - + + + + + + + + + {% 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 %} 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 %} -

- - -

- - +

- - + {% endif %} + + +

{% 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 @@

{% if plugin.sidebar.template %} - {% with plugin_form as form and plugin as plugin %} + {% with plugin_form as form %}

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

{% endif %} - {% for error_message in form.non_field_errors %} -

- {{ error_message }} +

+ {% if form_error_title %} +

+ {% endif %} + +

+ {% for error_message in form.non_field_errors %} +

+ {% endfor %}

- {% endfor %} +

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

{% trans "Previewing revision" %}: @@ -17,15 +19,14 @@ {% trans "and" %} {% include "wiki/includes/revision_info.html" with revision=merge2 %}

+ {% if merge1.deleted %} -

- {% trans "You cannot merge with a deleted revision" %} -

+ {% trans "You cannot merge with a deleted revision" %} +

{% endif %} {% endif %} - - {% if revision and revision.deleted %}

{% trans "This revision has been deleted." %} @@ -33,7 +34,17 @@

{% else %} - {% wiki_render article content %} +

+ +

+ + {% wiki_render article content %} +

+ {% 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 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(-) (limited to 'pydis_site/templates/wiki/includes') 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 @@

{% endif %} -- cgit v1.2.3 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 (limited to 'pydis_site/templates/wiki/includes') 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 %} - -{% 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 "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 %} - - -{% 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 %} +

Date: Mon, 15 Apr 2019 13:09:10 +0100 Subject: Fix preview/nav visibility --- pydis_site/templates/wiki/edit.html | 13 +++++++------ pydis_site/templates/wiki/includes/article_menu.html | 2 +- pydis_site/templates/wiki/preview_inline.html | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'pydis_site/templates/wiki/includes') 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 @@

{% endif %} -

+ @@ -72,11 +72,12 @@

- {% include "wiki/includes/modals.html" %} -

+ 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 %}

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 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 (limited to 'pydis_site/templates/wiki/includes') 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 @@

+ 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 @@

- {% if field.label %} - - {{ field.label | safe }} {% if field.field.required %}*{% endif %} - - {% endif %} + {% if not is_markitup %} +

+ {% if field.label %} + + {{ field.label | safe }} {% if field.field.required %}*{% endif %} + + {% endif %} - {% if field.help_text %} -

- {{ field.help_text|safe }} -

- {% endif %} -

+ {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ {% endif %} -

{% 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 @@ +

+ {% if field.label %} + + IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}*{% endif %} + + {% endif %} + + {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ +

+ {{ field }} +

+ + {% if field.errors %} +

+ {% for error in field.errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %} +

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 @@ View - -

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 %} -

- +

{% for plugin, plugin_form in sidebar %} -

+ {% if plugin.sidebar.icon_class %} + + {% if plugin.sidebar.icon_class == "fa-picture-o" %} + + {% else %} + + {% endif %} + + {% endif %} + {{ plugin.sidebar.headline }} +

- -

{% if plugin.sidebar.template %} {% with plugin_form as form %}

- -

{% endfor %} -

+ + -- cgit v1.2.3 From f27987070e40fcf4b017f91c23c4747373e85c9d Mon Sep 17 00:00:00 2001 From: Gareth Coles 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 (limited to 'pydis_site/templates/wiki/includes') 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 @@

- - {{ field.label | safe }} {% if field.field.required %}*{% endif %} - + {% if render_labels %} +

+ + {{ field.label | safe }} {% if field.field.required %}*{% endif %} + - {% if field.help_text %} -

- {{ field.help_text|safe }} -

- {% endif %} -

+ {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ {% endif %}

@@ -25,8 +27,13 @@ {% if field.min_length %}minlength="{{ field.min_length }}"{% endif %} {% if field.empty_value %}placeholder="{{ field.empty_value }}"{% endif %} /> + - + {% if not render_labels %} + {{ field.label | safe }} {% if field.field.required %}*{% endif %} + {% else %} + + {% endif %}

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 @@

- {% if not is_markitup %} + {% if render_labels and not is_markitup %}

{% if field.label %} 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 @@

- {% if field.label %} - - IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}*{% endif %} - - {% endif %} + {% if render_labels %} +

+ {% if field.label %} + + IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}*{% endif %} + + {% endif %} - {% if field.help_text %} -

- {{ field.help_text|safe }} -

- {% endif %} -

+ {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ {% endif %}

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 @@

- {% if field.label %} - - IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}*{% endif %} - - {% endif %} + {% if render_labels %} +

+ {% if field.label %} + + IN PLACE RENDER: {{ field.label | safe }} {% if field.field.required %}*{% endif %} + + {% endif %} - {% if field.help_text %} -

- {{ field.help_text|safe }} -

- {% endif %} -

+ {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ {% endif %}

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 %}

- {% if field.label %} - - {{ field.label | safe }} {% if field.field.required %}*{% endif %} - - {% endif %} + {% if render_labels %} +

+ {% if field.label %} + + {{ field.label | safe }} {% if field.field.required %}*{% endif %} + + {% endif %} - {% if field.help_text %} -

- {{ field.help_text|safe }} -

- {% endif %} -

+ {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ {% endif %}

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 %}

- {% if field.label %} - - {{ field.label | safe }} {% if field.field.required %}*{% endif %} - - {% endif %} + {% if render_labels %} +

+ {% if field.label %} + + {{ field.label | safe }} {% if field.field.required %}*{% endif %} + + {% endif %} - {% if field.help_text %} -

- {{ field.help_text|safe }} -

- {% endif %} -

+ {% if field.help_text %} +

+ {{ field.help_text|safe }} +

+ {% endif %} +

+ {% endif %}

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) { + +

Add image

+ + {% 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 %} + +

+ +

+ {% else %} + + {% if user.is_anonymous %} + {% include "wiki/includes/anonymous_blocked.html" %} + {% else %} +

{% trans "You do not have permissions to add images." %}

+ {% endif %} + {% endif %} +

{% for image in images %} @@ -78,61 +111,6 @@ function add_image(form) {

{% trans "Add new image" %}

- -{% if article|images_can_add:user %} - {% if form.non_field_errors %} - {% if form_error_title %}

{% endif %} - {% for error_message in form.non_field_errors %} -

- {{ error_message }} -

- {% endfor %} - {% endif %} - - {# Include the hidden fields #} - {% for hidden in form.hidden_fields %} - {{ hidden }} - {% endfor %} - -

- {% for field in form.visible_fields %} -

- {% if field.label %} - - {% endif %} - {{ field }} - {% if field.errors %} -

- {% for error in field.errors %} -

- {% endfor %} -

- {% endif %} -

- {% if field.help_text %} -

- {% endif %} - {% endfor %} -

- -

-{% else %} - - {% if user.is_anonymous %} - {% include "wiki/includes/anonymous_blocked.html" %} - {% else %} -

{% trans "You do not have permissions to add images." %}

- {% endif %} -{% endif %} -

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 %} -
-
-
{% trans "Article index" %}
- {% for child in article_children %} - {% article_list child depth %} - {% empty %} - {% trans "Nothing below this level" %} - {% endfor %} -
-
-{% 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 %} -

-{{ macro.help_text|safe|linebreaks }} -{% if macro.example_code %} -

{{ macro.example_code }}

-{% endif %} -{% if macro.args %} -

-{% for arg,description in macro.args.items %} - - - - -{% endfor %} -

{{ arg }}	{{ description }}

-{% endif %} -{% endfor %} -- cgit v1.2.3 From fab16f5da7bac8bf781e0d86076e9ef484e4047d Mon Sep 17 00:00:00 2001 From: Gareth Coles 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 (limited to 'pydis_site/templates/wiki/includes') 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 %} - - -{% url 'wiki:signup' as signup_url %} -{% url 'wiki:login' as login_url %} -{% if login_url and signup_url %} - {% blocktrans trimmed %} - You need to log in or sign up to use this function. - {% endblocktrans %} -{% else %} - {% trans "You need to log in or sign up to use this function." %} -{% endif %} - 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 %} +

This article is currently locked for editing.

+ {% endif %} -{% if article.current_revision.locked %} -

{% trans "This article is currently locked for editing." %}

-{% endif %} - -

-  {{ article.current_revision.content }}
-

- +

+{{ article.current_revision.content }}
+

{% endblock %} -- cgit v1.2.3 From 06fed91f6515e08a0e62cc48ade80d65257fcbd9 Mon Sep 17 00:00:00 2001 From: Gareth Coles 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 (limited to 'pydis_site/templates/wiki/includes') 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 %} + + 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 %} -{% 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 @@

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

«
«
...
{{ pc }}
»
»

-{% 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 @@ {% for urlpath in article.urlpath_set.all %} - {{ article.current_revision.title }}
/{{ urlpath.path }} + {{ article.current_revision.title }}
Slug: /{{ urlpath.path }} {% empty %} {{ article.current_revision.title }} {% endfor %} + {% if article.current_revision.deleted %} {% endif %} + {% if article.current_revision.locked %} {% endif %} -

- + {{ article.current_revision.created|naturaltime }} 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 %} - {% 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 %} - + -

{% if urlpath %} - {% trans "Searching in" %} {{ urlpath.article }} + Searching: in {{ urlpath.article }} {% else %} - {% trans "Searching whole wiki" %} + Searching: everywhere {% endif %} -

- - - +

+ +

+ + +

+ +

{% blocktrans with paginator.object_list.count as cnt %}Your search returned {{ cnt }} results.{% endblocktrans %}

+ +

+ {% blocktrans with paginator.object_list.count as cnt %} + Your search returned {{ cnt }} results. + {% endblocktrans %} +

- +

- - + + {% for article in articles %} {% block wiki_search_loop %} - {% include "wiki/includes/searchresult.html" %} + {% include "wiki/includes/searchresult.html" %} {% endblock %} - {% empty%} - - - + {% empty %} + + + {% endfor %}

{% trans "Title" %}	{% trans "Last modified" %}	Title	Last modified
- {% trans "There are no articles in this level" %} -
+ No articles were found for that search query. +

-{% include "wiki/includes/pagination.html" %} +{% if is_paginated %} + {% include "base/paginator.html" with page=page_obj %} +{% endif %} {% endblock %} -- cgit v1.2.3 From ed7ba6aa8ebe02d8e16fc784ece95d6092c4701b Mon Sep 17 00:00:00 2001 From: Gareth Coles 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 (limited to 'pydis_site/templates/wiki/includes') 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 %} - - 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 %} - -

- {% if urlpath.parent %} - - - {% trans "Up one level" %} - - {% endif %} - - - {% trans "Add article" %} - -

- {{ filter_form.query }} -

- {% if filter_query %} -

- ({% trans "clear" %}) + +

+ {% if urlpath.parent %} + + + {% trans "Up one level" %} + + {% endif %} + + + {% trans "Add article" %} + +

+ {{ filter_form.query }}

- {% endif %} + {% if filter_query %} +

+ ({% trans "clear" %}) +

+ {% endif %} -

- +

+ -

- {% 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 /{{ path }}. There {{ articles_plur_verb }} {{ cnt }} {{ articles_plur }} in this level. - {% endblocktrans %} - {% endwith %} -

+ {% 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 /{{ path }}. There {{ articles_plur_verb }} {{ cnt }} {{ articles_plur }} in this level. + {% endblocktrans %} + {% endwith %} +

- - - - - - - {% for urlpath in directory %} +

{% trans "Title" %}	{% trans "Slug" %}	{% trans "Last modified" %}

- - - + + + - {% empty%} - - - - {% endfor %} -

- {{ urlpath.article.current_revision.title }} - › - {% if urlpath.article.current_revision.deleted %} - - {% endif %} - {% if urlpath.article.current_revision.locked %} - - {% endif %} -	- {{ urlpath.slug }} -	- {{ urlpath.article.current_revision.created\|naturaltime }} -	{% trans "Title" %}	{% trans "Slug" %}	{% trans "Last modified" %}
- {% trans "There are no articles in this level" %} -

- -{% if is_paginated %} - {% include "base/paginator.html" with page=page_obj %} -{% endif %} + {% for urlpath in directory %} + + + {{ urlpath.article.current_revision.title }} + › + {% if urlpath.article.current_revision.deleted %} + + {% endif %} + {% if urlpath.article.current_revision.locked %} + + {% endif %} + + + {{ urlpath.slug }} + + + {{ urlpath.article.current_revision.created|naturaltime }} + + + {% empty%} + + + {% trans "There are no articles in this level" %} + + + {% endfor %} + + {% 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." %}

+ {% include "wiki/includes/pagination.html" %} +

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

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 %} + +{% 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 %} - {% 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 %} - - - - -

- {% if urlpath %} - Searching: in {{ urlpath.article }} - {% else %} - Searching: everywhere - {% endif %} -

- -

- - - - -

- + + + +

+ {% if urlpath %} + Searching: in {{ urlpath.article }} + {% else %} + Searching: everywhere + {% endif %} +

+ +

+ + + + +

+ +

- -

- {% blocktrans with paginator.object_list.count as cnt %} - Your search returned {{ cnt }} results. - {% endblocktrans %} -

- - - - - - - - {% for article in articles %} - {% block wiki_search_loop %} - {% include "wiki/includes/searchresult.html" %} - {% endblock %} - {% empty %} - - - - {% endfor %} -

Title	Last modified
- No articles were found for that search query. -

- -{% if is_paginated %} - {% include "base/paginator.html" with page=page_obj %} -{% endif %} +

+ {% blocktrans with paginator.object_list.count as cnt %} + Your search returned {{ cnt }} results. + {% endblocktrans %} +

+ + + + + + + + {% for article in articles %} + {% block wiki_search_loop %} + {% include "wiki/includes/searchresult.html" %} + {% endblock %} + {% empty %} + + + + {% endfor %} +

Title	Last modified
+ No articles were found for that search query. +

+ + {% include "wiki/includes/pagination.html" %} {% endblock %} -- cgit v1.2.3 From bf99d5e06936625e7939d72d0bb922b71ce401eb Mon Sep 17 00:00:00 2001 From: Gareth Coles 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(-) (limited to 'pydis_site/templates/wiki/includes') 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 @@

- - + - - + {% 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 %} - -

{% trans "No notifications" %}

- - - {% trans "Clear notifications list" %} - -

- - - {% trans "Notification settings" %} - -

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

{% trans "Your notification settings" %}

- {% trans "Manage how often you receive notifications" %} -

- - - {% include "wiki/includes/formerrors.html" with form=formset.management_form %} - {% csrf_token %} - {{ formset.management_form }} - {% for form in formset %} -

- {% trans "Settings for" %} {{ form.instance.articlesubscriptions.count }} {% trans "articles" %} - {% include "wiki/includes/formerrors.html" with form=form %} - {% for field in form %} - {% include "wiki/includes/formfield.html" %} - {% endfor %} -

- {% empty %} - {% trans "You are not subscribed to any notifications yet." %} - {% endfor %} - {% if formset.forms %} -

- -

- {% endif %} - - -

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

- - {{ parent.article.current_revision.title }} - {% if not parent.article.other_read %}{% endif %} - -{% if parent.article.other_read %} - {% with parent.children.active.default_order as children %} - {% if parent.level < depth and children.count %} -

- {% for child in children %} - {% article_list child depth %} - {% endfor %} - - {% endif %} - {% endwith %} -{% endif %} -

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 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 (limited to 'pydis_site/templates/wiki/includes') 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 @@ +// 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 : " / "); +} 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" %} - {% endif %} - {% 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" %} - + {% 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 @@

- - - - - - + {% 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 @@

- + {% 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 %}

{% for plugin, plugin_form in sidebar %} @@ -35,6 +35,4 @@ {% endfor %}

- + 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" %} - + {% 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 @@

- + 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 @@

[Clickable text](http://example.com)

{% addtoblock "js" %} - - - + - + {% endaddtoblock %} -- cgit v1.2.3 From bbeb451ac6750c526166db12080b1b6bc040c860 Mon Sep 17 00:00:00 2001 From: Gareth Coles 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 (limited to 'pydis_site/templates/wiki/includes') 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 %} 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 %} - - - - - Wiki | {% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %}{% endblock %} - - - - - - - - - {% render_block "css" %} - - - - - - - - - {% block wiki_body %} - - {% block wiki_navbar %} -

- -

- {% if user.is_authenticated %} -

- - 0 - {{ user }} - - -
- - - - {% trans "Account Settings" %} - -
- - - - {% trans "Log out" %} - -
- - - - {% trans "Deleted articles" %} - -
-

- {% else %} - - {% endif %} -

- {% block wiki_header_navlinks %} - - {% endblock %} -

- {% endblock %} - -

- - {% wiki_messages %} - - - {% block wiki_breadcrumbs %}{% endblock %} - - - {% block wiki_contents %}{% endblock %} - - -

- - {% endblock %} - - - - - - - {% render_block "js" %} - - - 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" %} @@ -15,7 +15,7 @@ {% endaddtoblock %} {% include "wiki/includes/editormedia.html" %} - +

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

Create First Article

@@ -49,5 +49,4 @@

- {% 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 @@ {% if not article.current_revision.locked or article|can_delete:user %} -

Restore Article

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 @@ Restore Article + {% for article in deleted_articles %} 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 @@

{% render_field filter_form.query render_labels=False %}

@@ -53,6 +56,7 @@ Slug Last modified + {% for urlpath in directory %} @@ -76,14 +80,17 @@ {% endif %} + {{ urlpath.slug }} + {{ urlpath.article.current_revision.created|naturaltime }} - {% empty%} + + {% empty %} There are no articles at this level 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 %} -

- {% trans "Warning: You are not logged in. Your IP address will be logged." %} - {% trans "Click here to log in" %} » -

- {% endif %} -

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 @@ {% endaddtoblock %} - {% addtoblock "css" %} - - {% endaddtoblock %} -

- {% 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." %} +

+ 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.

{% include "wiki/includes/pagination.html" %} -

- - - - - - - - - - {% for revision in revisions %} - - - - + +

Updated	Summary	Actions
- {% include "wiki/includes/revision_info.html" with current_revision=article.current_revision %} -	- {% if revision.user_message %} - {{ revision.user_message }} - {% elif revision.automatic_log %} - {{ revision.automatic_log }} - {% else %} - No summary - {% endif %} -	- {% if revision == article.current_revision %} - - - - - Preview - - - - - - Switch - - {% else %} - - - - - - Switch - - {% endif %} -

+ + + + + - {% endfor %} - -

Updated	Summary	Actions

+ + + {% for revision in revisions %} + + + {% include "wiki/includes/revision_info.html" with current_revision=article.current_revision %} + + + {% if revision.user_message %} + {{ revision.user_message }} + {% elif revision.automatic_log %} + {{ revision.automatic_log }} + {% else %} + No summary + {% endif %} + + + {% if revision == article.current_revision %} + + + + + Preview + + + + + + Switch + + {% else %} + + + + + + Switch + + {% endif %} + + + {% endfor %} + + - {% include "wiki/includes/pagination.html" %} + {% include "wiki/includes/pagination.html" %} - + -

- -

- - - - + + - {% 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 %}

-{% for plugin, plugin_form in sidebar %} + {% for plugin, plugin_form in sidebar %} +

+ {% if plugin.sidebar.icon_class %} + + {% if plugin.sidebar.icon_class == "fa-picture-o" %} + + {% else %} + + {% endif %} + + {% endif %} -

- {% if plugin.sidebar.icon_class %} - - {% if plugin.sidebar.icon_class == "fa-picture-o" %} - - {% else %} - - {% endif %} - - {% endif %} - {{ plugin.sidebar.headline }} -

+ {{ plugin.sidebar.headline }} +

- {% if plugin.sidebar.template %} - {% with plugin_form as form %} - - {% endwith %} - {% endif %}

-{% endfor %} +

+ {% if plugin.sidebar.template %} + {% with plugin_form as form %} + + {% endwith %} + {% endif %} +

+ {% endfor %}

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" %} - -{% for js in editor.Media.js %} - -{% endfor %} + + {% for js in editor.Media.js %} + + {% endfor %} {% endaddtoblock %} {% addtoblock "css" %} -{% for media, srcs in editor.Media.css.items %} - {% for src in srcs %} - + {% for media, srcs in editor.Media.css.items %} + {% for src in srcs %} + + {% 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 %}

{% 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" %} @@ -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 %} -{% trans "deleted" %} + deleted {% endif %} + {% if revision.previous_revision.deleted and not revision.deleted %} -{% trans "restored" %} + restored {% endif %} + {% if revision.locked %} -{% trans "locked" %} + locked {% endif %} + {% if revision.previous_revision.locked and not revision.locked %} -{% trans "unlocked" %} + unlocked {% 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 %} {% for urlpath in article.urlpath_set.all %} - {{ article.current_revision.title }}
Slug: /{{ urlpath.path }} + + {{ article.current_revision.title }} +
+ Slug: /{{ urlpath.path }} + {% empty %} - {{ article.current_revision.title }} + + {{ article.current_revision.title }} + {% endfor %} {% if article.current_revision.deleted %} - + + + {% endif %} {% if article.current_revision.locked %} - + + + {% endif %} + {{ article.current_revision.created|naturaltime }} 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 %} -

{% if urlpath.get_descendants %} @@ -30,40 +32,41 @@

- + + + + + + Go back + -{% addtoblock "js" %} - - -{% endaddtoblock %} + + + {% addtoblock "js" %} + + + {% 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 %} -

{% trans "The following images are available for this article. Copy the markdown tag to directly refer to an image from the article text." %}

The following images are available for this article. Copy the markdown tag to directly refer to an image from the article text.

- - - {% trans "Back to edit page" %} + + + + + Back to edit page

@@ -27,6 +32,7 @@ Size + @@ -76,21 +82,26 @@ {% endif %} {% endif %} + [image:{{ image.id }}] + {% include "wiki/includes/revision_info.html" %} + {{ revision.get_size|filesizeformat }}
{{ revision.width }}x{{ revision.height }} pixels + History + @@ -115,15 +126,19 @@ {% endthumbnail %} + + + +

{% include "wiki/includes/revision_info.html" with current_revision=image.current_revision revision=old_revision %}

{{ old_revision.imagerevision.width }}x{{ old_revision.imagerevision.height }} pixels

{% if image|can_write:user and old_revision != image.current_revision %} @@ -153,5 +168,4 @@

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

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
s and

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 @@

Upload an image to replace the current one.

{% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %}

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 %}

Link to another wiki page

@@ -50,7 +51,6 @@ {% 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 %}

- {% trans "Previewing merge between" %}: + Previewing merge between: {% include "wiki/includes/revision_info.html" with revision=merge1 %} - {% trans "and" %} + and {% include "wiki/includes/revision_info.html" with revision=merge2 %}

{% if merge1.deleted %}

- {% trans "You cannot merge with a deleted revision" %} + You cannot merge with a deleted revision

{% endif %} {% endif %} {% if revision and revision.deleted %}

- {% trans "This revision has been deleted." %} -

{% trans "Restoring to this revision will mark the article as deleted." %}

+ This revision has been deleted. +

Restoring to this revision will mark the article as deleted.

{% else %} -

- -

{% wiki_render article content %}

@@ -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 %}

@@ -38,5 +38,4 @@

- {% 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 @@ Title Last modified + {% for article in articles %} {% block wiki_search_loop %} {% include "wiki/includes/searchresult.html" %} {% endblock %} + {% empty %} 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 %} -

- - {% wiki_form form %} + + -

- {# Empty for spacing #} -

- + {% wiki_form form %} + +

+ {# Empty for spacing #} +

+ +

- + {% 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 0b6f16c023e587894def1e6e06913466a5af46bb Mon Sep 17 00:00:00 2001 From: Gareth Coles 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(-) (limited to 'pydis_site/templates/wiki/includes') 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 %}

{% endblock %} - -{% block wiki_footer_prepend %} -

This article was last modified: {{ article.current_revision.modified }}

-{% 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 @@ + {% 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 @@

{% endblock %} - {% block site_footer %} - {% block wiki_footer_prepend %}{% endblock %} - - {{ block.super }} - {% endblock %} - {% 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 %} -

{{ plugin.sidebar.headline }}

{{ form_error_title }}

{% trans "Congratulations!" %}

{% trans "Root article" %}

{% trans "Root article" %}

Create First Article

{% trans "Root article" %}

- {{ article.current_revision.title }} - - {% if urlpath.parent %} - {{ urlpath.slug }} - {% endif %} - {% if article.current_revision.locked %} - {% trans "locked" %} - {% endif %} - -

+ {{ article.current_revision.title }} + + {% if urlpath.parent %} + {{ urlpath.slug }} + {% endif %} + + {% if article.current_revision.locked %} + + + locked + {% endif %} + +

{{ article.current_revision.title }}

{% trans "Account Settings" %}

{% trans "Please log in" %}

{% trans "Sign up" %}

{{ plugin.sidebar.headline }}

Add image

{% trans "Add new image" %}

{{ form_error_title }}

{{ macro.short_description }}

{% trans "Search results for:" %} {{ search_query }}

Search results for: "{{ search_query }}"

Search results for: "{{ search_query }}"

{% trans "Add new article" %}

Add new article

Create First Article

Restore Article

{{ plugin.sidebar.headline }}

{{ form_error_title }}

{% trans "Congratulations!" %}

{% trans "Root article" %}

{% trans "Root article" %}

Create First Article

{% trans "Root article" %}

- {{ article.current_revision.title }} - - {% if urlpath.parent %} - {{ urlpath.slug }} - {% endif %} - {% if article.current_revision.locked %} - {% trans "locked" %} - {% endif %} - -

+ {{ article.current_revision.title }} + + {% if urlpath.parent %} + {{ urlpath.slug }} + {% endif %} + + {% if article.current_revision.locked %} + + + locked + {% endif %} + +

{{ form_error_title }}

{{ title }}

{{ article.current_revision.title }}

{% trans "Account Settings" %}

{% trans "Please log in" %}

{% trans "Sign up" %}

{{ plugin.sidebar.headline }}

Add image

{% trans "Add new image" %}

{{ form_error_title }}

{{ macro.short_description }}

{% trans "Search results for:" %} {{ search_query }}

Search results for: "{{ search_query }}"

Search results for: "{{ search_query }}"

Search results for: "{{ search_query }}"

{% trans "Merge with current" %}

Delete "{{ article.current_revision.title }}"

Not Found

Error

{% trans "Your notification settings" %}

{% trans "Add new article" %}

Add new article

Create First Article

Restore Article