Commit info for scoop/lib/Scoop/Stories:
Modified Files:
List.pm Views.pm
Log Message:
Checking in code from bugs 21 (from janra), 53 (also from janra), and 55. This
means various subscriptions and payment fixes, a hotlist fix, some HTML removed
from the code, new block descriptions, some other tweaks. Also, janra's new
default db is going in, with a CSS-ified layout.
-keith
Index: List.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Stories/List.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -r1.5 -r1.6
304c304
< <TD valign="top">%%title_font<B>Score</B>title_font_end%%</TD>
---
> <TD align="center" valign="top">%%title_font%%<B>Score</B>%%title_font_end%%</TD>
360c360
< <TD valign="top">%%norm_font%%$edit_link%%norm_font_end%%</TD>
---
> <TD align="right" valign="top">%%norm_font%%$edit_link%%norm_font_end%%</TD>
Index: Views.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Stories/Views.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -r1.64 -r1.65
64,79c64,68
< #####
< # HTML IN CODE
< #####
< my $change_page;
< if ($S->{UI}->{BLOCKS}->{next_previous_links}) {
< $change_page = $S->{UI}->{BLOCKS}->{next_previous_links};
< $change_page =~ s~%%PREVIOUS_LINK%%~%%rootdir%%/$pre_link/$pp~g if $pp >= 1;
< $change_page =~ s~%%NEXT_LINK%%~%%rootdir%%/$pre_link/$np~g if @{$stories} && (@{$stories} == $S->{UI}->{VARS}->{maxstories});
< } else {
< $change_page = qq|
< <table border="0" cellspacing="0" cellpadding="0" width="100%">
< <tr><td>|;
< $change_page .= qq|<A CLASS="light" HREF="%%rootdir%%/$pre_link/$pp">%%prev_page_link%%</A>| if $pp >= 1;
< $change_page .= qq|</td><td align="right">|;
< $change_page .= qq|<A CLASS="light" HREF="%%rootdir%%/$pre_link/$np">%%next_page_link%%</A>| if @{$stories} && (@{$stories} == $S->{UI}->{VARS}->{maxstories});
< $change_page .= qq|</td></tr></table>\n|;
---
> my $change_page = $S->{UI}->{BLOCKS}->{next_previous_links};
> my ($prev_page, $next_page);
> if ($pp >= 1) {
> $prev_page = $S->{UI}->{BLOCKS}->{prev_page_link};
> $prev_page =~ s/%%LINK%%/%%rootdir%%\/$pre_link\/$pp/g;
81c70,76
<
---
> if (@{$stories} && @{$stories} == $S->{UI}->{VARS}->{maxstories}) {
> $next_page = $S->{UI}->{BLOCKS}->{next_page_link};
> $next_page =~ s/%%LINK%%/%%rootdir%%\/$pre_link\/$np/g;
> }
> $change_page =~ s/%%PREVIOUS_LINK%%/$prev_page/g;
> $change_page =~ s/%%NEXT_LINK%%/$next_page/g;
>