[Scoop-checkins] scoop/lib/Scoop/Comments Format.pm

[scoop at lithium.sabren.com]

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

Modified Files:
	Format.pm 
Log Message:
Bugs 71, 159, 161.

* replacing deleted comments with placeholder text (in addition to normal delete)
* updates to Bundle::Scoop to make it current
* default favicon.ico and robots.txt

-janra



Index: Format.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Comments/Format.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Format.pm	25 Jan 2005 17:15:24 -0000	1.54
--- Format.pm	27 Jan 2005 19:37:16 -0000	1.55
***************
*** 141,148 ****
  	
  	if ($S->have_perm( 'comment_delete' ) && !$posting_comment) {
! 		$action .= qq| (<A CLASS="light" HREF="%%rootdir%%/comments/$comment->{sid}/$comment->{cid}/delete">delete</A>)|;
  		my $toggle = 'toggle_normal';
  		$toggle = 'toggle_editorial' unless $comment->{pending};
! 		$action .= qq| (<A CLASS="light" HREF="%%rootdir%%/comments/$comment->{sid}/$comment->{cid}/$toggle">toggle</A>)|;
  	}
  
--- 141,164 ----
  	
  	if ($S->have_perm( 'comment_delete' ) && !$posting_comment) {
! 		my $delete = $S->{UI}->{BLOCKS}->{comment_delete_link};
! 		$delete =~ s/%%sid%%/$comment->{sid}/g;
! 		$delete =~ s/%%cid%%/$comment->{cid}/g;
! 		$action .= $delete;
! 	}
! 	if ($S->have_perm( 'comment_remove' ) && !$posting_comment) {
! 		my $remove = $S->{UI}->{BLOCKS}->{comment_remove_link};
! 		$remove =~ s/%%sid%%/$comment->{sid}/g;
! 		$remove =~ s/%%cid%%/$comment->{cid}/g;
! 		$action .= $remove;
! 	}
! 	if ($S->have_perm( 'comment_toggle' ) && !$posting_comment) {
  		my $toggle = 'toggle_normal';
  		$toggle = 'toggle_editorial' unless $comment->{pending};
! 		my $t_link = $S->{UI}->{BLOCKS}->{comment_toggle_link};
! 		$t_link =~ s/%%sid%%/$comment->{sid}/g;
! 		$t_link =~ s/%%cid%%/$comment->{cid}/g;
! 		$t_link =~ s/%%toggle%%/$toggle/g;
! 
! 		$action .= $t_link;
  	}