diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-09-20 08:46:04 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-09-20 08:46:04 +0100 |
| commit | 6800b9ff3fc77aa441afbdb0b0196afbdd87d8b4 (patch) | |
| tree | 3b10d734ff4d4f84c280535b0592dcb9be27672b | |
| parent | 992a0b8acc4556fa1687bdf7bc66d63a51d410b3 (diff) | |
| parent | d54f405434a3b0da5f2c88fc065680caf044aff2 (diff) | |
Merge release 0.3 (noop, I think)
| -rw-r--r-- | app/views/general/search.rhtml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index 6f0d25da4..903eaa414 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -187,9 +187,12 @@ <% end %> </div> - <%= will_paginate WillPaginate::Collection.new(@page, @users_per_page, @xapian_users.matches_estimated) %> - <% end %> - </div> + <% if @xapian_requests_hits > 0 %> + <% if @xapian_requests_hits == 1 && @page == 1 %> + <h1><%= _("One FOI request matching your search", :user_search_query => h(@query)) %></h1> + <% else %> + <h1><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}}", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> + <% end %> <div class="results_section"> <% if @xapian_requests_hits > 0 %> |