diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 84fb5b5b5..1667b717e 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -29,6 +29,8 @@ def searchresult
}
if request.xhr?
render :partial => 'find_results' and return
+ else
+ render 'find'
end
end
diff --git a/app/views/search/_find_results.rhtml b/app/views/search/_find_results.rhtml
index b428519ae..6171d8214 100644
--- a/app/views/search/_find_results.rhtml
+++ b/app/views/search/_find_results.rhtml
@@ -3,39 +3,39 @@
- <% @result.each do |package| %>
-
- - <%= image_tag( screenshot_thumb_url( package[:name] ), :height => 50 ) %>
- <%= link_to highlight(package[:name], @search_term), :controller => :package, :action => :show, :package => package[:name], :search_term => @search_term %>
-
- <% if desc_package = package[:description_package] %>
- <%= highlight(desc_package.summary, @search_term) %>
- <% end %>
-
- <% devel_pack_match = [package[:name] + "-devel", package[:name] + "-doc", package[:name] + "-debuginfo", package[:name] + "-debugsource"] -%>
- <% devel_packages = @result.select{|r| devel_pack_match.include? r[:name] } -%>
- <% unless devel_packages.blank? %>
-
Development packages:
- <% devel_packages.each do |subpackage| %>
- <%= link_to subpackage[:name], :controller => :package, :action => :show, :package => subpackage[:name], :search_term => @search_term %>
- <% end %>
-
- <% @result.reject! {|r| devel_pack_match.include? r[:name] } -%>
- <% end -%>
-
- <% sub_packages = @result.select{|r| r[:name].match(/^#{package[:name]}-/) } -%>
- <% unless sub_packages.blank? -%>
- Sub-packages:
- <% sub_packages.each do |subpackage| %>
- <%= link_to subpackage[:name], :controller => :package, :action => :show, :package => subpackage[:name], :search_term => @search_term %>
- <% end %>
-
- <% @result.reject! {|r| r[:name].match(/^#{package[:name]}-/) } -%>
- <% end -%>
-
-
-
- <% end %>
+ <% @result.each do |package| %>
+
+ - <%= image_tag( screenshot_thumb_url( package[:name] ), :height => 50 ) %>
+ <%= link_to highlight(package[:name], @search_term), :controller => :package, :action => :show, :package => package[:name], :search_term => @search_term %>
+
+ <% if desc_package = package[:description_package] %>
+ <%= highlight(desc_package.summary, @search_term) %>
+ <% end %>
+
+ <% devel_pack_match = [package[:name] + "-devel", package[:name] + "-doc", package[:name] + "-debuginfo", package[:name] + "-debugsource"] -%>
+ <% devel_packages = @result.select{|r| devel_pack_match.include? r[:name] } -%>
+ <% unless devel_packages.blank? %>
+
Development packages:
+ <% devel_packages.each do |subpackage| %>
+ <%= link_to subpackage[:name], :controller => :package, :action => :show, :package => subpackage[:name], :search_term => @search_term %>
+ <% end %>
+
+ <% @result.reject! {|r| devel_pack_match.include? r[:name] } -%>
+ <% end -%>
+
+ <% sub_packages = @result.select{|r| r[:name].match(/^#{package[:name]}-/) } -%>
+ <% unless sub_packages.blank? -%>
+ Sub-packages:
+ <% sub_packages.each do |subpackage| %>
+ <%= link_to subpackage[:name], :controller => :package, :action => :show, :package => subpackage[:name], :search_term => @search_term %>
+ <% end %>
+
+ <% @result.reject! {|r| r[:name].match(/^#{package[:name]}-/) } -%>
+ <% end -%>
+
+
+
+ <% end %>
diff --git a/app/views/search/_search_form.rhtml b/app/views/search/_search_form.rhtml
deleted file mode 100644
index f03780961..000000000
--- a/app/views/search/_search_form.rhtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<% content_for :ready_function do %>
- $(function() {
- var cache = {}, lastXhr;
- $( "#search_form" ).autocomplete({
- minLength: 2,
- source: function( request, response ) {
- var term = request.term;
- if ( term in cache ) {
- response( cache[ term ] );
- return;
- }
- lastXhr = $.getJSON( "<%= url_for :controller => :search, :action => :autocomplete %>", request, function( data, status, xhr ) {
- cache[ term ] = data;
- if ( xhr === lastXhr ) {
- response( data );
- }
- });
- }
- });
- });
-<% end -%>
-
-
-
-<% form_tag( {:controller => 'search', :action => :searchresult}, :method => :get ) do %>
- <%= text_field_tag 'q', @query, :size => 40, :id => "search_form" %>
- <%= submit_tag _('Search'), :name => nil, :class => "search-go-button" %>
-<% end -%>
\ No newline at end of file
diff --git a/app/views/search/find.rhtml b/app/views/search/find.rhtml
index 64a059def..24113f42b 100644
--- a/app/views/search/find.rhtml
+++ b/app/views/search/find.rhtml
@@ -5,4 +5,10 @@
<% content_for :content_for_head do %>
<% end %>
- <%= render :partial => 'search_form' %>
\ No newline at end of file
+<%= render :partial => 'find_form' %>
+
+
+ <% unless @result.blank? %>
+ <%= render :partial => 'find_results' %>
+ <% end %>
+
\ No newline at end of file
diff --git a/app/views/search/searchresult.rhtml b/app/views/search/searchresult.rhtml
deleted file mode 100644
index 792a92189..000000000
--- a/app/views/search/searchresult.rhtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<% @page_title = _("Search") -%>
-<% @hide_side_box = true -%>
-<% @hide_search_box = true -%>
-
-<% content_for :content_for_head do %>
-<% end %>
-
-
-<%= render :partial => 'find_form' %>
-
-
- <%= render :partial => 'find_results' %>
-
-
-
-
-
-