💄 [UI/UX] Restructure detail page

- Move an object's related objects from the properties tab into their own tab - Move accessibility pictures into the attached files tab - Remove the display of the structure in the properties tab title
GeotrekCE · Jan 7, 2025 · d6ed8a2 · d6ed8a2
1 parent 4dba2fb
commit d6ed8a2
Show file tree

Hide file tree

Showing 37 changed files with 211 additions and 244 deletions.
diff --git 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
@@ -5,6 +5,12 @@ CHANGELOG
 2.111.0+dev     (XXXX-XX-XX)
 ----------------------------
 
+**UI/UX**
+
+- Move an object's related objects from the properties tab into their own tab
+- Move Treks' accessibility pictures into the attached files tab
+- 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
diff --git 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <emmanuelle.helly@makina-corpus.com>\n"
 "Language-Team: French <https://weblate.makina-corpus.net/projects/geotrek-"
@@ -532,6 +532,9 @@ msgstr "Pas de fichier attaché pour l'accessibilité"
 msgid "You are not allowed to see attachments."
 msgstr "Vous n'êtes pas autorisé à voir les fichiers attachés."
 
+msgid "New accessibility photo"
+msgstr "Nouvelle photo liée à l'accessibilité"
+
 msgid " Confirm file deletion"
 msgstr "Confirmer la suppression du fichier"
 
@@ -727,6 +730,16 @@ msgctxt "West"
 msgid "W"
 msgstr "O"
 
+msgid ""
+"Feature geometry cannot be converted to a single continuous LineString "
+"feature"
+msgstr "La géométrie de l'objet ne peut être convertie en une unique LineString continue"
+
+msgid ""
+"Geometries from various features cannot be converted to a single continuous "
+"LineString feature"
+msgstr "Les géométries de plusieurs objets ne peuvent être converties en une unique LineString continue"
+
 msgid "Reports"
 msgstr "Signalements"
 

diff --git a/geotrek/common/locale/it/LC_MESSAGES/django.po b/geotrek/common/locale/it/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: 2013-01-25 15:02+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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/templates/common/attachment_accessibility_list.html b/geotrek/common/templates/common/attachment_accessibility_list.html
@@ -77,7 +77,8 @@ <h3>{% trans "Photos accessibility" %}</h3>
 
 {% if perms|add_attachment %}
     {% if user.profile.structure == object.structure or perms.authent.can_bypass_structure %}
-        <div class="file-attachment-accessibility-form">
+        <div class="file-attachment-form">
+            <h4>{% trans "New accessibility photo" %}</h4>
             <div class="create">
                 {% crispy accessibility_form %}
             </div>

diff --git a/geotrek/core/templates/core/trail_detail.html b/geotrek/core/templates/core/trail_detail.html
@@ -8,4 +8,4 @@
   <div class="btn-group pull-right">
     <a class="btn btn-light btn-sm" href="{% url 'core:trail_gpx_detail' LANGUAGE_CODE object.pk object.pk %}"><img src="{% static "paperclip/fileicons/gpx.png" %}"/> {% trans "GPX" %}</a>
     <a class="btn btn-light btn-sm" href="{% url 'core:trail_kml_detail' LANGUAGE_CODE object.pk object.pk %}"><img src="{% static "paperclip/fileicons/kml.png" %}"/> {% trans "KML" %}</a>
-{% endblock download %}
+{% endblock download %}