Merge branch 'hotfix/0.11.0.16' into rails-3-develop

Conflicts:
    locale/he_IL/app.po
    locale/hr_HR/app.po
    locale/nb_NO/app.po
    locale/uk/app.po

2 files changed, 11 insertions, 19 deletions

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 238a36ce4..5533402c5 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -218,9 +218,6 @@ module LinkToHelper
 
         return url
     end
-    def search_link(query, variety_postfix = nil, sort_postfix = nil, advanced = nil)
-        link_to h(query), search_url(query)
-    end
 
     def search_path(query, options = {})
         search_url(query, options.merge(:only_path => true))
diff --git a/app/views/general/search.html.erb b/app/views/general/search.html.erb
index 6234687f2..d526a93c0 100644
--- a/app/views/general/search.html.erb
+++ b/app/views/general/search.html.erb
@@ -35,15 +35,23 @@
       <% end %>
     </div>
   <% else %>
-    <%= form_tag(request.url, {:method => "get", :id => "search_form"}) do %>
+
+
+    <%= form_tag(search_redirect_path, {:method => "get", :id => "search_form"}) do %>
       <p>
         <%= text_field_tag 'query', params[:query], { :size => 40, :title => "type your search term here" } %>
+
+        <%= submit_tag _("Search") %>
+        <%= link_to(_("Advanced search"), advanced_search_path) %>
+      </p>
+    <% end %>
+    <%= form_tag(request.url, {:method => "get", :id => "filter_form"}) do %>
+      <p>
         <%= hidden_field_tag 'sortby', @inputted_sortby %>
         <% if @bodies %>
           <%= hidden_field_tag 'bodies', 1 %>
         <% end %>
-        <%= submit_tag _("Search") %>
-        <%= link_to(_("Advanced search"), advanced_search_path) %>
+
       </p>
 
       <div id="common-subfilters">
@@ -63,18 +71,6 @@
             <%= "|" unless variety == labels.last[0]%>
           <% end %>
         </div>
-
-        <% if false %>
-          <%-# Commented out for now as tags are of limited use when users can't see them.  This will change in the future! -%>
-          <% if @variety_postfix != "users" %>
-            <div>
-              <%= label_tag(:query, _("Tags (separated by a space):")) %><%= text_field_tag(:tags, params[:tags], { :size => 20 }) %>
-              <% for tag in InfoRequest.get_tags %>
-                <%= tag.name_and_value %>
-              <% end %>
-            </div>
-          <% end %>
-        <% end %>
       </div>
 
       <% if @variety_postfix == "requests" %>
@@ -139,7 +135,6 @@
 <% end %>
 
 <div style="clear:both;"></div>
-
 <% if @total_hits == 0 %>
     <h2><%=@title %></h2>
 <% end %>