--- trunk/lib/Frey/Web.pm	2008/11/28 00:42:35	578
+++ trunk/lib/Frey/Web.pm	2008/11/28 13:16:47	581
@@ -79,6 +79,7 @@
 	$dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;
 	$dump = $self->html_escape( $dump );
 	$dump =~ s{\Q...\E}{…}gs;
+#	$dump =~ $self->editor_links( $dump ); # FIXME include this
 	return "<code>$dump</code>";
 }
 
@@ -94,6 +95,8 @@
 
 	$content = qq|<span>$content</span>| unless $content =~ m{^\s*<(span|a|code).+?/\1>\s*};
 
+	$content =~ s{<span>(<code>[^<]+</code>)</span>}{$1} && $self->TODO("code wrapped in span");
+
 	warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug;
 
 	if ( $name =~ m{::} && $name !~ $re_html ) {
@@ -166,7 +169,7 @@
 	my ( $package, $path, $line ) = caller;
 	$self->add_head( qq|
 	<style type="text/css">
-	/* via package $package at $path line $line */
+	/* via $package at $path line $line */
 	$css
 	</style>
 	| );
@@ -200,10 +203,6 @@
 
 	my $status_line = '';
 
-	unshift @status, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup };
-#	unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup };
-	unshift @status, { 'INC' => Frey::INC->new->as_markup };
-
 	foreach my $part ( @status ) {
 		foreach my $name ( keys %$part ) {
 			$status_line .= $self->popup( $name, $part->{$name} );
@@ -303,7 +302,7 @@
 	$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
 		{at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;
 
-	$error =~ s{(via package ")([\w:]+)(")}
+	$error =~ s{(via (?:package) "?)([\w:]+)("?)}
 		{$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;
 
 	return $error;
@@ -328,7 +327,7 @@
 
 =head2 add_status
 
-  $self->add_status( name => { some => 'data' } );
+  $self->add_status( { name => { some => 'data' } } );
 
   $self->add_status( "append to last status popup" );
 
@@ -336,10 +335,15 @@
 
 sub add_status {
 	my ( $self, $data ) = @_;
+	push @status, { 'X' => [ $self->backtrace ] };
 	if ( ref($data) ) {
 		push @status, $data;
 	} else {
-		$status[ $#status ]->{added} = $data;
+		if ( defined $status[ $#status ] ) {
+			$status[ $#status ]->{ '+' } = $data;
+		} else {
+			push @status, { '+' => $data };
+		}
 	}
 }
 
@@ -354,7 +358,11 @@
 sub clean_status {
 	my ($self) = shift;
 	@head = ( 'static/frey.css' );
-	@status = ();
+	@status = (
+		{ 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
+		{ 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+		{ 'INC' => Frey::INC->new->as_markup },
+	);
 	$icon_html = '';
 }
 
@@ -523,7 +531,7 @@
 		) = caller($_) or last;
 
 		push @backtrace,
-			qq|via package $package at $path line $line|;
+			qq|via $package at $path line $line|;
 	}
 	warn "# backtrace: ", dump( @backtrace ) if @backtrace;
 	return @backtrace;