From 61ed01ce2e1c9acab5d64418fb7ce3d7f96b59b5 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Sat, 9 Aug 2014 22:34:57 +0200
Subject: [PATCH] =?UTF-8?q?La=20recherche=20d'asso=20est=20plus=20propre?=
 =?UTF-8?q?=20au=20niveau=20du=20libell=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile.lock                     | 2 +-
 app/assets/stylesheets/lugs.sass | 2 ++
 app/views/lugs/_search.html.haml | 5 +++--
 config/locales/fr.yml            | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 72057e84..85d5aeb9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/gregbell/active_admin.git
-  revision: efe5a86968c81fd12244e6c4b6957d93d0a4b7ee
+  revision: ac85139e308d26cc5706e0f431ea07553fff45d5
   specs:
     activeadmin (1.0.0.pre)
       arbre (~> 1.0)
diff --git a/app/assets/stylesheets/lugs.sass b/app/assets/stylesheets/lugs.sass
index 5cb87508..5c8f4c26 100644
--- a/app/assets/stylesheets/lugs.sass
+++ b/app/assets/stylesheets/lugs.sass
@@ -15,6 +15,8 @@ form#lug_search
   padding-right: 2px
   label
     display: none
+  em.fa
+    color: #258
   input
     border: solid thin #258
     margin-left: -1.5em
diff --git a/app/views/lugs/_search.html.haml b/app/views/lugs/_search.html.haml
index 325d11f2..800d4230 100644
--- a/app/views/lugs/_search.html.haml
+++ b/app/views/lugs/_search.html.haml
@@ -1,7 +1,8 @@
 = search_form_for @search || Lug.search(params[:q]) do |f|
-  = f.label :name_or_city_or_department_or_related_region_name_or_url_cont
+  = f.label :search, t('.label')
   %em.fa.fa-users
-  = f.search_field :name_or_city_or_department_or_related_region_name_or_url_cont, size: 13,
+  = f.search_field :name_or_city_or_department_or_related_region_name_or_url_cont,
+    id: :q_search, size: 13,
     placeholder: t('.title', entity: Lug.model_name.human)
   = f.button class: :search do
     %em.fa.fa-search
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8973aa03..e8de4b75 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -290,6 +290,7 @@ Exemple: `%{daylimit}`"
   lugs:
     search:
       title: Trouve ton %{entity}!
+      label: Recherche
 
   devise:
     sessions: