From c44e709f24098045b63fbb8d58fb28a2f994643e Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Sat, 12 Sep 2015 18:32:13 +0200
Subject: [PATCH] Refactors search form

It only appears when the page asks for it.
Also, the i18n namespace and the path used for the form are parameters
now
---
 app/views/debates/index.html.erb              |  6 ++++++
 app/views/layouts/_header.html.erb            |  2 +-
 app/views/shared/_search_form.html.erb        | 16 +++++++++++-----
 app/views/shared/_search_form_header.html.erb | 12 +++++++++---
 config/locales/en.yml                         |  8 ++++----
 config/locales/es.yml                         |  8 ++++----
 6 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 12dd4e684..d05cf8313 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -1,3 +1,9 @@
+<% content_for :header_addon do %>
+  <%= render "shared/search_form_header",
+             search_path: debates_path(page: 1),
+             i18n_namespace: "debates.index.search_form" %>
+<% end %>
+
 <section role="main">
 
   <div class="wrap row">
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index abd661659..f478ccfd3 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -43,7 +43,7 @@
       <% end %>
       </div>
       <div class="small-12 medium-4 column right">
-        <%= render "shared/search_form_header" %>
+        <%= yield :header_addon %>
       </div>
     </section>
   </div>
diff --git a/app/views/shared/_search_form.html.erb b/app/views/shared/_search_form.html.erb
index 1c7a0eb45..1c0344993 100644
--- a/app/views/shared/_search_form.html.erb
+++ b/app/views/shared/_search_form.html.erb
@@ -1,21 +1,27 @@
+<% # Params:
+   #
+   #   search_path: for example debates_path
+   #   i18n_namespace: for example "debates.index.search_form"
+%>
+
 <div class="search-form">
   <div class="sidebar-divider"></div>
-  <h3><%= t("shared.search_form.search_title") %></h3>
+  <h3><%= t("#{i18n_namespace}.title") %></h3>
   <br>
   <div class="row">
-    <%= form_tag debates_path, method: :get do %>
+    <%= form_tag search_path, method: :get do %>
       <div class="small-12 columns">
         <div class="row collapse">
 
           <div class="small-9 medium-12 large-9 columns">
-            <input type="text" name="search" placeholder="<%= t("shared.search_form.search_placeholder") %>" class="search-form">
+            <input type="text" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="search-form">
           </div>
           <div class="small-3 medium-12 large-3 columns">
-            <input type="submit" class="button secondary postfix" value="<%= t('shared.search_form.search_button') %>">
+            <input type="submit" class="button secondary postfix" value="<%= t("#{i18n_namespace}.button") %>">
           </div>
 
         </div>
       </div>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/shared/_search_form_header.html.erb b/app/views/shared/_search_form_header.html.erb
index 343b8d3e6..cf84656e6 100644
--- a/app/views/shared/_search_form_header.html.erb
+++ b/app/views/shared/_search_form_header.html.erb
@@ -1,14 +1,20 @@
+<% # Params:
+   #
+   #   i18n_namespace: for example "debates.index.search_form"
+   #   search_path: for example debates_path
+%>
+
 <div class="search-form">
   <div class="row">
 
-    <%= form_tag debates_path, method: :get do %>
+    <%= form_tag search_path, method: :get do %>
     <div class="small-12 columns">
       <div class="row collapse">
         <div class="small-10 column">
-          <input type="text" name="search" placeholder="<%= t("shared.search_form.search_placeholder") %>" class="search-form">
+          <input type="text" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="search-form">
         </div>
         <div class="small-2 column">
-          <button type="submit" class="button postfix" title="<%= t('shared.search_form.search_button') %>">
+          <button type="submit" class="button postfix" title="<%= t("#{i18n_namespace}.button") %>">
             <i class="icon-search"></i>
           </button>
         </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e612a5b9e..1788393dc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -76,6 +76,10 @@ en:
       filter_topic:
         one: " with the topic '%{topic}'"
         other: " with the topic '%{topic}'"
+      search_form:
+        title: Search
+        button: Search
+        placeholder: "Search debates..."
       search_results:
         one: " containing '%{search_term}'"
         other: " containing '%{search_term}'"
@@ -283,10 +287,6 @@ en:
     flag: Flag as inappropriate
     unflag: Undo flag
     collective: Collective
-    search_form:
-      search_title: Search
-      search_button: Search
-      search_placeholder: "Search on debates..."
   mailer:
     comment:
       subject: Someone has commented on your debate
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 6e31ea175..cc797184f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -76,6 +76,10 @@ es:
       filter_topic:
         one: " con el tema '%{topic}'"
         other: " con el tema '%{topic}'"
+      search_form:
+        title: Buscar
+        button: Buscar
+        placeholder: "Buscar debates..."
       search_results:
         one: " que contiene '%{search_term}'"
         other: " que contienen '%{search_term}'"
@@ -283,10 +287,6 @@ es:
     flag: Denunciar como inapropiado
     unflag: Deshacer denuncia
     collective: Colectivo
-    search_form:
-      search_title: Buscar
-      search_button: Buscar
-      search_placeholder: "Buscar en debates..."
   mailer:
     comment:
       subject: Alguien ha comentado en tu propuesta