templates: add history navigation in ideas/topics

liqd · Sep 13, 2023 · a34a8a4 · a34a8a4
1 parent 341bd17
commit a34a8a4
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 18 deletions.
diff --git a/apps/budgeting/templates/a4_candy_budgeting/proposal_list.html b/apps/budgeting/templates/a4_candy_budgeting/proposal_list.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 {% block phase_content %}
-    <div class="l-top-overlap">
+    <div class="l-top-overlap" id="index">
         <div class="row">
             <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2">
                 {% include "a4_candy_contrib/includes/map_filter_and_sort.html" with filter=view.filter mode=view.mode %}

diff --git a/apps/contrib/templates/a4_candy_contrib/includes/map_filter_and_sort.html b/apps/contrib/templates/a4_candy_contrib/includes/map_filter_and_sort.html
@@ -3,13 +3,13 @@
 <div class="filter-bar__spaced">
     {% if mode == 'map' %}
         {% combined_url_parameter request.GET mode='list' as url_par %}
-        <a class="btn btn--light me-1 mt-2" href="{{ url_par }}" aria-label="{% translate 'View as list' %}">
+        <a class="btn btn--light me-1 mt-2" href="{{ url_par }}#index" aria-label="{% translate 'View as list' %}">
             <i class="fa fa-list" aria-hidden="true"></i>
             {% translate 'View' %}
         </a>
     {% else %}
         {% combined_url_parameter request.GET mode='map' as url_par %}
-        <a class="btn btn--light me-1 mt-2" href="{{ url_par }}" aria-label="{% translate 'View as map' %}">
+        <a class="btn btn--light me-1 mt-2" href="{{ url_par }}#index" aria-label="{% translate 'View as map' %}">
             <i class="fa fa-map" aria-hidden="true"></i>
             {% translate 'View' %}
         </a>

diff --git a/apps/contrib/templates/a4_candy_contrib/includes/pagination.html b/apps/contrib/templates/a4_candy_contrib/includes/pagination.html
@@ -6,7 +6,7 @@
         <li class="pagination-item">
             {% if page_obj.has_previous %}
             {% combined_url_parameter request.GET page=page_obj.previous_page_number as url_par %}
-            <a class="d-none d-sm-block" href="{{ url_par }}">{% translate 'Previous page' %}</a>
+            <a class="d-none d-sm-block" href="{{ url_par }}#index">{% translate 'Previous page' %}</a>
             <a aria-label="{% translate 'Previous page' %}" class="d-block d-sm-none" href="{{ url_par }}"><i class="fas fa-angle-left" aria-hidden="true"></i></a>
             {% endif %}
         </li>
@@ -16,7 +16,7 @@
         <li class="pagination-item">
         {% if page_obj.has_next %}
             {% combined_url_parameter request.GET page=page_obj.next_page_number as url_par %}
-            <a class="d-none d-sm-block" href="{{ url_par }}">{% translate 'Next page' %}</a>
+            <a class="d-none d-sm-block" href="{{ url_par }}#index">{% translate 'Next page' %}</a>
             <a aria-label="{% translate 'Next page' %}" class="d-block d-sm-none" href="{{ url_par }}"><i class="fas fa-angle-right" aria-hidden="true"></i></a>
         {% endif %}
         </li>

diff --git a/apps/contrib/templates/a4_candy_contrib/item_detail.html b/apps/contrib/templates/a4_candy_contrib/item_detail.html
@@ -17,10 +17,19 @@
                 <nav class="breadcrumbs" aria-label="{% translate 'breadcrumbs' %}">
                     <ul>
                         <li>
-                            <a href="{{ module.get_detail_url }}">
+                          {% with navigate_url=request.META.HTTP_REFERER %}
+                            {% if module.get_detail_url in navigate_url %}
+                              <a href="{{navigate_url}}#index">
                                 <i class="fa fa-arrow-left" aria-hidden="true"></i>
-                                {% translate 'go back' %}
-                            </a>
+                                  {% translate 'go back' %}
+                              </a>
+                            {% else %}
+                              <a href="{{ module.get_detail_url }}#index">
+                                <i class="fa fa-arrow-left" aria-hidden="true"></i>
+                                  {% translate 'go to overview' %}
+                              </a>
+                            {% endif %}
+                          {% endwith %}
                         </li>
                     </ul>
                 </nav>

