phpvortex-commit

[Thiago R. <nop...@us...>]

Update of /cvsroot/phpvortex/phpvortex
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25267

Modified Files:
	SEC_ListNavigator.class.php 
Log Message:
Fixed some bugs and added lots of features to SEC_ListNavigator

Index: SEC_ListNavigator.class.php
===================================================================
RCS file: /cvsroot/phpvortex/phpvortex/SEC_ListNavigator.class.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SEC_ListNavigator.class.php	6 Oct 2004 20:57:15 -0000	1.1
--- SEC_ListNavigator.class.php	7 Oct 2004 18:35:23 -0000	1.2
***************
*** 50,53 ****
--- 50,95 ----
  
  	/**
+ 	 * Output formatting: Go to first.
+ 	 *
+ 	 * @var string
+ 	 */
+ 	var $first = '<<';
+ 
+ 	/**
+ 	 * Output formatting: Go to previous.
+ 	 *
+ 	 * @var string
+ 	 */
+ 	var $previous = '<';
+ 
+ 	/**
+ 	 * Output formatting: Go to next.
+ 	 *
+ 	 * @var string
+ 	 */
+ 	var $next = '>';
+ 
+ 	/**
+ 	 * Output formatting: Go to last.
+ 	 *
+ 	 * @var string
+ 	 */
+ 	var $last = '>>';
+ 
+ 	/**
+ 	 * Output formatting: show $range pages before and after this one.
+ 	 *
+ 	 * @var int
+ 	 */
+ 	var $range = 3;
+ 
+ 	/**
+ 	 * Output formatting: show all pages if $pages <= $range_all.
+ 	 *
+ 	 * @var int
+ 	 */
+ 	var $range_all = 5;
+ 
+ 	/**
  	 * Outputs the section to the client.
  	 *
***************
*** 57,81 ****
  	{
  		echo "<div class='div_navi'>\n";
! 		$start = max(0, $this->page - 3);
! 		$end = min($this->pages, $this->page + 3);
  		if ($this->page > 0) {
  			$this->url->parameters[$this->key] = 0;
! 			echo "<a href='".$this->url->Get()."'>&lt;&lt;</a>";
  			$this->url->parameters[$this->key] = $this->page - 1;
! 			echo "&nbsp;<a href='".$this->url->Get()."'>&lt;</a>&nbsp;";
  		} else {
! 			echo '&lt;&lt;&nbsp;&lt;&nbsp;';
  		}
  		for ($i = $start; $i <= $end; $i++) {
  			$this->url->parameters[$this->key] = $i;
! 			echo "&nbsp;<a href='".$this->url->Get()."'>$i</a>";
  		}
  		if ($this->page < $this->pages - 1) {
  			$this->url->parameters[$this->key] = $this->page + 1;
! 			echo "&nbsp;<a href='".$this->url->Get()."'>&gt;</a>";
  			$this->url->parameters[$this->key] = $this->pages - 1;
! 			echo "&nbsp;<a href='".$this->url->Get()."'>&gt;&gt;</a><br>\n";
  		} else {
! 			echo "&nbsp;&gt;&nbsp;&gt;&gt;<br>\n";
  		}
  		parent::Show();
--- 99,133 ----
  	{
  		echo "<div class='div_navi'>\n";
! 		$start = max(0, $this->page - $this->range);
! 		$end = min($this->pages - 1, $this->page + $this->range);
! 		if ($this->pages <= $this->range_all) {
! 			$start = 0;
! 			$end = $this->pages - 1;
! 		}
  		if ($this->page > 0) {
  			$this->url->parameters[$this->key] = 0;
! 			echo "<a href='".$this->url->Get()."'>{$this->first}</a>";
  			$this->url->parameters[$this->key] = $this->page - 1;
! 			echo "&nbsp;<a href='".$this->url->Get()."'>{$this->previous}</a>";
  		} else {
! 			echo "{$this->first}&nbsp;{$this->previous}";
  		}
+ 		if ($start > 0) echo "&nbsp;...";
  		for ($i = $start; $i <= $end; $i++) {
  			$this->url->parameters[$this->key] = $i;
! 			if ($i != $this->page) {
! 				echo "&nbsp;<a href='".$this->url->Get()."'>".($i+1)."</a>";
! 			} else {
! 				echo "&nbsp;".($i+1);
! 			}
  		}
+ 		if ($end < $this->pages - 1) echo "&nbsp;...";
  		if ($this->page < $this->pages - 1) {
  			$this->url->parameters[$this->key] = $this->page + 1;
! 			echo "&nbsp;<a href='".$this->url->Get()."'>{$this->next}</a>";
  			$this->url->parameters[$this->key] = $this->pages - 1;
! 			echo "&nbsp;<a href='".$this->url->Get()."'>{$this->last}</a><br>\n";
  		} else {
! 			echo "&nbsp;{$this->next}&nbsp;{$this->last}<br>\n";
  		}
  		parent::Show();