From bf7ff0d00499d875a17f12c790c135de0dd6e4de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Thu, 21 Jan 2021 01:11:01 +0100
Subject: [PATCH] Change advanced search filters order

Having the date at the beginning makes it less weird to select a custom
date now that we don't have enough space to display the "from" and "to"
date selectors in different columns.
---
 .../shared/advanced_search_component.html.erb | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/components/shared/advanced_search_component.html.erb b/app/components/shared/advanced_search_component.html.erb
index 55d57129c..903542908 100644
--- a/app/components/shared/advanced_search_component.html.erb
+++ b/app/components/shared/advanced_search_component.html.erb
@@ -14,25 +14,6 @@
                            placeholder: t("shared.advanced_search.general_placeholder") %>
       </div>
 
-      <div class="filter">
-        <label for="advanced_search_official_level"><%= t("shared.advanced_search.author_type") %></label>
-        <%= select_tag("advanced_search[official_level]", official_level_search_options,
-                      include_blank: t("shared.advanced_search.author_type_blank")) %>
-      </div>
-
-      <% if sdg? %>
-        <div class="filter">
-          <label for="advanced_search_goal"><%= t("shared.advanced_search.goal") %></label>
-          <%= select_tag("advanced_search[goal]", goal_options,
-                        include_blank: t("shared.advanced_search.goal_blank")) %>
-        </div>
-        <div class="filter">
-          <label for="advanced_search_target"><%= t("shared.advanced_search.target") %></label>
-          <%= select_tag("advanced_search[target]", target_options,
-                        include_blank: t("shared.advanced_search.target_blank")) %>
-        </div>
-      <% end %>
-
       <div class="date-filters">
         <div class="filter">
           <label for="js-advanced-search-date-min"><%= t("shared.advanced_search.date") %></label>
@@ -61,6 +42,25 @@
         </div>
       </div>
 
+      <div class="filter">
+        <label for="advanced_search_official_level"><%= t("shared.advanced_search.author_type") %></label>
+        <%= select_tag("advanced_search[official_level]", official_level_search_options,
+                      include_blank: t("shared.advanced_search.author_type_blank")) %>
+      </div>
+
+      <% if sdg? %>
+        <div class="filter">
+          <label for="advanced_search_goal"><%= t("shared.advanced_search.goal") %></label>
+          <%= select_tag("advanced_search[goal]", goal_options,
+                        include_blank: t("shared.advanced_search.goal_blank")) %>
+        </div>
+        <div class="filter">
+          <label for="advanced_search_target"><%= t("shared.advanced_search.target") %></label>
+          <%= select_tag("advanced_search[target]", target_options,
+                        include_blank: t("shared.advanced_search.target_blank")) %>
+        </div>
+      <% end %>
+
       <div class="submit">
         <%= submit_tag t("shared.advanced_search.search"), class: "button expanded" %>
       </div>