Merge PR #971 branch 'nickvergessen/ticket/11018' into develop

* nickvergessen/ticket/11018:
  [ticket/11014] Fix old pagination assignment
  [ticket/11018] Fix several paginations in ACP
  [ticket/11014] Fix IF statements for new template pagination
  [ticket/11014] Fix text for previous/next links in Subsilver2
  [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
  [ticket/11018] Always display previous/next links if we can display one
  [ticket/11014] Restore template vars for next/previous links
  [ticket/11018] Swap prev/next links on pagination to the old order
  [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same
  [ticket/11018] Fix minor issues with CSS in prosilver
  [ticket/11018] Attempt to fix li.pagination alignment issue

phpBB/adm/style/acp_attachments.html

@@ -382,10 +382,9 @@
 	<!-- IF .pagination or TOTAL_FILES -->
 		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}
 		<!-- IF .pagination -->
-			&bull; 
+			&bull; <!-- INCLUDE pagination.html -->
-			<!-- INCLUDE pagination.html -->
 		<!-- ELSE -->
-			{S_ON_PAGE}
+			&bull; {S_ON_PAGE}
 		<!-- ENDIF -->
 	<!-- ENDIF -->
 	</div>
@@ -427,7 +426,12 @@
 	<hr />
 
 	<div class="pagination">
-		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}<!-- IF S_ON_PAGE --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {S_ON_PAGE}<!-- ENDIF --><!-- ENDIF -->
+		{L_NUMBER_FILES}: {TOTAL_FILES} &bull; {L_TOTAL_SIZE}: {TOTAL_SIZE}
+		<!-- IF .pagination -->
+			&bull; <!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			&bull; {S_ON_PAGE}
+		<!-- ENDIF -->
 	</div>
 	<!-- ENDIF -->
 

phpBB/adm/style/acp_inactive.html

@@ -10,11 +10,11 @@
 
 <div class="clearfix"></div>
 
-<div class="pagination">
 <!-- IF .pagination -->
+<div class="pagination">
 	<!-- INCLUDE pagination.html -->
-<!-- ENDIF -->
 </div>
+<!-- ENDIF -->
 
 <table cellspacing="1">
 <thead>
@@ -53,15 +53,15 @@
 </table>
 
 <fieldset class="display-options">
-	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION -->&nbsp;Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 </fieldset>
 
 <hr />
 
-<!-- IF PAGINATION -->
+<!-- IF .pagination -->
 	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+		<!-- INCLUDE pagination.html -->
 	</div>
 <!-- ENDIF -->
 

phpBB/adm/style/acp_logs.html

@@ -12,11 +12,11 @@
 	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
-<div class="pagination" style="float: right; margin: 15px 0 2px 0">
 <!-- IF .pagination -->
+<div class="pagination" style="float: right; margin: 15px 0 2px 0">
 	<!-- INCLUDE pagination.html -->
-<!-- ENDIF -->
 </div>
+<!-- ENDIF -->
 
 <div class="clearfix">&nbsp;</div>
 <div><br style="clear: both;" /></div>
@@ -54,9 +54,9 @@
 	</tbody>
 	</table>
 
-<!-- IF PAGINATION -->
+<!-- IF .pagination -->
 	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+		<!-- INCLUDE pagination.html -->
 	</div>
 <!-- ENDIF -->
 

phpBB/adm/style/admin.css

@@ -1148,55 +1148,79 @@ input.disabled {
 	width: auto;
 	text-align: right;
 	margin-top: 5px;
-	font-size: 0.85em;
+	float: right;
-	padding-bottom: 2px;
 }
 
 .rtl .pagination {
 	text-align: left;
+	float: left;
 }
 
-.pagination strong,
+li.pagination {
-.pagination b {
+	margin-top: 0;
-	font-weight: normal;
-}
-
-.pagination span.page-sep {
-	display:none;
-}
-
-.pagination span strong {
-	padding: 0 2px;
-	margin: 0 2px;
-	font-weight: normal;
-	font-size: 0.85em;
-	color: #FFFFFF;
-	background: #4692BF;
-	border: 1px solid #4692BF;
-}
-
-.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
-	font-weight: normal;
-	font-size: 0.85em;
-	text-decoration: none;
-	color: #5C758C;
-	margin: 0 2px;
-	padding: 0 2px;
-	background: #ECEDEE;
-	border: 1px solid #B4BAC0;
-}
-
-.pagination span a:hover {
-	border-color: #368AD2;
-	background: #368AD2;
-	color: #FFFFFF;
-	text-decoration: none;
 }
 
 .pagination img {
 	vertical-align: middle;
 }
 
