Merge pull request #8639 from cfpb/ans_pagination_order

Pagination: Swap order of buttons
cfpb · Nov 14, 2024 · 332a8b7 · 332a8b7
2 parents b831739 + 85a9b11
commit 332a8b7
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/cfgov/v1/jinja2/v1/includes/molecules/pagination.html b/cfgov/v1/jinja2/v1/includes/molecules/pagination.html
@@ -31,6 +31,7 @@
     <nav class="m-pagination"
          role="navigation"
          aria-label="{{ _('Pagination') }}">
+
         {%- if current_page > 1 %}
         <a class="a-btn
                   m-pagination__btn-prev"
@@ -45,20 +46,7 @@
             {{- svg_icon('left') -}}
             <span>{{ _('Previous') }}</span>
         </a>
-        {%- if current_page < total_pages %}
-        <a class="a-btn
-                  m-pagination__btn-next"
-           href="?page={{ (current_page + 1) ~
-                          url_parameters(request.GET) ~
-                          fragment_id }}">
-        {%- else %}
-        <a class="a-btn
-                  a-btn--disabled
-                  m-pagination__btn-next">
-        {% endif -%}
-            <span>{{ _('Next') }}</span>
-            {{- svg_icon('right') -}}
-        </a>
+
         <form class="m-pagination__form" action="{{ fragment_id }}">
             {% for (key, value_as_list) in request.GET.lists() %}
                 {% for list_item in value_as_list %}
@@ -92,6 +80,21 @@
                 {{ _('Go') }}
             </button>
         </form>
+
+        {%- if current_page < total_pages %}
+        <a class="a-btn
+                  m-pagination__btn-next"
+           href="?page={{ (current_page + 1) ~
+                          url_parameters(request.GET) ~
+                          fragment_id }}">
+        {%- else %}
+        <a class="a-btn
+                  a-btn--disabled
+                  m-pagination__btn-next">
+        {% endif -%}
+            <span>{{ _('Next') }}</span>
+            {{- svg_icon('right') -}}
+        </a>
     </nav>
 {% endif %}
 {% endmacro %}