From 19ad65699079602599657ced2c0674effe54b037 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Fri, 16 Nov 2001 00:20:43 +0000 Subject: Pagination update git-svn-id: file:///svn/phpbb/trunk@1330 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/search.php | 5 +---- phpBB/templates/subSilver/search_results_posts.tpl | 6 ++---- phpBB/templates/subSilver/search_results_topics.tpl | 6 ++---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/phpBB/search.php b/phpBB/search.php index d32ed4b959..9ca2e19124 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1056,11 +1056,8 @@ else if( $query_keywords != "" || $query_author != "" || $search_id ) $template->assign_vars(array( "PAGINATION" => generate_pagination($base_url, $total_match_count, $per_page, $start), - "ON_PAGE" => floor( $start / $per_page ) + 1, - "TOTAL_PAGES" => ceil( $total_match_count / $per_page ), + "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page )), - "L_OF" => $lang['of'], - "L_PAGE" => $lang['Page'], "L_GOTO_PAGE" => $lang['Goto_page']) ); diff --git a/phpBB/templates/subSilver/search_results_posts.tpl b/phpBB/templates/subSilver/search_results_posts.tpl index 8136106994..0a500cdba8 100644 --- a/phpBB/templates/subSilver/search_results_posts.tpl +++ b/phpBB/templates/subSilver/search_results_posts.tpl @@ -39,10 +39,8 @@ - - + +
{L_PAGE} {ON_PAGE} - {L_OF} {TOTAL_PAGES}{PAGINATION}
- {S_TIMEZONE}		{PAGE_NUMBER}{PAGINATION}
{S_TIMEZONE}
diff --git a/phpBB/templates/subSilver/search_results_topics.tpl b/phpBB/templates/subSilver/search_results_topics.tpl index 7cbb17acb9..b1df6c5240 100644 --- a/phpBB/templates/subSilver/search_results_topics.tpl +++ b/phpBB/templates/subSilver/search_results_topics.tpl @@ -43,10 +43,8 @@
- - + +
{L_PAGE} {ON_PAGE} - {L_OF} {TOTAL_PAGES}{PAGINATION}
- {S_TIMEZONE}		{PAGE_NUMBER}{PAGINATION}
{S_TIMEZONE}
-- cgit v1.2.1