fnp
/
wolnelektury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6dc65dc
)
polishing map fixes
author
Radek Czajka
<rczajka@rczajka.pl>
Fri, 16 Jun 2023 09:25:29 +0000
(11:25 +0200)
committer
Radek Czajka
<rczajka@rczajka.pl>
Fri, 16 Jun 2023 09:25:29 +0000
(11:25 +0200)
src/references/templates/references/map.html
patch
|
blob
|
history
src/references/templates/references/popup.html
patch
|
blob
|
history
src/references/views.py
patch
|
blob
|
history
src/wolnelektury/static/2022/styles/pages/_map.scss
patch
|
blob
|
history
diff --git
a/src/references/templates/references/map.html
b/src/references/templates/references/map.html
index
04d3e80
..
b182b9c
100644
(file)
--- a/
src/references/templates/references/map.html
+++ b/
src/references/templates/references/map.html
@@
-1,4
+1,5
@@
{% extends "2022/base.html" %}
{% extends "2022/base.html" %}
+{% load cache %}
{% load static %}
{% load l10n %}
{% load static %}
{% load l10n %}
@@
-55,6
+56,7
@@
);
}
);
}
+ {% cache 60 references-map %}
{% localize off %}
{% for e in entities %}
L.marker(
{% localize off %}
{% for e in entities %}
L.marker(
@@
-67,6
+69,7
@@
).on('click', showMarker).addTo(markers);
{% endfor %}
{% endlocalize %}
).on('click', showMarker).addTo(markers);
{% endfor %}
{% endlocalize %}
+ {% endcache %}
map.addLayer(markers);
map.addLayer(markers);
diff --git
a/src/references/templates/references/popup.html
b/src/references/templates/references/popup.html
index
f4ac1f0
..
f8977e6
100644
(file)
--- a/
src/references/templates/references/popup.html
+++ b/
src/references/templates/references/popup.html
@@
-7,7
+7,6
@@
<div class="l-popup-books">
{% for ref in entity.reference_set.all %}
<div class="l-popup-books">
{% for ref in entity.reference_set.all %}
- <!-- a href='/katalog/lektura/{{ ref.book.slug }}.html#{{ ref.first_section }}' target="_blank"-->
<div class="c-search-result-fragment">
<div class="l-popup-book-header">
<div>
<div class="c-search-result-fragment">
<div class="l-popup-book-header">
<div>
diff --git
a/src/references/views.py
b/src/references/views.py
index
ae4e5fa
..
3c12c8f
100644
(file)
--- a/
src/references/views.py
+++ b/
src/references/views.py
@@
-27,8
+27,6
@@
def pin_map_tagged(request, tags):
})
})
-
-@never_cache
def popup(request, pk):
e = get_object_or_404(models.Entity, pk=pk)
return render(request, 'references/popup.html', {
def popup(request, pk):
e = get_object_or_404(models.Entity, pk=pk)
return render(request, 'references/popup.html', {
diff --git
a/src/wolnelektury/static/2022/styles/pages/_map.scss
b/src/wolnelektury/static/2022/styles/pages/_map.scss
index
32b73f5
..
a7c2e8f
100644
(file)
--- a/
src/wolnelektury/static/2022/styles/pages/_map.scss
+++ b/
src/wolnelektury/static/2022/styles/pages/_map.scss
@@
-20,6
+20,11
@@
gap: 5px;
max-height: 350px;
overflow-y: scroll;
gap: 5px;
max-height: 350px;
overflow-y: scroll;
+
+ margin-left: -10px;
+ margin-right: -10px;
+ padding-left: 10px;
+ padding-right: 10px;
}
.l-popup-books img {
display: block;
}
.l-popup-books img {
display: block;