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

Search results for: "{{ search_query }}"

- - -

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

- -
-
- - - - -
-
- +

Search results for: "{{ search_query }}"

+ + +

+ {% 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 %} -
TitleLast 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 %} +
TitleLast modified
+ No articles were found for that search query. +
+ + {% include "wiki/includes/pagination.html" %} {% endblock %} -- cgit v1.2.3