Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed span class from paginator class.

This commit is contained in:
Taylor Otwell 2011-07-22 11:18:27 -07:00
parent c3d36d37bc
commit 1c5187b509
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
system/paginator.php
View File

@ -48,12 +48,10 @@ class Paginator {
public function __construct($results, $total, $per_page)
{
$this->page = static::page($total, $per_page);
$this->last_page = ceil($total / $per_page);
$this->per_page = $per_page;
$this->results = $results;
$this->total = $total;
$this->last_page = ceil($total / $per_page);
}
/**
@ -93,14 +91,13 @@ public function links($adjacent = 3)
*
* If there are not enough pages to make it worth sliding, all of the pages will be listed.
*
* Note: "7" is added to the adjacent range to account for the seven constant elements in a
* slider: the first and last two links, the current page, and the two "..." strings.
*
* @param int $adjacent
* @return string
*/
private function numbers($adjacent = 3)
{
// "7" is added to the adjacent range to account for the seven constant elements
// in a slider: the first and last two links, the current page, and the two "..." strings.
return ($this->last_page < 7 + ($adjacent * 2)) ? $this->range(1, $this->last_page) : $this->slider($adjacent);
}
@ -120,10 +117,8 @@ private function slider($adjacent)
{
return $this->beginning().$this->range($this->last_page - 2 - ($adjacent * 2), $this->last_page);
}
else
{
return $this->beginning().$this->range($this->page - $adjacent, $this->page + $adjacent).$this->ending();
}
return $this->beginning().$this->range($this->page - $adjacent, $this->page + $adjacent).$this->ending();
}
/**
@ -140,7 +135,7 @@ public function previous()
return HTML::link(Request::uri().'?page='.($this->page - 1), $text, array('class' => 'prev_page')).' ';
}
return HTML::span($text, array('class' => 'disabled prev_page')).' ';
return "<span class=\"disabled prev_page\">$text</span> ";
}
/**
@ -157,7 +152,7 @@ public function next()
return HTML::link(Request::uri().'?page='.($this->page + 1), $text, array('class' => 'next_page'));
}
return HTML::span($text, array('class' => 'disabled next_page'));
return "<span class=\"disabled next_page\">$text</span>";
}
/**
@ -167,7 +162,7 @@ public function next()
*/
private function beginning()
{
return $this->range(1, 2).'<span class="dots">...</span>';
return $this->range(1, 2).'<span class="dots">...</span> ';
}
/**
@ -177,7 +172,7 @@ private function beginning()
*/
private function ending()
{
return '<span class="dots">...</span>'.$this->range($this->last_page - 1, $this->last_page);
return '<span class="dots">...</span> '.$this->range($this->last_page - 1, $this->last_page);
}
/**
@ -195,7 +190,7 @@ private function range($start, $end)
for ($i = $start; $i <= $end; $i++)
{
$pages .= ($this->page == $i) ? HTML::span($i, array('class' => 'current')).' ' : HTML::link(Request::uri().'?page='.$i, $i).' ';
$pages .= ($this->page == $i) ? "<span class=\"current\">$i</span> " : HTML::link(Request::uri().'?page='.$i, $i).' ';
}
return $pages;