+.pagination ul {
+	display: inline-block;
+	*display: inline; /* IE7 inline-block hack */
+	*zoom: 1;
+	margin-left: 0;
+	margin-bottom: 0;
+}
+
+li.pagination ul {
+	margin-top: -2px;
+	vertical-align: middle;
+}
+
+.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li {
+	display: inline;
+	padding: 0;
+	font-size: 100%;
+	line-height: normal;
+}
+
+.pagination li a, .pagnation li span, li .pagination li a, li .pagnation li span, .pagination li.active span, .pagination li.ellipsis span {
+	font-weight: normal;
+	text-decoration: none;
+	padding: 0 2px;
+	border: 1px solid transparent;
+	font-size: 0.9em;
+	line-height: 1.5em;
+}
+
+.pagination li a, .pagination li a:link, .pagination li a:visited {
+	color: #5C758C;
+	background-color: #ECEDEE;
+	border-color: #B4BAC0;
+}
+
+.pagination li.ellipsis  span {
+	background-color: transparent;
+	color: #000000;
+}
+
+.pagination li.active span {
+	color: #FFFFFF;
+	background-color: #4692BF;
+	border-color: #4692BF;
+}
+
+.pagination li a:hover, .pagination .active a:hover {
+	color: #FFFFFF;
+	background-color: #368AD2;
+	border-color: #368AD2;
+}
+
+.pagination li a:active, .pagination li.active a:active {
+	color: #5C758C;
+	background-color: #ECEDEE;
+	border-color: #B4BAC0;
+}
 
 /* Action Highlighting
 ---------------------------------------- */

phpBB/includes/acp/acp_inactive.php

@@ -299,7 +299,6 @@ class acp_inactive
 			'S_SORT_KEY'	=> $s_sort_key,
 			'S_SORT_DIR'	=> $s_sort_dir,
 			'S_ON_PAGE'		=> phpbb_on_page($template, $user, $base_url, $inactive_count, $per_page, $start),
-			
 			'USERS_PER_PAGE'	=> $per_page,
 
 			'U_ACTION'		=> $this->u_action . "&$u_sort_param&users_per_page=$per_page&start=$start",

phpBB/includes/functions.php

@@ -2171,14 +2171,14 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam
 		$end_page = ($total_pages > 5) ? max(min($total_pages, $on_page + 3), 5) : $total_pages;
 	}
 
-	if ($on_page != $total_pages)
+	if ($on_page != 1)
 	{
 		$template->assign_block_vars($block_var_name, array(
 			'PAGE_NUMBER'	=> '',
-			'PAGE_URL'		=> $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page),
+			'PAGE_URL'		=> $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page),
 			'S_IS_CURRENT'	=> false,
-			'S_IS_PREV'		=> false,
+			'S_IS_PREV'		=> true,
-			'S_IS_NEXT'		=> true,
+			'S_IS_NEXT'		=> false,
 			'S_IS_ELLIPSIS'	=> false,
 		));
 	}
@@ -2225,17 +2225,56 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam
 	}
 	while ($at_page <= $total_pages);
 
-	if ($on_page != 1)
+	if ($on_page != $total_pages)
 	{
 		$template->assign_block_vars($block_var_name, array(
 			'PAGE_NUMBER'	=> '',
-			'PAGE_URL'		=> $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page),
+			'PAGE_URL'		=> $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page),
 			'S_IS_CURRENT'	=> false,
-			'S_IS_PREV'		=> true,
+			'S_IS_PREV'		=> false,
-			'S_IS_NEXT'		=> false,
+			'S_IS_NEXT'		=> true,
 			'S_IS_ELLIPSIS'	=> false,
 		));
 	}