diff --git a/apps/debate/templates/a4_candy_debate/subject_detail.html b/apps/debate/templates/a4_candy_debate/subject_detail.html
@@ -17,10 +17,19 @@
                     <nav class="breadcrumbs" aria-label="{% translate 'breadcrumbs' %}">
                         <ul>
                             <li>
-                                <a href="{{ module.get_detail_url }}">
-                                    <i class="fa fa-arrow-left" aria-hidden="true"></i>
-                                    {% translate 'go back' %}
-                                </a>
+							  {% with navigate_url=request.META.HTTP_REFERER %}
+								{% if module.get_detail_url in navigate_url %}
+								  <a href="{{navigate_url}}#index">
+									<i class="fa fa-arrow-left" aria-hidden="true"></i>
+									  {% translate 'go back' %}
+								  </a>
+								{% else %}
+								  <a href="{{ module.get_detail_url }}#index">
+									<i class="fa fa-arrow-left" aria-hidden="true"></i>
+									  {% translate 'go to overview' %}
+								  </a>
+								{% endif %}
+							  {% endwith %}
                             </li>
                         </ul>
                     </nav>

diff --git a/apps/ideas/templates/a4_candy_ideas/idea_list.html b/apps/ideas/templates/a4_candy_ideas/idea_list.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block phase_content %}
-    <div class="l-top-overlap">
+    <div class="l-top-overlap" id="index">
         <div class="row">
             <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2">
                 {% include "a4_candy_contrib/includes/filter_and_sort.html" with filter=view.filter %}

diff --git a/apps/mapideas/templates/a4_candy_mapideas/mapidea_list.html b/apps/mapideas/templates/a4_candy_mapideas/mapidea_list.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 {% block phase_content %}
-    <div class="l-top-overlap">
+    <div class="l-top-overlap" id="index">
         <div class="row">
             <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2">
                 {% include "a4_candy_contrib/includes/map_filter_and_sort.html" with filter=view.filter mode=view.mode %}

diff --git a/apps/topicprio/templates/a4_candy_topicprio/topic_detail.html b/apps/topicprio/templates/a4_candy_topicprio/topic_detail.html
@@ -8,10 +8,19 @@
         <nav class="breadcrumbs" aria-label="{% translate 'breadcrumbs' %}">
             <ul>
                 <li>
-                    <a href="{{ module.get_detail_url }}">
+                  {% with navigate_url=request.META.HTTP_REFERER %}
+                    {% if module.get_detail_url in navigate_url %}
+                      <a href="{{navigate_url}}#index">
                         <i class="fa fa-arrow-left" aria-hidden="true"></i>
-                        {% translate 'go back' %}
-                    </a>
+                          {% translate 'go back' %}
+                      </a>
+                    {% else %}
+                      <a href="{{ module.get_detail_url }}#index">
+                        <i class="fa fa-arrow-left" aria-hidden="true"></i>
+                          {% translate 'go to overview' %}
+                      </a>
+                    {% endif %}
+                  {% endwith %}
                 </li>
             </ul>
         </nav>

diff --git a/apps/topicprio/templates/a4_candy_topicprio/topic_list.html b/apps/topicprio/templates/a4_candy_topicprio/topic_list.html
@@ -2,7 +2,7 @@
 {% load i18n module_tags rules static maps_tags %}
 
 {% block phase_content %}
-    <div class="l-top-overlap">
+    <div class="l-top-overlap" id="index">
         <div class="row">
             <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2">
                 {% include "a4_candy_contrib/includes/filter_and_sort.html" with filter=view.filter %}

diff --git a/changelog/7429.md b/changelog/7429.md
@@ -0,0 +1,13 @@
+### Added
+
+- in contrib templates for item_detail:
+    request http referer for go back/overview to filtered/paginated list
+- in topicprio templates for topic_detail:
+    request http referer for go back/overview to filtered/paginated list
+- in budgeting, idea, mapidea, topicprio:
+    index id to be used with href anchor to navigate back to item list
+- in contrib templates for map_filter_and_sort and pagination:
+    index id to be used with href anchor to navigate back to item list
+
+
+