=== modified file 'includes/common.inc'
--- includes/common.inc 18 Apr 2007 20:35:45 -0000 1.632
+++ includes/common.inc 19 Apr 2007 13:01:47 -0000
@@ -2396,9 +2396,6 @@ function drupal_common_themes() {
'pager_last' => array(
'arguments' => array('text' => NULL, 'limit' => NULL, 'element' => 0, 'parameters' => array()),
),
- 'pager_list' => array(
- 'arguments' => array('limit' => NULL, 'element' => 0, 'quantity' => 5, 'text' => '', 'parameters' => array()),
- ),
'pager_link' => array(
'arguments' => array('text' => NULL, 'page_new' => NULL, 'element' => NULL, 'parameters' => array(), 'attributes' => array()),
),
=== modified file 'includes/pager.inc'
--- includes/pager.inc 15 Feb 2007 11:40:17 -0000 1.60
+++ includes/pager.inc 20 Apr 2007 00:42:50 -0000
@@ -95,9 +95,12 @@ function pager_get_querystring() {
*
* Menu callbacks that display paged query results should call theme('pager') to
* retrieve a pager control so that users can view other results.
+ * Format a list of nearby pages with additional query results.
*
* @param $tags
- * An array of labels for the controls in the pager.
+ * An array of labels (or images) for the controls in the pager.
+ * Note: $tags[2] is used to set the maximum number of pages
+ * in the pager piece (default is 9).
* @param $limit
* The number of query results to display per page.
* @param $element
@@ -110,19 +113,98 @@ function pager_get_querystring() {
* @ingroup themeable
*/
function theme_pager($tags = array(), $limit = 10, $element = 0, $parameters = array()) {
- global $pager_total;
- $output = '';
+ global $pager_page_array, $pager_total;
if ($pager_total[$element] > 1) {
- $output .= '';
+ $quantity = ($tags[2] ? $tags[2] : 9 );
+ // Calculate various markers within this pager piece:
+ // Middle is used to "center" pages around the current page.
+ $pager_middle = ceil($quantity / 2);
+ // current is the page we are currently paged to
+ $pager_current = $pager_page_array[$element] + 1;
+ // first is the first page listed by this pager piece (re quantity)
+ $pager_first = $pager_current - $pager_middle + 1;
+ // last is the last page listed by this pager piece (re quantity)
+ $pager_last = $pager_current + $quantity - $pager_middle;
+ // max is the maximum page number
+ $pager_max = $pager_total[$element];
+ // End of marker calculations.
+
+ $i = $pager_first;
+ if ($pager_last > $pager_max) {
+ // Adjust "center" if at end of query.
+ $i = $i + ($pager_max - $pager_last);
+ $pager_last = $pager_max;
+ }
+ if ($i <= 0) {
+ // Adjust "center" if at start of query.
+ $pager_last = $pager_last + (1 - $i);
+ $i = 1;
+ }
+
+ if ($pager_current > 1) {
+ // If we are anywhere but the first page
+ $items[] = array(
+ 'class' => 'pager-first',
+ 'data' => theme('pager_first', ($tags[0] ? $tags[0] : t('« first')), $limit, $element, $parameters),
+ );
+ $items[] = array(
+ 'class' => 'pager-previous',
+ 'data' => theme('pager_previous', ($tags[1] ? $tags[1] : t('‹ previous')), $limit, $element, 1, $parameters),
+ );
+ }
- return $output;
+ // When there is more than one page, create the pager list.
+ if ($i != $pager_max) {
+ if ($i > 1) {
+ $items[] = array(
+ 'class' => 'pager-ellipsis',
+ 'data' => '…',
+ );
+ }
+
+ // Now generate the actual pager piece.
+ for (; $i <= $pager_last && $i <= $pager_max; $i++) {
+ if ($i < $pager_current) {
+ $items[] = array(
+ 'class' => 'pager-item',
+ 'data' => theme('pager_previous', $i, $limit, $element, ($pager_current - $i), $parameters),
+ );
+ }
+ if ($i == $pager_current) {
+ $items[] = array(
+ 'class' => 'pager-current',
+ 'data' => $i,
+ );
+ }
+ if ($i > $pager_current) {
+ $items[] = array(
+ 'class' => 'pager-item',
+ 'data' => theme('pager_next', $i, $limit, $element, ($i - $pager_current), $parameters),
+ );
+ }
+ }
+
+ if ($pager_last < $pager_max) {
+ $items[] = array(
+ 'class' => 'pager-ellipsis',
+ 'data' => '…',
+ );
+ }
+ }
+
+ if ($pager_current < $pager_max) {
+ // If we are anywhere but the last page
+ $items[] = array(
+ 'class' => 'pager-next',
+ 'data' => theme('pager_next', ($tags[3] ? $tags[3] : t('next ›')), $limit, $element, 1, $parameters),
+ );
+ $items[] = array(
+ 'class' => 'pager-last',
+ 'data' => theme('pager_last', ($tags[4] ? $tags[4] : t('last »')), $limit, $element, $parameters),
+ );
+ }
+ return theme('item_list', $items, NULL, 'ul', array('class' => 'pager'));
}
}
@@ -137,7 +219,7 @@ function theme_pager($tags = array(), $l
* Format a "first page" link.
*
* @param $text
- * The name (or image) of the link.
+ * The label (or image) of the link.
* @param $limit
* The number of query results to display per page.
* @param $element
@@ -155,7 +237,7 @@ function theme_pager_first($text, $limit
// If we are anywhere but the first page
if ($pager_page_array[$element] > 0) {
- $output = theme('pager_link', $text, pager_load_array(0, $element, $pager_page_array), $element, $parameters, array('class' => 'pager-first'));
+ $output = theme('pager_link', $text, pager_load_array(0, $element, $pager_page_array), $element, $parameters);
}
return $output;
@@ -165,7 +247,7 @@ function theme_pager_first($text, $limit
* Format a "previous page" link.
*
* @param $text
- * The name (or image) of the link.
+ * The label (or image) of the link.
* @param $limit
* The number of query results to display per page.
* @param $element
@@ -193,7 +275,7 @@ function theme_pager_previous($text, $li
}
// The previous page is not the first page.
else {
- $output = theme('pager_link', $text, $page_new, $element, $parameters, array('class' => 'pager-previous'));
+ $output = theme('pager_link', $text, $page_new, $element, $parameters);
}
}
@@ -204,7 +286,7 @@ function theme_pager_previous($text, $li
* Format a "next page" link.
*
* @param $text
- * The name (or image) of the link.
+ * The label (or image) of the link.
* @param $limit
* The number of query results to display per page.
* @param $element
@@ -231,7 +313,7 @@ function theme_pager_next($text, $limit,
}
// The next page is not the last page.
else {
- $output = theme('pager_link', $text, $page_new, $element, $parameters, array('class' => 'pager-next'));
+ $output = theme('pager_link', $text, $page_new, $element, $parameters);
}
}
@@ -242,7 +324,7 @@ function theme_pager_next($text, $limit,
* Format a "last page" link.
*
* @param $text
- * The name (or image) of the link.
+ * The label (or image) of the link.
* @param $limit
* The number of query results to display per page.
* @param $element
@@ -260,93 +342,18 @@ function theme_pager_last($text, $limit,
// If we are anywhere but the last page
if ($pager_page_array[$element] < ($pager_total[$element] - 1)) {
- $output = theme('pager_link', $text, pager_load_array($pager_total[$element] - 1, $element, $pager_page_array), $element, $parameters, array('class' => 'pager-last'));
+ $output = theme('pager_link', $text, pager_load_array($pager_total[$element] - 1, $element, $pager_page_array), $element, $parameters);
}
return $output;
}
-/**
- * Format a list of nearby pages with additional query results.
- *
- * @param $limit
- * The number of query results to display per page.
- * @param $element
- * An optional integer to distinguish between multiple pagers on one page.
- * @param $quantity
- * The number of pages in the list.
- * @param $text
- * A string of text to display before the page list.
- * @param $parameters
- * An associative array of query string parameters to append to the pager links.
- * @return
- * An HTML string that generates this piece of the query pager.
- *
- * @ingroup themeable
- */
-function theme_pager_list($limit, $element = 0, $quantity = 5, $text = '', $parameters = array()) {
- global $pager_page_array, $pager_total;
-
- $output = '';
-
- return $output;
-}
/**
* Format a link to a specific query result page.
*
+ * @param $text
+ * The label (or image) of the link.
* @param $page_new
* The first result to display on the linked page.
* @param $element
=== modified file 'modules/system/system.css'
--- modules/system/system.css 9 Apr 2007 13:58:03 -0000 1.24
+++ modules/system/system.css 19 Apr 2007 13:01:47 -0000
@@ -118,13 +118,19 @@
.nowrap {
white-space: nowrap;
}
-.pager {
+.item-list .pager {
clear: both;
text-align: center;
}
-.pager a, .pager strong.pager-current {
+.item-list .pager li {
+ background-image:none;
+ display:inline;
+ list-style-type:none;
padding: 0.5em;
}
+.pager-current {
+ font-weight:bold;
+}
.tips {
margin-top: 0;
margin-bottom: 0;