aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Gareth Coles <[email protected]>2019-04-19 12:16:57 +0100
committerGravatar Gareth Coles <[email protected]>2019-04-19 12:16:57 +0100
commit5e7b7d136a1b91a70ed56dad19454366febe9b0b (patch)
treebee5e37809602f8b3316973e412ee765818098d2
parentWiki pagination is special-cased, so we basically have one option for it (diff)
Add paginators at the top of paginated sections
-rw-r--r--pydis_site/templates/wiki/dir.html2
-rw-r--r--pydis_site/templates/wiki/history.html85
-rw-r--r--pydis_site/templates/wiki/plugins/images/index.html3
-rw-r--r--pydis_site/templates/wiki/search.html2
4 files changed, 49 insertions, 43 deletions
diff --git a/pydis_site/templates/wiki/dir.html b/pydis_site/templates/wiki/dir.html
index d8560089..3a7e3edb 100644
--- a/pydis_site/templates/wiki/dir.html
+++ b/pydis_site/templates/wiki/dir.html
@@ -42,6 +42,8 @@
{% endwith %}
</p>
+ {% include "wiki/includes/pagination.html" %}
+
<table class="table table-striped">
<tr>
<th>{% trans "Title" %}</th>
diff --git a/pydis_site/templates/wiki/history.html b/pydis_site/templates/wiki/history.html
index 793b4888..2e909df0 100644
--- a/pydis_site/templates/wiki/history.html
+++ b/pydis_site/templates/wiki/history.html
@@ -5,49 +5,48 @@
{% block wiki_pagetitle %}{% trans "History" %}: {{ article.current_revision.title }}{% endblock %}
{% block wiki_contents_tab %}
-
-{% include "wiki/includes/modals.html" %}
-
-{% addtoblock "js" %}
-<script type="text/javascript" src="{% static "wiki/js/diffview.js" %}"></script>
-<script type="text/javascript" src="{% static "wiki/js/diff.js" %}"></script>
-{% endaddtoblock %}
-{% addtoblock "css" %}
-<style type="text/css">
- td.linenumber {
- width: 20px;
- }
- tr.insert td {
- background-color: #DFC;
- }
- tr.delete td {
- background-color: #FDC;
- }
- tr.equal td {
- background-color: #F2F2F2;
- }
-
- .diff-container td {
- white-space: pre; font-family: monospace;
- }
- .diff-container td,
- .diff-container th {
- padding: 2px 7px;
- border-right: 1px solid #DDD;
- }
- .diff-container td:last-child,
- .diff-container th:last-child {
- border-right: none;
- }
- .diff-container table {
- border-top: 1px solid #DDD;
- }
-</style>
-{% endaddtoblock %}
-
-<p class="lead">
- {% trans "Click each revision to see a list of edited lines. Click the Preview button to see how the article looked at this stage. At the bottom of this page, you can change to a particular revision or merge an old revision with the current one." %}
-</p>
+ {% include "wiki/includes/modals.html" %}
+
+ {% addtoblock "js" %}
+ <script type="text/javascript" src="{% static "wiki/js/diffview.js" %}"></script>
+ <script type="text/javascript" src="{% static "wiki/js/diff.js" %}"></script>
+ {% endaddtoblock %}
+ {% addtoblock "css" %}
+ <style type="text/css">
+ td.linenumber {
+ width: 20px;
+ }
+ tr.insert td {
+ background-color: #DFC;
+ }
+ tr.delete td {
+ background-color: #FDC;
+ }
+ tr.equal td {
+ background-color: #F2F2F2;
+ }
+
+ .diff-container td {
+ white-space: pre; font-family: monospace;
+ }
+ .diff-container td,
+ .diff-container th {
+ padding: 2px 7px;
+ border-right: 1px solid #DDD;
+ }
+ .diff-container td:last-child,
+ .diff-container th:last-child {
+ border-right: none;
+ }
+ .diff-container table {
+ border-top: 1px solid #DDD;
+ }
+ </style>
+ {% endaddtoblock %}
+
+ <p class="lead">
+ {% trans "Click each revision to see a list of edited lines. Click the Preview button to see how the article looked at this stage. At the bottom of this page, you can change to a particular revision or merge an old revision with the current one." %}
+ </p>
{% include "wiki/includes/pagination.html" %}
diff --git a/pydis_site/templates/wiki/plugins/images/index.html b/pydis_site/templates/wiki/plugins/images/index.html
index 4973ea6f..2b4d9800 100644
--- a/pydis_site/templates/wiki/plugins/images/index.html
+++ b/pydis_site/templates/wiki/plugins/images/index.html
@@ -13,6 +13,9 @@
{% trans "Back to edit page" %}
</a>
</p>
+
+ {% include "wiki/includes/pagination.html" %}
+
<table class="table is-fullwidth">
{% for image in images %}
{% with image.current_revision.imagerevision as revision %}
diff --git a/pydis_site/templates/wiki/search.html b/pydis_site/templates/wiki/search.html
index 80379a1d..296b21b3 100644
--- a/pydis_site/templates/wiki/search.html
+++ b/pydis_site/templates/wiki/search.html
@@ -37,6 +37,8 @@
</p>
</form>
+ {% include "wiki/includes/pagination.html" %}
+
<table class="table is-striped">
<tr>
<th>Title</th>