Left base folder: C:\Program Files\xampp\htdocs\old4diff Right base folder: C:\Program Files\xampp\htdocs\drupal-head *** includes\pager.inc 2007-04-12 19:53:32.000000000 -0500 --- includes\pager.inc 2007-04-12 23:49:30.000000000 -0500 *************** *** 111,129 **** */ function theme_pager($tags = array(), $limit = 10, $element = 0, $parameters = array()) { global $pager_total; $output = ''; if ($pager_total[$element] > 1) { ! $output .= '
'; ! $output .= theme('pager_first', ($tags[0] ? $tags[0] : t('« first')), $limit, $element, $parameters); ! $output .= theme('pager_previous', ($tags[1] ? $tags[1] : t('‹ previous')), $limit, $element, 1, $parameters); $output .= theme('pager_list', $limit, $element, ($tags[2] ? $tags[2] : 9 ), '', $parameters); ! $output .= theme('pager_next', ($tags[3] ? $tags[3] : t('next ›')), $limit, $element, 1, $parameters); ! $output .= theme('pager_last', ($tags[4] ? $tags[4] : t('last »')), $limit, $element, $parameters); ! $output .= '
'; return $output; } } /** --- 111,129 ---- */ function theme_pager($tags = array(), $limit = 10, $element = 0, $parameters = array()) { global $pager_total; $output = ''; if ($pager_total[$element] > 1) { ! $output .= "\n" . '' . "\n"; return $output; } } /** *************** *** 152,164 **** function theme_pager_first($text, $limit, $element = 0, $parameters = array()) { global $pager_page_array; $output = ''; // 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')); } return $output; } /** --- 152,168 ---- function theme_pager_first($text, $limit, $element = 0, $parameters = array()) { global $pager_page_array; $output = ''; // 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); ! } ! // Print text for positioning purposes without a link ! else { ! $output = $text; } return $output; } /** *************** *** 190,205 **** // If the previous page is the first page, mark the link as such. if ($page_new[$element] == 0) { $output = theme('pager_first', $text, $limit, $element, $parameters); } // The previous page is not the first page. else { ! $output = theme('pager_link', $text, $page_new, $element, $parameters, array('class' => 'pager-previous')); } } ! return $output; } /** * Format a "next page" link. * --- 194,213 ---- // If the previous page is the first page, mark the link as such. if ($page_new[$element] == 0) { $output = theme('pager_first', $text, $limit, $element, $parameters); } // The previous page is not the first page. else { ! $output = theme('pager_link', $text, $page_new, $element, $parameters); } } ! // Print text for positioning purposes without a link ! else { ! $output = $text; ! } ! return $output; } /** * Format a "next page" link. * *************** *** 228,241 **** // If the next page is the last page, mark the link as such. if ($page_new[$element] == ($pager_total[$element] - 1)) { $output = theme('pager_last', $text, $limit, $element, $parameters); } // The next page is not the last page. else { ! $output = theme('pager_link', $text, $page_new, $element, $parameters, array('class' => 'pager-next')); } } return $output; } /** --- 236,253 ---- // If the next page is the last page, mark the link as such. if ($page_new[$element] == ($pager_total[$element] - 1)) { $output = theme('pager_last', $text, $limit, $element, $parameters); } // The next page is not the last page. else { ! $output = theme('pager_link', $text, $page_new, $element, $parameters); } + } + // Print text for positioning purposes without a link + else { + $output = $text; } return $output; } /** *************** *** 257,269 **** function theme_pager_last($text, $limit, $element = 0, $parameters = array()) { global $pager_page_array, $pager_total; $output = ''; // 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')); } return $output; } /** --- 269,285 ---- function theme_pager_last($text, $limit, $element = 0, $parameters = array()) { global $pager_page_array, $pager_total; $output = ''; // 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); ! } ! // Print text for positioning purposes without a link ! else { ! $output = $text; } return $output; } /** *************** *** 284,296 **** * * @ingroup themeable */ function theme_pager_list($limit, $element = 0, $quantity = 5, $text = '', $parameters = array()) { global $pager_page_array, $pager_total; ! $output = ''; // 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) --- 300,312 ---- * * @ingroup themeable */ function theme_pager_list($limit, $element = 0, $quantity = 5, $text = '', $parameters = array()) { global $pager_page_array, $pager_total; ! $output = ''; // 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) *************** *** 316,348 **** // End of generation loop preparation. // When there is more than one page, create the pager list. if ($i != $pager_max) { $output .= $text; if ($i > 1) { ! $output .= ''; } // Now generate the actual pager piece. for (; $i <= $pager_last && $i <= $pager_max; $i++) { if ($i < $pager_current) { ! $output .= theme('pager_previous', $i, $limit, $element, ($pager_current - $i), $parameters); } if ($i == $pager_current) { ! $output .= ''. $i .''; } if ($i > $pager_current) { ! $output .= theme('pager_next', $i, $limit, $element, ($i - $pager_current), $parameters); } } if ($i < $pager_max) { ! $output .= ''; } } - $output .= ''; return $output; } /** * Format a link to a specific query result page. --- 332,363 ---- // End of generation loop preparation. // When there is more than one page, create the pager list. if ($i != $pager_max) { $output .= $text; if ($i > 1) { ! $output .= '
  • '; } // Now generate the actual pager piece. for (; $i <= $pager_last && $i <= $pager_max; $i++) { if ($i < $pager_current) { ! $output .= '
  • ' . theme('pager_previous', $i, $limit, $element, ($pager_current - $i), $parameters) . '
  • ' . "\n"; } if ($i == $pager_current) { ! $output .= '
  • '. $i .'
  • ' . "\n"; } if ($i > $pager_current) { ! $output .= '
  • ' . theme('pager_next', $i, $limit, $element, ($i - $pager_current), $parameters) . '
  • ' . "\n"; } } if ($i < $pager_max) { ! $output .= '
  • '; } } return $output; } /** * Format a link to a specific query result page. *** modules\system\system.css 2007-04-09 08:58:02.000000000 -0500 --- modules\system\system.css 2007-04-12 20:25:08.000000000 -0500 *************** *** 119,132 **** white-space: nowrap; } .pager { clear: both; text-align: center; } ! .pager a, .pager strong.pager-current { ! padding: 0.5em; } .tips { margin-top: 0; margin-bottom: 0; padding-top: 0; padding-bottom: 0; --- 119,138 ---- white-space: nowrap; } .pager { clear: both; text-align: center; } ! .pager li { ! background-image:none; ! display:inline; ! list-style-type:none; ! padding:5px; ! } ! .pager-current { ! font-weight:bold; } .tips { margin-top: 0; margin-bottom: 0; padding-top: 0; padding-bottom: 0;