Organisation search form is moved back in the header, nearby the "search more" link

app/assets/stylesheets/orgas.sass

@@ -4,9 +4,7 @@ img.favicon
   vertical-align: middle
 
 form#orga_search
-  font-size: larger
-  margin-top: 0.2em
-  margin-bottom: 1em
+  display: inline
   label
     display: none
   em.fa
@@ -15,8 +13,8 @@ form#orga_search
     width: 14em
     border: solid thin #258
     padding: 0
-    margin-left: -1.7em
-    margin-right: -1.3em
+    margin-left: -1.8em
+    margin-right: -1.6em
     padding-left: 1.5em
     padding-right: 1.2em
     border-radius: 0.4em
@@ -28,6 +26,7 @@ form#orga_search
     box-shadow: none
     margin-top: -0.1em
     margin-left: 0
+    margin-right: 1em
     vertical-align: middle
     background-color: transparent
     &:hover em.fa

app/assets/stylesheets/pages.sass

@@ -4,4 +4,3 @@ body.pages main
 
 .digest
   float: right
-  font-size: smaller

app/views/events/index.html.haml

@@ -53,6 +53,4 @@
 /%a#banner(href='https://www.libre-en-fete.net')
 /  = image_tag 'lef.png', width: '486', height: '80', alt: 'Libre en Fete'
 
-= render '/orgas/search'
-
 - events_meta

app/views/pages/_search.haml

@@ -2,9 +2,12 @@
   .digest
     - if params[:tag].present?
       = render partial: '/tags/context', locals: { tags: params[:tag] }
+    - else
+      = render '/orgas/search'
 
-    = link_to page_path('filter'), class: 'filter' do
-      = t 'title', scope: 'pages.filter'
+    - if params[:tag].blank? && (params[:near].blank? || params[:near][:location].blank?)
+      = link_to page_path('filter'), class: 'filter' do
+        = t 'title', scope: 'pages.filter'
 
     = link_to page_path('filter'), title: t('title', scope: 'pages.filter') do
       %em.fa.fa-angle-double-right