diff options
author | 2019-04-20 14:32:53 +0100 | |
---|---|---|
committer | 2019-04-20 14:32:53 +0100 | |
commit | bbeb451ac6750c526166db12080b1b6bc040c860 (patch) | |
tree | c74468da0b3059045e1e294bf17b062943b79079 /pydis_site/templates/wiki/includes | |
parent | Update Pipfile.lock and move home app tests (diff) |
Address reviews
Diffstat (limited to 'pydis_site/templates/wiki/includes')
9 files changed, 77 insertions, 61 deletions
diff --git a/pydis_site/templates/wiki/includes/article_menu.html b/pydis_site/templates/wiki/includes/article_menu.html index 5429f6a8..473df483 100644 --- a/pydis_site/templates/wiki/includes/article_menu.html +++ b/pydis_site/templates/wiki/includes/article_menu.html @@ -1,4 +1,4 @@ -{% load i18n wiki_tags %} +{% load wiki_tags %} {% if article|can_write:user %} {% with selected_tab as selected %} diff --git a/pydis_site/templates/wiki/includes/editor.html b/pydis_site/templates/wiki/includes/editor.html index bc1da1a0..6eb6cd45 100644 --- a/pydis_site/templates/wiki/includes/editor.html +++ b/pydis_site/templates/wiki/includes/editor.html @@ -1,4 +1,4 @@ -{% load wiki_tags i18n sekizai_tags %} +{% load wiki_tags %} {% include "wiki/includes/editormedia.html" %} {% wiki_form form %} diff --git a/pydis_site/templates/wiki/includes/editor_sidebar.html b/pydis_site/templates/wiki/includes/editor_sidebar.html index 5c24e74d..45ac87a1 100644 --- a/pydis_site/templates/wiki/includes/editor_sidebar.html +++ b/pydis_site/templates/wiki/includes/editor_sidebar.html @@ -1,38 +1,38 @@ -{% load i18n sekizai_tags static %} +{% load static %} <section class="accordions"> -{% for plugin, plugin_form in sidebar %} + {% for plugin, plugin_form in sidebar %} + <article class="accordion is-primary"> + <div class="accordion-header toggle"> + <p> + {% if plugin.sidebar.icon_class %} + <span class="icon"> + {% if plugin.sidebar.icon_class == "fa-picture-o" %} + <i class="fas fa-images"></i> + {% else %} + <i class="fas {{ plugin.sidebar.icon_class }}"></i> + {% endif %} + </span> + {% endif %} - <article class="accordion is-primary"> - <div class="accordion-header toggle"> - <p> - {% if plugin.sidebar.icon_class %} - <span class="icon"> - {% if plugin.sidebar.icon_class == "fa-picture-o" %} - <i class="fas fa-images"></i> - {% else %} - <i class="fas {{ plugin.sidebar.icon_class }}"></i> - {% endif %} - </span> - {% endif %} - {{ plugin.sidebar.headline }} - </p> + {{ plugin.sidebar.headline }} + </p> - </div> - <div class="accordion-body"> - <div class="accordion-content"> - {% if plugin.sidebar.template %} - {% with plugin_form as form %} - <form method="POST" class="form-horizontal sidebar-form" action="?f={{ plugin_form.form_id }}" enctype="multipart/form-data"> - {% csrf_token %} - {% include plugin.sidebar.template %} - </form> - {% endwith %} - {% endif %} </div> - </div> - </article> -{% endfor %} + <div class="accordion-body"> + <div class="accordion-content"> + {% if plugin.sidebar.template %} + {% with plugin_form as form %} + <form method="POST" class="form-horizontal sidebar-form" action="?f={{ plugin_form.form_id }}" enctype="multipart/form-data"> + {% csrf_token %} + {% include plugin.sidebar.template %} + </form> + {% endwith %} + {% endif %} + </div> + </div> + </article> + {% endfor %} </section> <script type="application/javascript" src="{% static "js/wiki/editor_sidebar.js" %}"></script> diff --git a/pydis_site/templates/wiki/includes/editormedia.html b/pydis_site/templates/wiki/includes/editormedia.html index 307a3078..c10fbef8 100644 --- a/pydis_site/templates/wiki/includes/editormedia.html +++ b/pydis_site/templates/wiki/includes/editormedia.html @@ -1,15 +1,17 @@ -{% load sekizai_tags static %} +{% load sekizai_tags %} +{% load static %} + {% addtoblock "js" %} -<script type="text/javascript" src="{% static "wiki/js/editor.js" %}"></script> -{% for js in editor.Media.js %} -<script type="text/javascript" src="{% static js %}"></script> -{% endfor %} + <script type="text/javascript" src="{% static "wiki/js/editor.js" %}"></script> + {% for js in editor.Media.js %} + <script type="text/javascript" src="{% static js %}"></script> + {% endfor %} {% endaddtoblock %} {% addtoblock "css" %} -{% for media, srcs in editor.Media.css.items %} - {% for src in srcs %} - <link rel="stylesheet" media="{{ media }}" href="{% static src %}" /> + {% for media, srcs in editor.Media.css.items %} + {% for src in srcs %} + <link rel="stylesheet" media="{{ media }}" href="{% static src %}" /> + {% endfor %} {% endfor %} -{% endfor %} {% endaddtoblock %} diff --git a/pydis_site/templates/wiki/includes/form.html b/pydis_site/templates/wiki/includes/form.html index 3e1abb67..4ea08de4 100644 --- a/pydis_site/templates/wiki/includes/form.html +++ b/pydis_site/templates/wiki/includes/form.html @@ -1,17 +1,16 @@ -{% csrf_token %}{% load sekizai_tags %} +{% load sekizai_tags %} +{% csrf_token %} {% include "wiki/includes/formerrors.html" %} {% addtoblock "js" %} -{{ form.media.js }} + {{ form.media.js }} {% endaddtoblock %} {% addtoblock "css" %} -{{ form.media.css }} + {{ form.media.css }} {% endaddtoblock %} {% for field in form %} - {% include "wiki/includes/formfield.html" %} - {% endfor %} diff --git a/pydis_site/templates/wiki/includes/pagination.html b/pydis_site/templates/wiki/includes/pagination.html index 0bdcbdc2..35dac538 100644 --- a/pydis_site/templates/wiki/includes/pagination.html +++ b/pydis_site/templates/wiki/includes/pagination.html @@ -1,4 +1,5 @@ {% load i18n %} + {% if is_paginated %} <nav class="pagination" role="navigation" aria-label="pagination"> {% if page_obj.has_previous %} diff --git a/pydis_site/templates/wiki/includes/render.html b/pydis_site/templates/wiki/includes/render.html index 28ab76c9..c0334d98 100644 --- a/pydis_site/templates/wiki/includes/render.html +++ b/pydis_site/templates/wiki/includes/render.html @@ -1,4 +1,5 @@ -{% load wiki_tags i18n cache sekizai_tags static %} +{% load sekizai_tags %} +{% load static %} {% addtoblock "js" %} <script type="text/javascript" src="{% static "wiki/js/article.js" %}"></script> @@ -16,6 +17,7 @@ {% endfor %} {% endaddtoblock %} {% endif %} + {% if plugin.RenderMedia.js %} {% addtoblock "js" %} {% for url in plugin.RenderMedia.js %} diff --git a/pydis_site/templates/wiki/includes/revision_info.html b/pydis_site/templates/wiki/includes/revision_info.html index 724f7296..f2964034 100644 --- a/pydis_site/templates/wiki/includes/revision_info.html +++ b/pydis_site/templates/wiki/includes/revision_info.html @@ -1,22 +1,24 @@ {% comment %} - This reusable code is shared between different templates and different inheritors of BaseRevision. - {% endcomment %} +{% load wiki_tags %} + +{% if not hidedate %}{{ revision.created }}{% endif %} {% if not hidenumber %}(#{{ revision.revision_number }}) by{% endif %} {% if revision.user %}{{ revision.user }}{% else %}{% if article|can_moderate:user %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}anonymous (IP logged){% endif %}{% endif %} -{% load wiki_tags i18n %} -{% if not hidedate %}{{ revision.created }}{% endif %} {% if not hidenumber %}(#{{ revision.revision_number }}) {% trans "by" %}{% endif %} {% if revision.user %}{{ revision.user }}{% else %}{% if article|can_moderate:user %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %} {% if revision.deleted %} -<span class="badge badge-important">{% trans "deleted" %}</span> + <span class="tag is-danger">deleted</span> {% endif %} + {% if revision.previous_revision.deleted and not revision.deleted %} -<span class="badge badge-success">{% trans "restored" %}</span> + <span class="tag is-success">restored</span> {% endif %} + {% if revision.locked %} -<span class="badge">{% trans "locked" %}</span> + <span class="tag is-danger">locked</span> {% endif %} + {% if revision.previous_revision.locked and not revision.locked %} -<span class="badge">{% trans "unlocked" %}</span> + <span class="tag is-success">unlocked</span> {% endif %} diff --git a/pydis_site/templates/wiki/includes/searchresult.html b/pydis_site/templates/wiki/includes/searchresult.html index 350280a0..897ee4a6 100644 --- a/pydis_site/templates/wiki/includes/searchresult.html +++ b/pydis_site/templates/wiki/includes/searchresult.html @@ -1,22 +1,32 @@ -{% load wiki_tags i18n humanize %} - +{% load humanize %} <tr> <td> {% for urlpath in article.urlpath_set.all %} - <a href="{% url 'wiki:get' path=urlpath.path %}">{{ article.current_revision.title }}<br /><small class="has-text-grey">Slug: /{{ urlpath.path }}</small></a> + <a href="{% url 'wiki:get' path=urlpath.path %}"> + {{ article.current_revision.title }} + <br /> + <small class="has-text-grey">Slug: /{{ urlpath.path }}</small> + </a> {% empty %} - <a href="{% url 'wiki:get' article_id=article.id %}">{{ article.current_revision.title }}</a> + <a href="{% url 'wiki:get' article_id=article.id %}"> + {{ article.current_revision.title }} + </a> {% endfor %} {% if article.current_revision.deleted %} - <span class="fa fa-trash"></span> + <span class="icon"> + <i class="fas fa-trash"></i> + </span> {% endif %} {% if article.current_revision.locked %} - <span class="fa fa-lock"></span> + <span class="icon"> + <i class="fas fa-lock"></i> + </span> {% endif %} </td> + <td class="has-text-right"> {{ article.current_revision.created|naturaltime }} </td> |