From 6d97ecc3a21c0328cb99e911f437928af7fcd528 Mon Sep 17 00:00:00 2001
From: Olivier Mehani <shtrom+mediagoblin@ssji.net>
Date: Sun, 17 May 2020 02:24:07 +1000
Subject: [PATCH 1/5] Generalise keyboard navigation
---
mediagoblin/templates/mediagoblin/root.html | 2 ++
.../templates/mediagoblin/user_pages/collection.html | 2 ++
mediagoblin/templates/mediagoblin/user_pages/gallery.html | 2 ++
mediagoblin/templates/mediagoblin/user_pages/user.html | 2 ++
mediagoblin/templates/mediagoblin/utils/pagination.html | 6 ++++--
5 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 15d53af1..22fffb1c 100644
a
|
b
|
|
22 | 22 | {% set feed_url = request.urlgen('mediagoblin.listings.atom_feed') %} |
23 | 23 | |
24 | 24 | {% block mediagoblin_head -%} |
| 25 | <script type="text/javascript" |
| 26 | src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script> |
25 | 27 | {% set feed_url = request.urlgen('mediagoblin.listings.atom_feed') -%} |
26 | 28 | <link rel="alternate" type="application/atom+xml" href="{{ feed_url }}"> |
27 | 29 | {%- endblock mediagoblin_head %} |
diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection.html b/mediagoblin/templates/mediagoblin/user_pages/collection.html
index 171de887..c9d9fbcd 100644
a
|
b
|
|
20 | 20 | {% from "mediagoblin/utils/collection_gallery.html" import collection_gallery %} |
21 | 21 | |
22 | 22 | {% block mediagoblin_head %} |
| 23 | <script type="text/javascript" |
| 24 | src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script> |
23 | 25 | <link rel="alternate" type="application/atom+xml" |
24 | 26 | href="{{ request.urlgen( |
25 | 27 | 'mediagoblin.user_pages.atom_feed', |
diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index f23bb156..af183890 100644
a
|
b
|
|
20 | 20 | {% from "mediagoblin/utils/object_gallery.html" import object_gallery %} |
21 | 21 | |
22 | 22 | {% block mediagoblin_head %} |
| 23 | <script type="text/javascript" |
| 24 | src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script> |
23 | 25 | <link rel="alternate" type="application/atom+xml" |
24 | 26 | href="{{ request.urlgen( |
25 | 27 | 'mediagoblin.user_pages.atom_feed', |
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 9ac96f80..ff1c904d 100644
a
|
b
|
|
23 | 23 | {% from "mediagoblin/utils/object_gallery.html" import object_gallery %} |
24 | 24 | |
25 | 25 | {% block mediagoblin_head %} |
| 26 | <script type="text/javascript" |
| 27 | src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script> |
26 | 28 | <link rel="alternate" type="application/atom+xml" |
27 | 29 | href="{{ request.urlgen( |
28 | 30 | 'mediagoblin.user_pages.atom_feed', |
diff --git a/mediagoblin/templates/mediagoblin/utils/pagination.html b/mediagoblin/templates/mediagoblin/utils/pagination.html
index 2ac990ae..2b19d14c 100644
a
|
b
|
|
36 | 36 | {% set prev_url = pagination.get_page_url_explicit( |
37 | 37 | base_url, get_params, |
38 | 38 | pagination.page - 1) %} |
39 | | <a href="{{ prev_url }}">{% trans %}â Newer{% endtrans %}</a> |
| 39 | <a class="navigation_left" |
| 40 | href="{{ prev_url }}">{% trans %}â Newer{% endtrans %}</a> |
40 | 41 | {% endif %} |
41 | 42 | {% if pagination.has_next %} |
42 | 43 | {% set next_url = pagination.get_page_url_explicit( |
43 | 44 | base_url, get_params, |
44 | 45 | pagination.page + 1) %} |
45 | | <a href="{{ next_url }}">{% trans %}Older â{% endtrans %}</a> |
| 46 | <a class="navigation_right" |
| 47 | href="{{ next_url }}">{% trans %}Older â{% endtrans %}</a> |
46 | 48 | {% endif %} |
47 | 49 | <br /> |
48 | 50 | {% trans %}Go to page:{% endtrans %} |