--- trunk/lib/Frey/Web.pm	2008/11/27 22:09:59	568
+++ trunk/lib/Frey/Web.pm	2008/11/28 13:25:17	584
@@ -16,11 +16,8 @@
 
 use Frey::SVK;
 
-has 'head' => (
-	is => 'rw',
-	isa => 'ArrayRef[Str]',
-	default => sub { [ 'static/frey.css' ] },
-);
+our @head;
+sub head { @head }
 
 has 'request_url' => (
 	is => 'rw',
@@ -83,6 +80,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>";
 }
 
@@ -98,6 +96,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 ) {
@@ -115,7 +115,7 @@
 sub _head_html {
 	my $self = shift;
 	my $out = '';
-	foreach my $path ( @{ $self->head } ) {
+	foreach my $path ( @head ) {
 		$path =~ s!^/!!;
 		if ( $path =~ m/\.js$/ ) {
 			$out .= $self->_inline_path( $path ) ?
@@ -151,10 +151,10 @@
 	$path =~ s!^/!!;
 
 	if ( $path =~ $re_html ) {
-		push @{ $self->head }, $path;
+		push @head, $path;
 	} elsif ( -e $path ) {
 		if ( $path =~ m/\.(?:js|css)$/ ) {
-			push @{ $self->head }, $path;
+			push @head, $path;
 		} else {
 			confess "can't add_head( $path ) it's not js or css";
 		}
@@ -165,6 +165,17 @@
 
 }
 
+sub add_css {
+	my ($self,$css) = @_;
+	my ( $package, $path, $line ) = caller;
+	$self->add_head( qq|
+	<style type="text/css">
+	/* via $package at $path line $line */
+	$css
+	</style>
+	| );
+}
+
 our $reload_counter = 0;
 
 
@@ -193,10 +204,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} );
@@ -230,8 +237,9 @@
 			</span>
 		|;
 
-	my $info = Frey::SVK->info;
-	my $revision = Frey::SVK->info->{Revision} || '';
+	my $svk = Frey::SVK->new;
+	my $info = $svk->info;
+	my $revision = $svk->info->{Revision} || '';
 	$revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
 
 	$self->add_icon unless $icon_html;
@@ -295,7 +303,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;
@@ -316,16 +324,57 @@
 		;
 }
 
+=head1 Status line
+
+=head2 add_status
+
+  $self->add_status( { name => { some => 'data' } } );
+
+  $self->add_status( "append to last status popup" );
+
+=cut
+
 sub add_status {
 	my ( $self, $data ) = @_;
-	push @status, $data;
+	push @status, { 'X' => [ $self->backtrace ] };
+	if ( ref($data) ) {
+		push @status, $data;
+	} else {
+		if ( defined $status[ $#status ] ) {
+			$status[ $#status ]->{ '+' } = $data;
+		} else {
+			push @status, { '+' => $data };
+		}
+	}
 }
 
+=head2 clean_status
+
+Called at beginning of each request
+
+  $self->clean_status;
+
+=cut
+
 sub clean_status {
-	@status = ();
+	my ($self) = shift;
+	@head = ( 'static/frey.css' );
+	@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 = '';
 }
 
+=head2 status_parts
+
+Dump all status line parts
+
+  $self->status_parts
+
+=cut
+
 sub status_parts {
 	warn "## status parts ", dump( map { keys %$_ } @status );
 }
@@ -353,7 +402,7 @@
 	$icon .= "/$variant" if $variant;
 	my $path = 'static/icons/' . $icon . '.png';
 	if ( -e $path ) {
-		warn "# $class from $self icon_path $path";
+		warn "# $class from $self icon_path $path" if $self->debug;
 		return $path;
 	} else {
 		$self->TODO( "add $path icon for $class" );
@@ -483,7 +532,7 @@
 		) = caller($_) or last;
 
 		push @backtrace,
-			qq|via $package from $path <a target="editor" href="/editor+$path+$line">$path</a>|;
+			qq|via $package at $path line $line|;
 	}
 	warn "# backtrace: ", dump( @backtrace ) if @backtrace;
 	return @backtrace;