From d4298c7df4dea564a94353641b9ed0ffdea6ec00 Mon Sep 17 00:00:00 2001 From: Justine Fricou Date: Tue, 7 Jan 2025 11:22:18 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20[UI/UX]=20Restructure=20detail?= =?UTF-8?q?=20page=20(#2967)=20-=20Move=20an=20object's=20related=20object?= =?UTF-8?q?s=20from=20the=20properties=20tab=20into=20their=20own=20tab=20?= =?UTF-8?q?-=20Move=20accessibility=20pictures=20into=20the=20attached=20f?= =?UTF-8?q?iles=20tab=20-=20Remove=20the=20display=20of=20the=20structure?= =?UTF-8?q?=20in=20the=20properties=20tab=20title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cypress/integration/nav_tabs.js | 6 +-- docs/changelog.rst | 6 +++ .../authent_propertiestab_fragment.html | 4 -- .../cirkwi/locale/de/LC_MESSAGES/django.po | 6 +-- .../cirkwi/locale/en/LC_MESSAGES/django.po | 6 +-- .../cirkwi/locale/es/LC_MESSAGES/django.po | 6 +-- .../cirkwi/locale/fr/LC_MESSAGES/django.po | 6 +-- .../cirkwi/locale/it/LC_MESSAGES/django.po | 6 +-- .../cirkwi/locale/nl/LC_MESSAGES/django.po | 6 +-- .../common/locale/de/LC_MESSAGES/django.po | 15 +++++++- .../common/locale/en/LC_MESSAGES/django.po | 15 +++++++- .../common/locale/es/LC_MESSAGES/django.po | 15 +++++++- .../common/locale/fr/LC_MESSAGES/django.po | 15 +++++++- .../common/locale/it/LC_MESSAGES/django.po | 15 +++++++- .../common/locale/nl/LC_MESSAGES/django.po | 15 +++++++- geotrek/core/templates/core/trail_detail.html | 2 +- .../feedback/locale/de/LC_MESSAGES/django.po | 14 +++---- .../feedback/locale/en/LC_MESSAGES/django.po | 14 +++---- .../feedback/locale/es/LC_MESSAGES/django.po | 14 +++---- .../feedback/locale/fr/LC_MESSAGES/django.po | 36 +++++++++--------- .../feedback/locale/it/LC_MESSAGES/django.po | 14 +++---- .../feedback/locale/nl/LC_MESSAGES/django.po | 14 +++---- .../templates/feedback/report_detail.html | 37 ++++++++++++++++++- .../feedback/report_detail_attributes.html | 30 --------------- .../outdoor/course_detail_attributes.html | 2 +- .../outdoor/site_detail_attributes.html | 2 +- .../trekking/locale/de/LC_MESSAGES/django.po | 15 +------- .../trekking/locale/en/LC_MESSAGES/django.po | 15 +------- .../trekking/locale/es/LC_MESSAGES/django.po | 15 +------- .../trekking/locale/fr/LC_MESSAGES/django.po | 19 +--------- .../trekking/locale/it/LC_MESSAGES/django.po | 15 +------- .../trekking/locale/nl/LC_MESSAGES/django.po | 15 +------- .../templates/trekking/trek_detail.html | 29 ++++----------- .../trekking/trek_detail_attributes.html | 3 +- requirements.txt | 3 +- setup.py | 2 +- 36 files changed, 209 insertions(+), 243 deletions(-) delete mode 100644 geotrek/authent/templates/authent/authent_propertiestab_fragment.html diff --git a/cypress/integration/nav_tabs.js b/cypress/integration/nav_tabs.js index 26c0014233..34e48c58f5 100644 --- a/cypress/integration/nav_tabs.js +++ b/cypress/integration/nav_tabs.js @@ -22,9 +22,9 @@ describe('Nav tabs properties/attachments', () => { cy.visit(href); }); cy.get("a#tab-properties").should('have.class', 'active'); - cy.get("a#tab-attachments-accessibility").should('not.have.class', 'active'); - cy.get("a#tab-attachments-accessibility").click(); - cy.get("a#tab-attachments-accessibility").should('have.class', 'active'); + cy.get("a#tab-related-objects").should('not.have.class', 'active'); + cy.get("a#tab-related-objects").click(); + cy.get("a#tab-related-objects").should('have.class', 'active'); cy.get("a#tab-properties").should('not.have.class', 'active'); }); }); diff --git a/docs/changelog.rst b/docs/changelog.rst index 87c8183fc6..180d74943e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,12 @@ CHANGELOG 2.111.0+dev (XXXX-XX-XX) ---------------------------- +**UI/UX** + +- Move the related objects from the properties tab into their own tab, on objects details pages (refs #2967) +- Move Treks' accessibility pictures into the attached files tab (refs #2967) +- Removes the display of an object's structure in its properties tab title + **Documentation** - Update theme color diff --git a/geotrek/authent/templates/authent/authent_propertiestab_fragment.html b/geotrek/authent/templates/authent/authent_propertiestab_fragment.html deleted file mode 100644 index 9bf0c109e6..0000000000 --- a/geotrek/authent/templates/authent/authent_propertiestab_fragment.html +++ /dev/null @@ -1,4 +0,0 @@ -{% load i18n %} -{% if object.structure %} - {{ object.structure }} -{% endif %} \ No newline at end of file diff --git a/geotrek/cirkwi/locale/de/LC_MESSAGES/django.po b/geotrek/cirkwi/locale/de/LC_MESSAGES/django.po index 437d36b743..edaee0eb4f 100644 --- a/geotrek/cirkwi/locale/de/LC_MESSAGES/django.po +++ b/geotrek/cirkwi/locale/de/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-20 12:48+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" @@ -45,10 +45,6 @@ msgstr "" msgid "Cirkwi POI categories" msgstr "" -#, python-brace-format -msgid "Failed to download {url}. HTTP status code {status_code}" -msgstr "" - #, python-brace-format msgid "" "{model} '{val}' did not exist in Geotrek-Admin and was automatically created" diff --git a/geotrek/cirkwi/locale/en/LC_MESSAGES/django.po b/geotrek/cirkwi/locale/en/LC_MESSAGES/django.po index 437d36b743..edaee0eb4f 100644 --- a/geotrek/cirkwi/locale/en/LC_MESSAGES/django.po +++ b/geotrek/cirkwi/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-20 12:48+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" @@ -45,10 +45,6 @@ msgstr "" msgid "Cirkwi POI categories" msgstr "" -#, python-brace-format -msgid "Failed to download {url}. HTTP status code {status_code}" -msgstr "" - #, python-brace-format msgid "" "{model} '{val}' did not exist in Geotrek-Admin and was automatically created" diff --git a/geotrek/cirkwi/locale/es/LC_MESSAGES/django.po b/geotrek/cirkwi/locale/es/LC_MESSAGES/django.po index 437d36b743..edaee0eb4f 100644 --- a/geotrek/cirkwi/locale/es/LC_MESSAGES/django.po +++ b/geotrek/cirkwi/locale/es/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-20 12:48+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" @@ -45,10 +45,6 @@ msgstr "" msgid "Cirkwi POI categories" msgstr "" -#, python-brace-format -msgid "Failed to download {url}. HTTP status code {status_code}" -msgstr "" - #, python-brace-format msgid "" "{model} '{val}' did not exist in Geotrek-Admin and was automatically created" diff --git a/geotrek/cirkwi/locale/fr/LC_MESSAGES/django.po b/geotrek/cirkwi/locale/fr/LC_MESSAGES/django.po index 065a22ce90..224ed19959 100644 --- a/geotrek/cirkwi/locale/fr/LC_MESSAGES/django.po +++ b/geotrek/cirkwi/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-20 12:30+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" @@ -44,10 +44,6 @@ msgstr "Catégorie de POI Cirkwi" msgid "Cirkwi POI categories" msgstr "Catégories de POI Cirkwi" -#, python-brace-format -msgid "Failed to download {url}. HTTP status code {status_code}" -msgstr "Téléchargement impossible de {url}. Code d'erreur HTTP {status_code}" - #, python-brace-format msgid "" "{model} '{val}' did not exist in Geotrek-Admin and was automatically created" diff --git a/geotrek/cirkwi/locale/it/LC_MESSAGES/django.po b/geotrek/cirkwi/locale/it/LC_MESSAGES/django.po index 437d36b743..edaee0eb4f 100644 --- a/geotrek/cirkwi/locale/it/LC_MESSAGES/django.po +++ b/geotrek/cirkwi/locale/it/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-20 12:48+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" @@ -45,10 +45,6 @@ msgstr "" msgid "Cirkwi POI categories" msgstr "" -#, python-brace-format -msgid "Failed to download {url}. HTTP status code {status_code}" -msgstr "" - #, python-brace-format msgid "" "{model} '{val}' did not exist in Geotrek-Admin and was automatically created" diff --git a/geotrek/cirkwi/locale/nl/LC_MESSAGES/django.po b/geotrek/cirkwi/locale/nl/LC_MESSAGES/django.po index 437d36b743..edaee0eb4f 100644 --- a/geotrek/cirkwi/locale/nl/LC_MESSAGES/django.po +++ b/geotrek/cirkwi/locale/nl/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-20 12:48+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" @@ -45,10 +45,6 @@ msgstr "" msgid "Cirkwi POI categories" msgstr "" -#, python-brace-format -msgid "Failed to download {url}. HTTP status code {status_code}" -msgstr "" - #, python-brace-format msgid "" "{model} '{val}' did not exist in Geotrek-Admin and was automatically created" diff --git a/geotrek/common/locale/de/LC_MESSAGES/django.po b/geotrek/common/locale/de/LC_MESSAGES/django.po index 242d48b728..2672d91797 100644 --- a/geotrek/common/locale/de/LC_MESSAGES/django.po +++ b/geotrek/common/locale/de/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-08-06 08:26+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" @@ -505,6 +505,9 @@ msgstr "" msgid "You are not allowed to see attachments." msgstr "" +msgid "New accessibility photo" +msgstr "" + msgid " Confirm file deletion" msgstr "" @@ -695,6 +698,16 @@ msgctxt "West" msgid "W" 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 "Reports" msgstr "" diff --git a/geotrek/common/locale/en/LC_MESSAGES/django.po b/geotrek/common/locale/en/LC_MESSAGES/django.po index 242d48b728..2672d91797 100644 --- a/geotrek/common/locale/en/LC_MESSAGES/django.po +++ b/geotrek/common/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-08-06 08:26+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" @@ -505,6 +505,9 @@ msgstr "" msgid "You are not allowed to see attachments." msgstr "" +msgid "New accessibility photo" +msgstr "" + msgid " Confirm file deletion" msgstr "" @@ -695,6 +698,16 @@ msgctxt "West" msgid "W" 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 "Reports" msgstr "" diff --git a/geotrek/common/locale/es/LC_MESSAGES/django.po b/geotrek/common/locale/es/LC_MESSAGES/django.po index cfdf07737a..cda70a71da 100644 --- a/geotrek/common/locale/es/LC_MESSAGES/django.po +++ b/geotrek/common/locale/es/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-08-06 08:26+0000\n" +"POT-Creation-Date: 2025-01-06 15:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivia Duval \n" "Language-Team: LANGUAGE \n" @@ -505,6 +505,9 @@ msgstr "" msgid "You are not allowed to see attachments." msgstr "" +msgid "New accessibility photo" +msgstr "" + msgid " Confirm file deletion" msgstr "" @@ -695,6 +698,16 @@ msgctxt "West" msgid "W" 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 "Reports" msgstr "" diff --git a/geotrek/common/locale/fr/LC_MESSAGES/django.po b/geotrek/common/locale/fr/LC_MESSAGES/django.po index b3f66c1095..5c869dc85c 100644 --- a/geotrek/common/locale/fr/LC_MESSAGES/django.po +++ b/geotrek/common/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-06 08:26+0000\n" +"POT-Creation-Date: 2025-01-06 15:41+0000\n" "PO-Revision-Date: 2020-09-23 07:10+0000\n" "Last-Translator: Emmanuelle Helly \n" "Language-Team: French \n" "Language-Team: LANGUAGE \n" @@ -505,6 +505,9 @@ msgstr "" msgid "You are not allowed to see attachments." msgstr "" +msgid "New accessibility photo" +msgstr "" + msgid " Confirm file deletion" msgstr "" @@ -695,6 +698,16 @@ msgctxt "West" msgid "W" 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 "Reports" msgstr "" diff --git a/geotrek/common/locale/nl/LC_MESSAGES/django.po b/geotrek/common/locale/nl/LC_MESSAGES/django.po index 242d48b728..2672d91797 100644 --- a/geotrek/common/locale/nl/LC_MESSAGES/django.po +++ b/geotrek/common/locale/nl/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-08-06 08:26+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" @@ -505,6 +505,9 @@ msgstr "" msgid "You are not allowed to see attachments." msgstr "" +msgid "New accessibility photo" +msgstr "" + msgid " Confirm file deletion" msgstr "" @@ -695,6 +698,16 @@ msgctxt "West" msgid "W" 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 "Reports" msgstr "" diff --git a/geotrek/core/templates/core/trail_detail.html b/geotrek/core/templates/core/trail_detail.html index 4892505243..11d1fc3827 100644 --- a/geotrek/core/templates/core/trail_detail.html +++ b/geotrek/core/templates/core/trail_detail.html @@ -8,4 +8,4 @@
{% trans "GPX" %} {% trans "KML" %} -{% endblock download %} \ No newline at end of file +{% endblock download %} diff --git a/geotrek/feedback/locale/de/LC_MESSAGES/django.po b/geotrek/feedback/locale/de/LC_MESSAGES/django.po index a65044cb84..f5d7486e88 100644 --- a/geotrek/feedback/locale/de/LC_MESSAGES/django.po +++ b/geotrek/feedback/locale/de/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-06-04 15:20+0000\n" +"POT-Creation-Date: 2025-01-06 15:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -266,6 +266,12 @@ msgid "" "Some data could not be forwarded to Suricate yet - Please come back later" msgstr "" +msgid "Intervention" +msgstr "" + +msgid "Add a new intervention" +msgstr "" + msgid "Attributes" msgstr "" @@ -296,12 +302,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Intervention" -msgstr "" - -msgid "Add a new intervention" -msgstr "" - msgid "Map" msgstr "" diff --git a/geotrek/feedback/locale/en/LC_MESSAGES/django.po b/geotrek/feedback/locale/en/LC_MESSAGES/django.po index a65044cb84..f5d7486e88 100644 --- a/geotrek/feedback/locale/en/LC_MESSAGES/django.po +++ b/geotrek/feedback/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-06-04 15:20+0000\n" +"POT-Creation-Date: 2025-01-06 15:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -266,6 +266,12 @@ msgid "" "Some data could not be forwarded to Suricate yet - Please come back later" msgstr "" +msgid "Intervention" +msgstr "" + +msgid "Add a new intervention" +msgstr "" + msgid "Attributes" msgstr "" @@ -296,12 +302,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Intervention" -msgstr "" - -msgid "Add a new intervention" -msgstr "" - msgid "Map" msgstr "" diff --git a/geotrek/feedback/locale/es/LC_MESSAGES/django.po b/geotrek/feedback/locale/es/LC_MESSAGES/django.po index a65044cb84..f5d7486e88 100644 --- a/geotrek/feedback/locale/es/LC_MESSAGES/django.po +++ b/geotrek/feedback/locale/es/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-06-04 15:20+0000\n" +"POT-Creation-Date: 2025-01-06 15:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -266,6 +266,12 @@ msgid "" "Some data could not be forwarded to Suricate yet - Please come back later" msgstr "" +msgid "Intervention" +msgstr "" + +msgid "Add a new intervention" +msgstr "" + msgid "Attributes" msgstr "" @@ -296,12 +302,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Intervention" -msgstr "" - -msgid "Add a new intervention" -msgstr "" - msgid "Map" msgstr "" diff --git a/geotrek/feedback/locale/fr/LC_MESSAGES/django.po b/geotrek/feedback/locale/fr/LC_MESSAGES/django.po index 815161a0ff..0d1940c847 100644 --- a/geotrek/feedback/locale/fr/LC_MESSAGES/django.po +++ b/geotrek/feedback/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-04 15:20+0000\n" +"POT-Creation-Date: 2025-01-06 15:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -136,7 +136,7 @@ msgid "to" msgstr "à" msgid "Follow-up message generated by Geotrek" -msgstr "" +msgstr "Message de suivi généré par Geotrek" msgid "New report to process" msgstr "Nouveau Signalement à traiter" @@ -148,19 +148,19 @@ msgid "Tag" msgstr "Clé" msgid "Label" -msgstr "" +msgstr "Label" msgid "Paths" -msgstr "" +msgstr "Tronçons" msgid "Treks" msgstr "Itinéraires" msgid "POIs" -msgstr "" +msgstr "POIs" msgid "Services" -msgstr "" +msgstr "Services" msgid "Interventions" msgstr "Interventions" @@ -178,7 +178,7 @@ msgid "Identifiant" msgstr "Identifiant" msgid "Color" -msgstr "" +msgstr "Couleur" msgid "Display in legend" msgstr "Afficher dans la légende" @@ -199,7 +199,7 @@ msgstr "" "comptes à rebours. La valeur 0 désactive les alertes" msgid "Suricate label" -msgstr "" +msgstr "Label Suricate" msgid "Problem magnitudes" msgstr "Amplitudes des problèmes" @@ -278,11 +278,17 @@ msgstr "" "Des informations n'ont pas encore pu être transmises à Suricate - Merci de " "vérifier plus tard" +msgid "Intervention" +msgstr "Intervention" + +msgid "Add a new intervention" +msgstr "Ajouter une nouvelle intervention" + msgid "Attributes" msgstr "Informations" msgid "None" -msgstr "" +msgstr "Aucun(e)" msgid "Districts" msgstr "Secteurs" @@ -303,19 +309,13 @@ msgid "Date" msgstr "Date" msgid "Yes" -msgstr "" +msgstr "Oui" msgid "No" -msgstr "" - -msgid "Intervention" -msgstr "Intervention" - -msgid "Add a new intervention" -msgstr "Ajouter une nouvelle intervention" +msgstr "Non" msgid "Map" -msgstr "" +msgstr "Carte" #, python-format msgid "%(email)s has sent a feedback." diff --git a/geotrek/feedback/locale/it/LC_MESSAGES/django.po b/geotrek/feedback/locale/it/LC_MESSAGES/django.po index a65044cb84..f5d7486e88 100644 --- a/geotrek/feedback/locale/it/LC_MESSAGES/django.po +++ b/geotrek/feedback/locale/it/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-06-04 15:20+0000\n" +"POT-Creation-Date: 2025-01-06 15:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -266,6 +266,12 @@ msgid "" "Some data could not be forwarded to Suricate yet - Please come back later" msgstr "" +msgid "Intervention" +msgstr "" + +msgid "Add a new intervention" +msgstr "" + msgid "Attributes" msgstr "" @@ -296,12 +302,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Intervention" -msgstr "" - -msgid "Add a new intervention" -msgstr "" - msgid "Map" msgstr "" diff --git a/geotrek/feedback/locale/nl/LC_MESSAGES/django.po b/geotrek/feedback/locale/nl/LC_MESSAGES/django.po index a65044cb84..f5d7486e88 100644 --- a/geotrek/feedback/locale/nl/LC_MESSAGES/django.po +++ b/geotrek/feedback/locale/nl/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-06-04 15:20+0000\n" +"POT-Creation-Date: 2025-01-06 15:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -266,6 +266,12 @@ msgid "" "Some data could not be forwarded to Suricate yet - Please come back later" msgstr "" +msgid "Intervention" +msgstr "" + +msgid "Add a new intervention" +msgstr "" + msgid "Attributes" msgstr "" @@ -296,12 +302,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Intervention" -msgstr "" - -msgid "Add a new intervention" -msgstr "" - msgid "Map" msgstr "" diff --git a/geotrek/feedback/templates/feedback/report_detail.html b/geotrek/feedback/templates/feedback/report_detail.html index c2f9e9391c..0596f704b1 100644 --- a/geotrek/feedback/templates/feedback/report_detail.html +++ b/geotrek/feedback/templates/feedback/report_detail.html @@ -1,5 +1,5 @@ {% extends "common/common_detail.html" %} -{% load feedback_tags i18n %} +{% load feedback_tags i18n mapentity_tags %} {% block detailspanel %} @@ -19,3 +19,38 @@ {{ block.super }} {% endblock detailspanel %} + +{% block related_objects_tab_content %} + {% suricate_workflow_enabled as suricate_workflow_enabled %} + +{% endblock %} \ No newline at end of file diff --git a/geotrek/feedback/templates/feedback/report_detail_attributes.html b/geotrek/feedback/templates/feedback/report_detail_attributes.html index 7f46fa455f..1b3af542ea 100644 --- a/geotrek/feedback/templates/feedback/report_detail_attributes.html +++ b/geotrek/feedback/templates/feedback/report_detail_attributes.html @@ -125,35 +125,5 @@

{% trans "Attributes" %}

{% endif %} {% include "mapentity/trackinfo_fragment.html" %} - - - - - {% endif %} - -
- {% if perms.maintenance.add_intervention %} -

{% trans "Intervention" %}

- {% with columns="name,status,stake,total_cost,begin_date,end_date" %} - {% valuetable report.interventions.all columns=columns %} - {% endwith %} - {% if not suricate_workflow_enabled %} -

-

- - {% trans "Add a new intervention" %} -

- {% elif suricate_workflow_enabled and report.interventions.all|length == 0 %} - {% if report.status.identifier == 'late_intervention' or report.status.identifier == 'waiting' %} -

-

- - {% trans "Add a new intervention" %} -

- {% endif %} - {% endif %} -
{% endblock attributes %} diff --git a/geotrek/outdoor/templates/outdoor/course_detail_attributes.html b/geotrek/outdoor/templates/outdoor/course_detail_attributes.html index 092f126711..f47a894d77 100644 --- a/geotrek/outdoor/templates/outdoor/course_detail_attributes.html +++ b/geotrek/outdoor/templates/outdoor/course_detail_attributes.html @@ -2,7 +2,7 @@ {% load i18n geotrek_tags mapentity_tags outdoor_tags %} {% block attributes %}

{% trans "Tree view" %}

- {% include "outdoor/recursive_courses_tree.html" with sites_at_level=course.all_hierarchy_roots original_course=object %} + {% include "outdoor/recursive_courses_tree.html" with sites_at_level=course.all_hierarchy_roots original_course=object %}

{% trans "Attributes" %}

diff --git a/geotrek/outdoor/templates/outdoor/site_detail_attributes.html b/geotrek/outdoor/templates/outdoor/site_detail_attributes.html index 809bdecb0e..cc7552f51a 100644 --- a/geotrek/outdoor/templates/outdoor/site_detail_attributes.html +++ b/geotrek/outdoor/templates/outdoor/site_detail_attributes.html @@ -114,7 +114,7 @@

{% trans "Attributes" %}

{% for label in object.labels.all %} {% if label.published %} - ☆ + ☆ {% endif %} {{ label.name }}
{% endfor %} 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 "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..a3d7e67322 100644 --- a/geotrek/trekking/templates/trekking/trek_detail_attributes.html +++ b/geotrek/trekking/templates/trekking/trek_detail_attributes.html @@ -38,7 +38,7 @@

    {% trans "Attributes" %}

    		•  {% for label in trek.labels.all %} {% if label.published %} - ☆ + ☆ {% endif %} {{ label.name }}
    {% endfor %} @@ -260,5 +260,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',