Changeset 1535
- Timestamp:
- 12/14/2007 03:27:07 PM (10 months ago)
- Location:
- trunk/system
- Files:
-
- 1 removed
- 5 modified
-
i18n/nl_NL/creditcard.php (deleted)
-
libraries/Pagination.php (modified) (2 diffs)
-
views/pagination/classic.php (modified) (3 diffs)
-
views/pagination/digg.php (modified) (7 diffs)
-
views/pagination/extended.php (modified) (2 diffs)
-
views/pagination/punbb.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/system/libraries/Pagination.php
r1522 r1535 11 11 12 12 // Config values 13 pr otected$base_url = '';14 pr otected$directory = 'pagination';15 pr otected$style = 'classic';16 pr otected$uri_segment = 3;13 private $base_url = ''; 14 private $directory = 'pagination'; 15 private $style = 'classic'; 16 private $uri_segment = 3; 17 17 protected $items_per_page = 10; 18 protected $total_items = 0; 18 19 19 // Automatically calculated values 20 // Automatically generated values 21 protected $url; 20 22 protected $current_page; 21 23 protected $total_pages; 22 protected $total_items;23 24 protected $current_first_item; 24 25 protected $current_last_item; … … 66 67 $this->directory = trim($this->directory, '/').'/'; 67 68 68 // Don't bother about full base_urls 69 if (strpos($this->base_url, '://') === FALSE) 69 // Start building a generic URL 70 $this->url = ($this->base_url == '') ? Router::$segments : $this->url = explode('/', trim($this->base_url, '/')); 71 72 // Convert uri 'label' to corresponding integer if needed 73 if (is_string($this->uri_segment)) 70 74 { 71 // Default base_url 72 if ($this->base_url == '') 75 if (($key = array_search($this->uri_segment, $this->url)) === FALSE) 73 76 { 74 $this->base_url = url::current(); 77 // If uri 'label' is not found, auto add it to base_url 78 $this->url[] = $this->uri_segment; 79 $this->uri_segment = count($this->url) + 1; 75 80 } 76 77 // Explode base_url into segments 78 $this->base_url = explode('/', trim($this->base_url, '/')); 79 80 // Convert uri 'label' to corresponding integer if needed 81 if (is_string($this->uri_segment)) 81 else 82 82 { 83 if (($key = array_search($this->uri_segment, $this->base_url)) === FALSE) 84 { 85 // If uri 'label' is not found, auto add it to base_url 86 $this->base_url[] = $this->uri_segment; 87 $this->uri_segment = count($this->base_url) + 1; 88 } 89 else 90 { 91 $this->uri_segment = $key + 2; 92 } 83 $this->uri_segment = $key + 2; 93 84 } 94 95 // Create a generic base_url including query string and a {page} placeholder96 $this->base_url[$this->uri_segment - 1] = '{page}';97 $this->base_url = url::site(implode('/', $this->base_url)).Router::$query_string;98 85 } 86 87 // Create a generic URL with query string and {page} number placeholder 88 $this->url[$this->uri_segment - 1] = '{page}'; 89 $this->url = url::site(implode('/', $this->url)).Router::$query_string; 99 90 100 91 // Core pagination values -
trunk/system/views/pagination/classic.php
r1522 r1535 10 10 11 11 <?php if ($first_page): ?> 12 <a href="<?php echo str_replace('{page}', 1, $ base_url) ?>">‹ <?php echo Kohana::lang('pagination.first') ?></a>12 <a href="<?php echo str_replace('{page}', 1, $url) ?>">‹ <?php echo Kohana::lang('pagination.first') ?></a> 13 13 <?php endif; ?> 14 14 15 15 <?php if ($previous_page): ?> 16 <a href="<?php echo str_replace('{page}', $previous_page, $ base_url) ?>"><</a>16 <a href="<?php echo str_replace('{page}', $previous_page, $url) ?>"><</a> 17 17 <?php endif; ?> 18 18 … … 23 23 <strong><?php echo $i ?></strong> 24 24 <?php else: ?> 25 <a href="<?php echo str_replace('{page}', $i, $ base_url) ?>"><?php echo $i ?></a>25 <a href="<?php echo str_replace('{page}', $i, $url) ?>"><?php echo $i ?></a> 26 26 <?php endif; ?> 27 27 … … 30 30 31 31 <?php if ($next_page): ?> 32 <a href="<?php echo str_replace('{page}', $next_page, $ base_url) ?>">></a>32 <a href="<?php echo str_replace('{page}', $next_page, $url) ?>">></a> 33 33 <?php endif; ?> 34 34 35 35 <?php if ($last_page): ?> 36 <a href="<?php echo str_replace('{page}', $last_page, $ base_url) ?>"><?php echo Kohana::lang('pagination.last') ?> ›</a>36 <a href="<?php echo str_replace('{page}', $last_page, $url) ?>"><?php echo Kohana::lang('pagination.last') ?> ›</a> 37 37 <?php endif; ?> 38 38 -
trunk/system/views/pagination/digg.php
r1522 r1535 10 10 11 11 <?php if ($previous_page): ?> 12 <a href="<?php echo str_replace('{page}', $previous_page, $ base_url) ?>">« <?php echo Kohana::lang('pagination.previous') ?></a>12 <a href="<?php echo str_replace('{page}', $previous_page, $url) ?>">« <?php echo Kohana::lang('pagination.previous') ?></a> 13 13 <?php else: ?> 14 14 « <?php echo Kohana::lang('pagination.previous') ?> … … 22 22 <strong><?php echo $i ?></strong> 23 23 <?php else: ?> 24 <a href="<?php echo str_replace('{page}', $i, $ base_url) ?>"><?php echo $i ?></a>24 <a href="<?php echo str_replace('{page}', $i, $url) ?>"><?php echo $i ?></a> 25 25 <?php endif; ?> 26 26 <?php endfor; ?> … … 32 32 <strong><?php echo $i ?></strong> 33 33 <?php else: ?> 34 <a href="<?php echo str_replace('{page}', $i, $ base_url) ?>"><?php echo $i ?></a>34 <a href="<?php echo str_replace('{page}', $i, $url) ?>"><?php echo $i ?></a> 35 35 <?php endif; ?> 36 36 <?php endfor; ?> 37 37 38 38 … 39 <a href="<?php echo str_replace('{page}', $total_pages - 1, $ base_url) ?>"><?php echo $total_pages - 1 ?></a>40 <a href="<?php echo str_replace('{page}', $total_pages, $ base_url) ?>"><?php echo $total_pages ?></a>39 <a href="<?php echo str_replace('{page}', $total_pages - 1, $url) ?>"><?php echo $total_pages - 1 ?></a> 40 <a href="<?php echo str_replace('{page}', $total_pages, $url) ?>"><?php echo $total_pages ?></a> 41 41 42 42 <?php elseif ($current_page > $total_pages - 8): /* « Previous 1 2 … 17 18 19 20 21 22 23 24 25 26 Next » */ ?> 43 43 44 <a href="<?php echo str_replace('{page}', 1, $ base_url) ?>">1</a>45 <a href="<?php echo str_replace('{page}', 2, $ base_url) ?>">2</a>44 <a href="<?php echo str_replace('{page}', 1, $url) ?>">1</a> 45 <a href="<?php echo str_replace('{page}', 2, $url) ?>">2</a> 46 46 … 47 47 … … 50 50 <strong><?php echo $i ?></strong> 51 51 <?php else: ?> 52 <a href="<?php echo str_replace('{page}', $i, $ base_url) ?>"><?php echo $i ?></a>52 <a href="<?php echo str_replace('{page}', $i, $url) ?>"><?php echo $i ?></a> 53 53 <?php endif; ?> 54 54 <?php endfor; ?> … … 56 56 <?php else: /* « Previous 1 2 … 5 6 7 8 9 10 11 12 13 14 … 25 26 Next » */ ?> 57 57 58 <a href="<?php echo str_replace('{page}', 1, $ base_url) ?>">1</a>59 <a href="<?php echo str_replace('{page}', 2, $ base_url) ?>">2</a>58 <a href="<?php echo str_replace('{page}', 1, $url) ?>">1</a> 59 <a href="<?php echo str_replace('{page}', 2, $url) ?>">2</a> 60 60 … 61 61 … … 64 64 <strong><?php echo $i ?></strong> 65 65 <?php else: ?> 66 <a href="<?php echo str_replace('{page}', $i, $ base_url) ?>"><?php echo $i ?></a>66 <a href="<?php echo str_replace('{page}', $i, $url) ?>"><?php echo $i ?></a> 67 67 <?php endif; ?> 68 68 <?php endfor; ?> 69 69 70 70 … 71 <a href="<?php echo str_replace('{page}', $total_pages - 1, $ base_url) ?>"><?php echo $total_pages - 1 ?></a>72 <a href="<?php echo str_replace('{page}', $total_pages, $ base_url) ?>"><?php echo $total_pages ?></a>71 <a href="<?php echo str_replace('{page}', $total_pages - 1, $url) ?>"><?php echo $total_pages - 1 ?></a> 72 <a href="<?php echo str_replace('{page}', $total_pages, $url) ?>"><?php echo $total_pages ?></a> 73 73 74 74 <?php endif; ?> … … 76 76 77 77 <?php if ($next_page): ?> 78 <a href="<?php echo str_replace('{page}', $next_page, $ base_url) ?>"><?php echo Kohana::lang('pagination.next') ?> »</a>78 <a href="<?php echo str_replace('{page}', $next_page, $url) ?>"><?php echo Kohana::lang('pagination.next') ?> »</a> 79 79 <?php else: ?> 80 80 <?php echo Kohana::lang('pagination.next') ?> » -
trunk/system/views/pagination/extended.php
r1522 r1535 10 10 11 11 <?php if ($previous_page): ?> 12 <a href="<?php echo str_replace('{page}', $previous_page, $ base_url) ?>">« <?php echo Kohana::lang('pagination.previous') ?></a>12 <a href="<?php echo str_replace('{page}', $previous_page, $url) ?>">« <?php echo Kohana::lang('pagination.previous') ?></a> 13 13 <?php else: ?> 14 14 « <?php echo Kohana::lang('pagination.previous') ?> … … 20 20 21 21 | <?php if ($next_page): ?> 22 <a href="<?php echo str_replace('{page}', $next_page, $ base_url) ?>"><?php echo Kohana::lang('pagination.next') ?> »</a>22 <a href="<?php echo str_replace('{page}', $next_page, $url) ?>"><?php echo Kohana::lang('pagination.next') ?> »</a> 23 23 <?php else: ?> 24 24 <?php echo Kohana::lang('pagination.next') ?> » -
trunk/system/views/pagination/punbb.php
r1522 r1535 12 12 13 13 <?php if ($current_page > 3): ?> 14 <a href="<?php echo str_replace('{page}', 1, $ base_url) ?>">1</a>14 <a href="<?php echo str_replace('{page}', 1, $url) ?>">1</a> 15 15 <?php if ($current_page != 4) echo '…' ?> 16 16 <?php endif; ?> … … 24 24 <strong><?php echo $i ?></strong> 25 25 <?php else: ?> 26 <a href="<?php echo str_replace('{page}', $i, $ base_url) ?>"><?php echo $i ?></a>26 <a href="<?php echo str_replace('{page}', $i, $url) ?>"><?php echo $i ?></a> 27 27 <?php endif; ?> 28 28 … … 32 32 <?php if ($current_page <= $total_pages - 3): ?> 33 33 <?php if ($current_page != $total_pages - 3) echo '…' ?> 34 <a href="<?php echo str_replace('{page}', $total_pages, $ base_url) ?>"><?php echo $total_pages ?></a>34 <a href="<?php echo str_replace('{page}', $total_pages, $url) ?>"><?php echo $total_pages ?></a> 35 35 <?php endif; ?> 36 36
