Update of /cvs/scoop/scoop/lib/Scoop/Stories
In directory lithium.sabren.com:/tmp/cvs-serv19656/lib/Scoop/Stories

Modified Files:
	Elements.pm 
Log Message:
janra's bug fix for Bug 171 -- hulver


Index: Elements.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Stories/Elements.pm,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** Elements.pm	11 May 2005 22:44:10 -0000	1.122
--- Elements.pm	26 May 2005 09:37:16 -0000	1.123
***************
*** 999,1035 ****
  	$sth->finish;
  	
! 	my $nav = qq|
! 		<TABLE WIDTH="100%" BORDER=0 CELLPADDING=0 CELLSPACING=0>
! 		<TR BGCOLOR="%%story_nav_bg%%">
! 			<TD WIDTH="100%" ALIGN="center">
! 			%%smallfont%%|;
  			
  	if ($last) {
- 		$nav .= qq|
- 			<B>&lt;</B> <A HREF="%%rootdir%%/story/$last->{sid}">$last->{title}</A>|;
- 
  		unless( $S->have_section_perm( 'hide_read_comments',$S->_get_story_section($last->{sid}) ) ) {
! 			$nav .= qq| ($last->{commentcount} comments)|; 
  		}
  	}
  	if ($last && $next) {
! 		$nav .= ' | ';
  	}
- 	if ($next) {
- 		$nav .= qq|
- 			<A HREF="%%rootdir%%/story/$next->{sid}">$next->{title}</A>|;
  
  		unless( $S->have_section_perm( 'hide_read_comments',$S->_get_story_section($next->{sid}) ) ) {
!  			$nav .= qq| ($next->{commentcount} comments)|;
  		}
! 		$nav .= q| <B>&gt;</B>|; 
  	}
! 	$nav .= qq|
! 		%%smallfont_end%%</TD></TR></TABLE>|;
! 	
! 	return $nav;
  }
  
! #"
  
  sub recent_topics {
--- 999,1029 ----
  	$sth->finish;
  	
! 	my $nav = $S->{UI}->{BLOCKS}->{navbar};
! 	my $navkeys;
  			
  	if ($last) {
  		unless( $S->have_section_perm( 'hide_read_comments',$S->_get_story_section($last->{sid}) ) ) {
! 			$last->{comments} = $S->{UI}->{BLOCKS}->{navbar_comments};
! 			$last->{comments} = s/%%num%%/$last->{commentcount}/g;
  		}
+ 		$navkeys->{'last'} = $S->interpolate($S->{UI}->{BLOCKS}->{navbar_last},$last);
  	}
+ 
  	if ($last && $next) {
! 		$navkeys->{sep} = $S->{UI}->{BLOCKS}->{navbar_sep};
  	}
  
+ 	if ($next) {
  		unless( $S->have_section_perm( 'hide_read_comments',$S->_get_story_section($next->{sid}) ) ) {
! 			$next->{comments} = $S->{UI}->{BLOCKS}->{navbar_comments};
! 			$next->{comments} = s/%%num%%/$next->{commentcount}/g;
  		}
! 		$navkeys->{'next'} = $S->interpolate($S->{UI}->{BLOCKS}->{navbar_next},$next);
  	}
! 
! 	return $S->interpolate($nav,$navkeys);
  }
  
! 
  
  sub recent_topics {