[Slimp3-checkins] CVS: slimp3/server/lib/SliMP3 Pages.pm,1.3,1.4

[Robert M. II <gr...@us...>]

Update of /cvsroot/slimp3/slimp3/server/lib/SliMP3
In directory usw-pr-cvs1:/tmp/cvs-serv26378

Modified Files:
	Pages.pm 
Log Message:

Added templatability to pagebar lists, alpha and numeric.


Index: Pages.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/Pages.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Pages.pm	26 Jul 2002 01:00:42 -0000	1.3
--- Pages.pm	31 Jul 2002 03:03:49 -0000	1.4
***************
*** 282,286 ****
  
  	$$main_form_ref{'playlist'} = "";
- 
  	if ($songcount > 0) {
  		my $item;
--- 282,285 ----
***************
*** 292,303 ****
  								\$$main_form_ref{'playlist_header'},
  								\$$main_form_ref{'playlist_pagebar'});
- 		my $i = $start;
  		my $offset = $start % 2 ? 0 : 1;
  		for( $item = $start; $item < $end + 1; $item++) {
  			%list_form = ();
  			$list_form{'myClientState'} = $client;
! 			$list_form{'num'}=$i;
! 			$list_form{'odd'} = ($i + $offset) % 2;
! 			if ($i == SliMP3::Playlist::currentSongIndex($client)) {
  				$list_form{'currentsong'} = "current";
  			} else {
--- 291,301 ----
  								\$$main_form_ref{'playlist_header'},
  								\$$main_form_ref{'playlist_pagebar'});
  		my $offset = $start % 2 ? 0 : 1;
  		for( $item = $start; $item < $end + 1; $item++) {
  			%list_form = ();
  			$list_form{'myClientState'} = $client;
! 			$list_form{'num'}=$item;
! 			$list_form{'odd'} = ($item + $offset) % 2;
! 			if ($item == SliMP3::Playlist::currentSongIndex($client)) {
  				$list_form{'currentsong'} = "current";
  			} else {
***************
*** 311,315 ****
  			$list_form{'start'}		= $$main_form_ref{'start'};
  			$$main_form_ref{'playlist'} .= &SliMP3::HTTP::filltemplatefile("status_list.html", \%list_form);
- 			$i++;
  		}
  	}
--- 309,312 ----
***************
*** 745,757 ****
  
  		for (my $j = $pagebarstart;$j < $pagebarend;$j++) {
! 			if ($j == $curpage) {
! 				$pagebar{'pageslist'} .= "<b>" . ($j + 1) . "</b> ";
! 				$pagebar{'indexlist'} .= "<b>" . ($j * $count + 1) . "</b> ";
! 			} else {
! 				$pagebar{'pageslist'} .= '<a href="?' . $pagebar{'otherparams'}
! 					. 'start=' . ($j * $count) . "\">" . ($j + 1) . "</a> ";
! 				$pagebar{'indexlist'} .= "<a href=\"?" . $pagebar{'otherparams'}
! 					. 'start=' . ($j * $count) . "\">" . ($j * $count + 1) . "</a> ";
! 			}
  		}
  		$$pagebarref = SliMP3::HTTP::filltemplatefile("pagebar.html", \%pagebar);
--- 742,751 ----
  
  		for (my $j = $pagebarstart;$j < $pagebarend;$j++) {
! 			$pagebar{'pageslist'} .= SliMP3::HTTP::filltemplatefile('pagebarlist.html'
! 							,{'currpage' => ($j == $curpage)
! 							,'itemnum0' => ($j * $count)
! 							,'itemnum1' => (($j * $count) + 1)
! 							,'pagenum' => ($j + 1)
! 							,'otherparams' => $otherparams});
  		}
  		$$pagebarref = SliMP3::HTTP::filltemplatefile("pagebar.html", \%pagebar);
***************
*** 808,817 ****
  					$lastLetterIndex = $j;
  				}
! 				
! 				if ($lastLetterIndex == $start) {
! 					$pageslist .= "<b><a href=\"#$curLetter\">$curLetter</a></b> ";
! 				} else {
! 					$pageslist .= '<a href="?' . $otherparams . 'start=' . $lastLetterIndex . '#' . $curLetter . '">' . $curLetter . '</a> ';				
! 				}
  				
  				$lastLetter = $curLetter;
--- 802,812 ----
  					$lastLetterIndex = $j;
  				}
! 				$pageslist .= SliMP3::HTTP::filltemplatefile('alphapagebarlist.html'
! 								,{'currpage' => ($lastLetterIndex == $start)
! 								,'itemnum0' => $lastLetterIndex
! 								,'itemnum1' => ($lastLetterIndex + 1)
! 								,'pagenum' => $curLetter
! 								,'fragment' => ("#" . $curLetter)
! 								,'otherparams' => $otherparams});
  				
  				$lastLetter = $curLetter;