From 0a1b7fcbe32f5a79c9b505cdf7e86c6b45aa9b28 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Wed, 27 Feb 2019 12:44:02 +0000
Subject: [PATCH] The "advanced filter" link is moved to the top right side of
 the screen

---
 app/views/events/index.html.haml  | 6 ------
 app/views/orgas/_search.html.haml | 4 ++++
 config/locales/views/en.yml       | 6 +++---
 config/locales/views/fr.yml       | 6 +++---
 config/locales/views/pt-BR.yml    | 2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
index d9b26ca1..10915692 100644
--- a/app/views/events/index.html.haml
+++ b/app/views/events/index.html.haml
@@ -42,12 +42,6 @@
     ical: link_to('iCal', events_path(:rss,
       tag: params[:tag], format: :ics, region: session[:region]))
 
-  \-
-
-  = link_to page_path('filter') do
-    %em.fa.fa-filter
-    = t '.filter'
-
 /%a#banner(href='https://april.org/campagne')
 /  = image_tag 'priorite-logiciel-libre-je-soutiens-april_2_m.png',
 /    width: '374', height: '48',
diff --git a/app/views/orgas/_search.html.haml b/app/views/orgas/_search.html.haml
index 45020f69..5507d700 100644
--- a/app/views/orgas/_search.html.haml
+++ b/app/views/orgas/_search.html.haml
@@ -8,3 +8,7 @@
   = f.button class: :search do
     %em.fa.fa-search
     %span.label= t '.label'
+
+  = link_to page_path('filter'), title: t('.filter') do
+    &nbsp;
+    %em.fa.fa-angle-double-right
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 41fb4590..b2130964 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -32,7 +32,6 @@ en:
       calendar_in: This calendar in <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar'></em> %{webcal}/%{ical}
       nb_events: "%{count} events"
       map: Map
-      filter: Advanced filter
     show:
       at: At
       dateAndPlace: Date and place
@@ -251,6 +250,7 @@ description."
       title: Find your %{entity}!
       label: Search
       helper: You can search an organisation by name, tag, description or city
+      filter: Advanced filter
     index:
       title: Organisations
       new: Add an organisation
@@ -467,8 +467,8 @@ reason:
   pages:
     filter:
       title: Advanced filtering
-      helper: Choose one or more filters to display events or integrate them in
-        another website
+      helper: Choose one or more filters to display events/orgas or integrate
+        them in another website
       past: Past
       past_helper: Also include past events in RSS feed, map and geojson
       period_year: Year
diff --git a/config/locales/views/fr.yml b/config/locales/views/fr.yml
index 5e202228..7c76f09e 100644
--- a/config/locales/views/fr.yml
+++ b/config/locales/views/fr.yml
@@ -32,7 +32,6 @@ fr:
       calendar_in: Ce calendrier en <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar'></em> %{webcal}/%{ical}
       nb_events: "%{count} événements"
       map: Carte
-      filter: Filtrage avancé
     show:
       at: À
       dateAndPlace: Date et lieu
@@ -267,6 +266,7 @@ description plus complète."
       title: Trouve ton %{entity}!
       label: Recherche
       helper: Vous pouvez chercher une organisation par nom, mot clé, description ou ville
+      filter: Filtrage avancé
     index:
       title: Organisations
       new: Ajouter une organisation
@@ -483,8 +483,8 @@ pouvez éditer votre événement à l'adresse:"
   pages:
     filter:
       title: Filtrage avancé
-      helper: Choisissez un ou plusieurs filtres pour afficher les événements
-        ou les intégrer dans un autre site web
+      helper: Choisissez un ou plusieurs filtres pour afficher les
+        événements/organisations ou les intégrer dans un autre site web
       past: Passés
       past_helper: Inclure aussi les événements passés dans les flux RSS, carte et geojson
       period_year: Année
diff --git a/config/locales/views/pt-BR.yml b/config/locales/views/pt-BR.yml
index 9d85cfe1..7ba03f20 100644
--- a/config/locales/views/pt-BR.yml
+++ b/config/locales/views/pt-BR.yml
@@ -32,7 +32,6 @@ pt-BR:
       calendar_in: Este calendário em <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar'></em> %{webcal}/%{ical}
       nb_events: "%{count} eventos"
       map: Mapa
-      filter: Busca avançada
     show:
       at: Em
       dateAndPlace: Data e local
@@ -252,6 +251,7 @@ descrição mais completa."
       title: Encontre %{entity}!
       label: Pesquisa
       helper: You can search an organisation by name, tag, description or city (TODO)
+      filter: Busca avançada
     index:
       title: Organizações
       new: Adicione uma organização