Merge pull request #3006 from digitalfabrik/feature/add-back-to-POI-a…

…nd-events Add back to POI and events list link
digitalfabrik · Aug 23, 2024 · b13b4b0 · b13b4b0
2 parents 9331362 + 0747301
commit b13b4b0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 11 deletions.
diff --git a/integreat_cms/cms/templates/events/event_list_archived.html b/integreat_cms/cms/templates/events/event_list_archived.html
@@ -5,9 +5,18 @@
 {% block content %}
     {% with filter_form.filters_visible as filters_visible %}
         <div class="table-header">
-            <h1 class="heading">
-                {% translate "Archived events" %}
-            </h1>
+            <div class="flex flex-wrap justify-between">
+                <h1 class="heading">
+                    {% translate "Archived events" %}
+                </h1>
+                <a href="{% url 'events' region_slug=request.region.slug language_slug=language.slug %}"
+                   class="font-bold text-sm text-gray-800 flex items-center gap-1 pb-2 hover:underline">
+                    <span>
+                        <i icon-name="calendar" class="align-top h-5"></i>
+                        {% translate "Back to events" %}
+                    </span>
+                </a>
+            </div>
             <div class="flex flex-wrap justify-between gap-4">
                 <div class="flex flex-wrap gap-4">
                     {% include "generic_language_switcher.html" with target="events_archived" %}

diff --git a/integreat_cms/cms/templates/pages/page_tree_archived.html b/integreat_cms/cms/templates/pages/page_tree_archived.html
@@ -14,7 +14,7 @@ <h1 class="heading">
                 </h1>
                 <a href="{% url 'pages' region_slug=request.region.slug language_slug=language.slug %}"
                    class="font-bold text-sm text-gray-800 flex items-center gap-1 mb-2 hover:underline">
-                    <span><i icon-name="layout" class="align-top h-5"></i> {% translate "Page Tree" %}</span>
+                    <span><i icon-name="layout" class="align-top h-5"></i> {% translate "Back to page tree" %}</span>
                 </a>
             </div>
             <div class="flex flex-wrap justify-between gap-4">

diff --git a/integreat_cms/cms/templates/pois/poi_list_archived.html b/integreat_cms/cms/templates/pois/poi_list_archived.html
@@ -7,12 +7,23 @@
     {% get_current_language as LANGUAGE_CODE %}
     {% get_language LANGUAGE_CODE as backend_language %}
     <div class="table-header">
-        <h1 class="heading">
-            {% translate "Archived locations" %}
-        </h1>
-        <div class="flex flex-wrap gap-4">
-            {% include "generic_language_switcher.html" with target="archived_pois" %}
-            {% include "search_input_form.html" with object_type="poi" object_archived=True %}
+        <div class="flex flex-wrap justify-between">
+            <h1 class="heading">
+                {% translate "Archived locations" %}
+            </h1>
+            <a href="{% url 'pois' region_slug=request.region.slug language_slug=language.slug %}"
+               class="font-bold text-sm text-gray-800 flex items-center gap-1 pb-2 hover:underline">
+                <span>
+                    <i icon-name="map-pin" class="align-top h-5"></i>
+                    {% translate "Back to locations" %}
+                </span>
+            </a>
+        </div>
+        <div class="flex flex-wrap justify-between gap-4">
+            <div class="flex flex-wrap gap-4">
+                {% include "generic_language_switcher.html" with target="archived_pois" %}
+                {% include "search_input_form.html" with object_type="poi" object_archived=True %}
+            </div>
         </div>
     </div>
     <div class="table-listing">

diff --git a/integreat_cms/locale/de/LC_MESSAGES/django.po b/integreat_cms/locale/de/LC_MESSAGES/django.po
@@ -5748,6 +5748,10 @@ msgstr "%(content_type)s maschinell auf %(language)s übersetzen"
 msgid "Execute"
 msgstr "Ausführen"
 
+#: cms/templates/events/event_list_archived.html
+msgid "Back to events"
+msgstr "Zurück zu Veranstaltungen"
+
 #: cms/templates/events/event_list_archived.html
 msgid "No archived events found with these filters."
 msgstr "Keine archivierten Veranstaltungen mit diesen Filtern gefunden."
@@ -6945,7 +6949,6 @@ msgstr ""
 "generieren"
 
 #: cms/templates/pages/page_tree.html
-#: cms/templates/pages/page_tree_archived.html
 msgid "Page Tree"
 msgstr "Seiten-Baum"
 
@@ -7044,6 +7047,10 @@ msgstr "Importieren"
 msgid "Archived Pages"
 msgstr "Archivierte Seiten"
 
+#: cms/templates/pages/page_tree_archived.html
+msgid "Back to page tree"
+msgstr "Zurück zum Seiten-Baum"
+
 #: cms/templates/pages/page_tree_archived.html
 msgid "No archived pages found with these filters."
 msgstr "Keine archivierten Seiten mit diesen Filtern gefunden."
@@ -7370,6 +7377,10 @@ msgstr "Orte ausgewählt"
 msgid "Archive locations"
 msgstr "Orte archivieren"
 
+#: cms/templates/pois/poi_list_archived.html
+msgid "Back to locations"
+msgstr "Zurück zu Orte"
+
 #: cms/templates/pois/poi_list_archived.html
 msgid "No locations archived yet."
 msgstr "Noch keine Orte archiviert."

diff --git a/integreat_cms/release_notes/current/unreleased/3005.yml b/integreat_cms/release_notes/current/unreleased/3005.yml
@@ -0,0 +1,2 @@
+en: Add go back link for POIS and events
+de: Füge Link zum Zurückgehen für POIS und Veranstaltungen hinzu
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		en: Add go back link for POIS and events
		de: Füge Link zum Zurückgehen für POIS und Veranstaltungen hinzu