+
+	// If the block_var_name is a nested block, we will use the last (most
+	// inner) block as a prefix for the template variables. If the last block
+	// name is pagination, the prefix is empty. If the rest of the
+	// block_var_name is not empty, we will modify the last row of that block
+	// and add our pagination items.
+	$tpl_block_name = $tpl_prefix = '';
+	if (strrpos($block_var_name, '.') !== false)
+	{
+		$tpl_block_name = substr($block_var_name, 0, strrpos($block_var_name, '.'));
+		$tpl_prefix = strtoupper(substr($block_var_name, strrpos($block_var_name, '.') + 1));
+	}
+	else
+	{
+		$tpl_prefix = strtoupper($block_var_name);
+	}
+	$tpl_prefix = ($tpl_prefix == 'PAGINATION') ? '' : $tpl_prefix . '_';
+
+	$previous_page = ($on_page != 1) ? $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page) : '';
+
+	$template_array = array(
+		$tpl_prefix . 'BASE_URL'		=> $base_url,
+		'A_' . $tpl_prefix . 'BASE_URL'		=> addslashes($base_url),
+		$tpl_prefix . 'PER_PAGE'		=> $per_page,
+		$tpl_prefix . 'PREVIOUS_PAGE'	=> $previous_page,
+		$tpl_prefix . 'PREV_PAGE'		=> $previous_page,
+		$tpl_prefix . 'NEXT_PAGE'		=> ($on_page != $total_pages) ? $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page) : '',
+		$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages,
+		$tpl_prefix . 'CURRENT_PAGE'	=> $on_page,
+	);
+
+	if ($tpl_block_name)
+	{
+		$template->alter_block_array($tpl_block_name, $template_array, true, 'change');
+	}
+	else
+	{
+		$template->assign_vars($template_array);
+	}
 }
 
 /**
@@ -2260,7 +2299,6 @@ function phpbb_on_page($template, $user, $base_url, $num_items, $per_page, $star
 	$template->assign_vars(array(
 		'PER_PAGE'		=> $per_page,
 		'ON_PAGE'		=> $on_page,
-
 		'A_BASE_URL'	=> addslashes($base_url),
 	));
 

phpBB/styles/prosilver/template/viewtopic_body.html

@@ -245,7 +245,7 @@
 <!-- IF S_QUICK_REPLY -->
 	<!-- INCLUDE quickreply_editor.html -->
 <!-- ENDIF -->
-<!-- IF S_NUM_POSTS > 1 or PREVIOUS_PAGE -->
+<!-- IF S_NUM_POSTS > 1 or PREVIOUS_PAGE or NEXT_PAGE -->
 	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">
 
 	<fieldset class="display-options" style="margin-top: 0; ">

phpBB/styles/prosilver/theme/colours.css

@@ -153,7 +153,7 @@ dl.details dd {
 
 .pagination li.ellipsis span {
 	background-color: transparent;
-	color:	#000
+	color:	#000000;
 }
 
 .pagination li.active span {
@@ -165,7 +165,7 @@ dl.details dd {
 .pagination li a:hover, .pagination .active a:hover {
 	border-color: #368AD2;
 	background-color: #368AD2;
-	color: #FFF;
+	color: #FFFFFF;
 }
 
 .pagination li a:active, .pagination li.active a:active {

phpBB/styles/prosilver/theme/common.css

@@ -510,9 +510,16 @@ li.pagination {
 	margin-bottom: 0;
 }
 
+li.pagination ul {
+	margin-top: -2px;
+	vertical-align: middle;
+}
+
 .pagination ul li, dl .pagination ul li, dl.icon .pagination ul li {
 	display: inline;
 	padding: 0;
+	font-size: 100%;
+	line-height: normal;
 }
 
 .pagination li a, .pagnation li span, li .pagination li a, li .pagnation li span, .pagination li.active span, .pagination li.ellipsis span {

phpBB/styles/subsilver2/template/mcp_footer.html

@@ -3,7 +3,7 @@
 		</tr>
 	</table>
 
-	<!-- IF PAGINATION -->
+	<!-- IF .pagination -->
 		<table width="80%" align="{S_CONTENT_FLOW_END}" cellspacing="1">
 		<tr>
 			<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>

phpBB/styles/subsilver2/template/pagination.html

@@ -1,10 +1,10 @@
 <!-- IF .pagination -->
 	<b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> 
 	<!-- BEGIN pagination -->
-		<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+		<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a>
 		<!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong>
 		<!-- ELSEIF pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
-		<!-- ELSEIF pagination.S_IS_NEXT --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+		<!-- ELSEIF pagination.S_IS_NEXT --><a href="{pagination.PAGE_URL}">{L_NEXT}</a>
 		<!-- ELSE --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
 		<!-- ENDIF -->
 	<!-- END pagination -->

phpBB/styles/subsilver2/template/ucp_groups_manage.html

@@ -185,7 +185,7 @@
 	</table>
 
 	<div class="pagination" style="float: {S_CONTENT_FLOW_BEGIN};">
-		<!-- IF PAGINATION -->
+		<!-- IF .pagination -->
 			<!-- INCLUDE pagination.html -->
 		<!-- ELSE -->
 			{S_ON_PAGE}

phpBB/styles/subsilver2/template/viewonline_body.html

@@ -4,7 +4,7 @@
 <h4>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> [ <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a> ]<!-- ENDIF --></h4>
 <br />
 
-<!-- IF PAGINATION -->
+<!-- IF .pagination -->
 	<table width="100%" cellspacing="1">
 	<tr>
 		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
@@ -35,7 +35,7 @@
 <!-- ENDIF -->
 </table>
 
-<!-- IF PAGINATION -->
+<!-- IF .pagination -->
 	<table width="100%" cellspacing="1">
 	<tr>
 		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>

phpBB/viewonline.php

@@ -422,7 +422,6 @@ $template->assign_vars(array(
 	'TOTAL_REGISTERED_USERS_ONLINE'	=> $user->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $user->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)),
 	'TOTAL_GUEST_USERS_ONLINE'		=> $user->lang('GUEST_USERS_ONLINE', (int) $guest_counter),
 	'LEGEND'						=> $legend,
-	'PAGINATION'					=> $pagination,
 	'PAGE_NUMBER'					=> phpbb_on_page($template, $user, $base_url, $counter, $config['topics_per_page'], $start),
 
 	'U_SORT_USERNAME'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)),