diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 414e43916da1f53bf9acd6b38913f82a1e097ae1..98fc27fa2b446845cf991c08e6f64c8ec19d3aeb 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -57,4 +57,14 @@ module SearchHelper end ('<ul>' + links.map {|link| content_tag('li', link)}.join(' ') + '</ul>') unless links.empty? end + + def link_to_previous_search_page(pagination_previous_date) + link_to_content_update('« ' + l(:label_previous), + params.merge(:previous => 1, :offset => pagination_previous_date.strftime("%Y%m%d%H%M%S"))) + end + + def link_to_next_search_page(pagination_next_date) + link_to_content_update(l(:label_next) + ' »', + params.merge(:previous => nil, :offset => pagination_next_date.strftime("%Y%m%d%H%M%S"))) + end end diff --git a/app/views/search/_pagination.html.erb b/app/views/search/_pagination.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..d06fe8eb909c65b9e1158fcafe7955c421d11957 --- /dev/null +++ b/app/views/search/_pagination.html.erb @@ -0,0 +1,10 @@ +<div class="search-pagination"> + <p> + <% if pagination_previous_date %> + <%= link_to_previous_search_page(pagination_previous_date) %> + <% end %> + <% if pagination_next_date %> + <%= link_to_next_search_page(pagination_next_date) %> + <% end %> + </p> +</div> diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml index 674cabf66e4dcb659e62f4d2ba3795a662e69405..db9e3b641bf5e3bcdb8c5e50f1f6597b22a13526 100644 --- a/app/views/search/index.rhtml +++ b/app/views/search/index.rhtml @@ -24,6 +24,9 @@ </div> <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3> + + <%= render :partial => 'pagination', :locals => {:pagination_previous_date => @pagination_previous_date, :pagination_next_date => @pagination_next_date } %> + <dl id="search-results"> <% @results.each do |e| %> <dt class="<%= e.event_type %>"> @@ -36,15 +39,6 @@ </dl> <% end %> -<p><center> -<% if @pagination_previous_date %> -<%= link_to_content_update('« ' + l(:label_previous), - params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))) %> -<% end %> -<% if @pagination_next_date %> -<%= link_to_content_update(l(:label_next) + ' »', - params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %> -<% end %> -</center></p> +<%= render :partial => 'pagination', :locals => {:pagination_previous_date => @pagination_previous_date, :pagination_next_date => @pagination_next_date } %> <% html_title(l(:label_search)) -%> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 0c79cd6408060254059293cc23fdcde3a2b50aed..a708730814ece5d56f28a0b71ae84a2eeb56ead0 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -331,6 +331,9 @@ dt.time-entry { background-image: url(../images/time.png); } #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); } +.search-pagination { text-align: center; } +.search-pagination a {padding: 0 5px; } + div#roadmap .related-issues { margin-bottom: 1em; } div#roadmap .related-issues td.checkbox { display: none; } div#roadmap .wiki h1:first-child { display: none; }