{{ object|verbose:"structure" }} |
@@ -114,7 +113,7 @@ {% trans "Attributes" %}
{% for label in object.labels.all %}
{% if label.published %}
- ☆
+ ☆
{% endif %}
{{ label.name }}
{% endfor %}
diff --git a/geotrek/sensitivity/templates/sensitivity/sensitivearea_detail_attributes.html b/geotrek/sensitivity/templates/sensitivity/sensitivearea_detail_attributes.html
index bbaaa39ab0..426e9a47a6 100644
--- a/geotrek/sensitivity/templates/sensitivity/sensitivearea_detail_attributes.html
+++ b/geotrek/sensitivity/templates/sensitivity/sensitivearea_detail_attributes.html
@@ -10,7 +10,6 @@
padding: 2px;
}
- {% trans "Attributes" %}
{{ sensitivearea|verbose:"structure" }} |
diff --git a/geotrek/tourism/templates/tourism/touristiccontent_detail_attributes.html b/geotrek/tourism/templates/tourism/touristiccontent_detail_attributes.html
index 48b510e9de..deaf0a42e7 100644
--- a/geotrek/tourism/templates/tourism/touristiccontent_detail_attributes.html
+++ b/geotrek/tourism/templates/tourism/touristiccontent_detail_attributes.html
@@ -2,7 +2,6 @@
{% load i18n mapentity_tags %}
{% block attributes %}
- {% trans "Attributes" %}
{{ object|verbose:"structure" }} |
diff --git a/geotrek/tourism/templates/tourism/touristicevent_detail_attributes.html b/geotrek/tourism/templates/tourism/touristicevent_detail_attributes.html
index abbbbb8985..9ac7920c8d 100644
--- a/geotrek/tourism/templates/tourism/touristicevent_detail_attributes.html
+++ b/geotrek/tourism/templates/tourism/touristicevent_detail_attributes.html
@@ -2,7 +2,6 @@
{% load i18n mapentity_tags %}
{% block attributes %}
- {% trans "Attributes" %}
{{ object|verbose:"structure" }} |
diff --git a/geotrek/trekking/locale/de/LC_MESSAGES/django.po b/geotrek/trekking/locale/de/LC_MESSAGES/django.po
index ed5d526102..bd964fb551 100644
--- a/geotrek/trekking/locale/de/LC_MESSAGES/django.po
+++ b/geotrek/trekking/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-08 16:23+0000\n"
+"POT-Creation-Date: 2025-01-06 15:41+0000\n"
"PO-Revision-Date: 2015-10-21 11:16+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -484,16 +484,6 @@ msgstr ""
msgid "APIDAE Trek #%(eid_val)s at line %(line)s"
msgstr ""
-msgid ""
-"Feature geometry cannot be converted to a single continuous LineString "
-"feature"
-msgstr ""
-
-msgid ""
-"Geometries from various features cannot be converted to a single continuous "
-"LineString feature"
-msgstr ""
-
msgid "Trek geometry is None"
msgstr ""
@@ -559,9 +549,6 @@ msgstr ""
msgid "Print booklet"
msgstr ""
-msgid "Photos accessibility"
-msgstr ""
-
msgid "Itinerancy"
msgstr "Roaming"
diff --git a/geotrek/trekking/locale/en/LC_MESSAGES/django.po b/geotrek/trekking/locale/en/LC_MESSAGES/django.po
index 65b7dbe881..f4eeb7af72 100644
--- a/geotrek/trekking/locale/en/LC_MESSAGES/django.po
+++ b/geotrek/trekking/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-08 16:23+0000\n"
+"POT-Creation-Date: 2025-01-06 15:41+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -469,16 +469,6 @@ msgstr ""
msgid "APIDAE Trek #%(eid_val)s at line %(line)s"
msgstr ""
-msgid ""
-"Feature geometry cannot be converted to a single continuous LineString "
-"feature"
-msgstr ""
-
-msgid ""
-"Geometries from various features cannot be converted to a single continuous "
-"LineString feature"
-msgstr ""
-
msgid "Trek geometry is None"
msgstr ""
@@ -542,9 +532,6 @@ msgstr ""
msgid "Print booklet"
msgstr ""
-msgid "Photos accessibility"
-msgstr ""
-
msgid "Itinerancy"
msgstr ""
diff --git a/geotrek/trekking/locale/es/LC_MESSAGES/django.po b/geotrek/trekking/locale/es/LC_MESSAGES/django.po
index 5f1ddf2b0d..cda5340c44 100644
--- a/geotrek/trekking/locale/es/LC_MESSAGES/django.po
+++ b/geotrek/trekking/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-08 16:23+0000\n"
+"POT-Creation-Date: 2025-01-06 15:41+0000\n"
"PO-Revision-Date: 2015-10-21 11:16+0200\n"
"Last-Translator: jean-etienne.castagnede@makina-corpus.com\n"
"Language-Team: \n"
@@ -469,16 +469,6 @@ msgstr ""
msgid "APIDAE Trek #%(eid_val)s at line %(line)s"
msgstr ""
-msgid ""
-"Feature geometry cannot be converted to a single continuous LineString "
-"feature"
-msgstr ""
-
-msgid ""
-"Geometries from various features cannot be converted to a single continuous "
-"LineString feature"
-msgstr ""
-
msgid "Trek geometry is None"
msgstr ""
@@ -542,9 +532,6 @@ msgstr ""
msgid "Print booklet"
msgstr ""
-msgid "Photos accessibility"
-msgstr ""
-
msgid "Itinerancy"
msgstr ""
diff --git a/geotrek/trekking/locale/fr/LC_MESSAGES/django.po b/geotrek/trekking/locale/fr/LC_MESSAGES/django.po
index d96b44ad64..dac6d0f958 100644
--- a/geotrek/trekking/locale/fr/LC_MESSAGES/django.po
+++ b/geotrek/trekking/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-08 16:23+0000\n"
+"POT-Creation-Date: 2025-01-06 15:41+0000\n"
"PO-Revision-Date: 2020-09-22 15:57+0000\n"
"Last-Translator: Emmanuelle Helly \n"
"Language-Team: French {% trans "Attributes" %}
diff --git a/geotrek/trekking/templates/trekking/service_detail_attributes.html b/geotrek/trekking/templates/trekking/service_detail_attributes.html
index fb0a448f12..a02e9fa7aa 100644
--- a/geotrek/trekking/templates/trekking/service_detail_attributes.html
+++ b/geotrek/trekking/templates/trekking/service_detail_attributes.html
@@ -2,7 +2,6 @@
{% load i18n mapentity_tags %}
{% block attributes %}
- {% trans "Attributes" %}
diff --git a/geotrek/trekking/templates/trekking/trek_detail.html b/geotrek/trekking/templates/trekking/trek_detail.html
index f61389344e..42af1762d2 100644
--- a/geotrek/trekking/templates/trekking/trek_detail.html
+++ b/geotrek/trekking/templates/trekking/trek_detail.html
@@ -12,19 +12,8 @@
{% trans "Print booklet" %}
{% endblock download %}
-{% block after_attachments_extra_tab_nav %}
- {% is_photos_accessibilities_enabled as enabled %}
- {% if enabled %}
-
-
- {% trans "Photos accessibility" %} ({{ object.attachments_accessibility.count }})
-
- {% endif %}
-{% endblock %}
-
-
{% block attachments_extra_tab_nav %}
- {% with attachments_count=object.attachments.count|add:object.view_points.count %}
+ {% with attachments_count=object.attachments.count|add:object.attachments_accessibility.count|add:object.view_points.count %}
{% trans "Attached files" %} ({{ attachments_count }})
@@ -32,19 +21,15 @@
{% endwith %%}
{% endblock %}
-{% block after_attachments_extra_tab_content %}
- {% is_photos_accessibilities_enabled as enabled %}
- {% if enabled %}
-
- {{ accessibility_attachments_enabled }}
- {% include 'common/attachment_accessibility_list.html' %}
-
- {% endif %}
-{% endblock %}
-
{% block attachmentspanel %}
{% include "trekking/ratio_info_fragment.html" %}
{{ block.super }}
+ {% is_photos_accessibilities_enabled as is_photos_accessibilities_enabled %}
+ {% if is_photos_accessibilities_enabled %}
+
+
+ {% include 'common/attachment_accessibility_list.html' %}
+ {% endif %}
{% are_hdviews_enabled as are_hdviews_enabled %}
{% if are_hdviews_enabled %}
diff --git a/geotrek/trekking/templates/trekking/trek_detail_attributes.html b/geotrek/trekking/templates/trekking/trek_detail_attributes.html
index 23422619a4..b7072a5ae2 100644
--- a/geotrek/trekking/templates/trekking/trek_detail_attributes.html
+++ b/geotrek/trekking/templates/trekking/trek_detail_attributes.html
@@ -4,7 +4,6 @@
{% block attributes %}
- {% trans "Attributes" %}
{{ trek|verbose:"structure" }} |
@@ -38,7 +37,7 @@ {% trans "Attributes" %}
{% for label in trek.labels.all %}
{% if label.published %}
- ☆
+ ☆
{% endif %}
{{ label.name }}
{% endfor %}
@@ -260,5 +259,6 @@ {% trans "Attributes" %}
|
+
{{ block.super }}
{% endblock attributes %}
diff --git a/requirements.txt b/requirements.txt
index 9402b9db39..4a328c49d4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -236,7 +236,8 @@ lxml==4.9.3
# via
# mapentity
# svglib
-mapentity==8.10.0
+#mapentity==8.10.0
+mapentity @ git+https://github.com/makinacorpus/django-mapentity.git@move_related_objects_to_new_tab
# via geotrek (setup.py)
markdown==3.7
# via geotrek (setup.py)
diff --git a/setup.py b/setup.py
index b34032010c..42ebdc8f1a 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def run(self):
install_requires=[
'Django==4.2.*',
'backports-zoneinfo;python_version<"3.10"', # not directly needed but required to make it worked with 3.10
- 'mapentity',
+ 'mapentity@git+https://github.com/makinacorpus/django-mapentity.git@move_related_objects_to_new_tab#egg=mapentity',
'chardet',
'cairosvg',
'cairocffi',
|