--- trunk/lib/Frey/Web.pm	2008/12/12 18:01:02	819
+++ trunk/lib/Frey/Web.pm	2008/12/14 15:13:55	837
@@ -246,10 +246,7 @@
 	if ( ! $body ) {
 		my $run = $a->{run} || 'as_markup';
 		warn "# no body, invoke $self->$run on ", ref($self);
-		eval {
-			$body = $self->$run;
-		};
-		$body = $self->error( $@, '' ) if $@;
+		$body = $self->$run;
 	}
 	if ( $self->content_type !~ m{html} ) {
 		warn "# return only $self body ", $self->content_type;
@@ -365,6 +362,13 @@
 	return $error;
 }
 
+sub html_self {
+	my $self = shift;
+	my $html = $self;
+	$html =~ s{([\w:]+)=}{<a target="$1" href="/$1" title="introspect $1">$1</a>=}gsm;
+	return $html;
+}
+
 =head2 error
 
 This method will return error to browser and backtrace unless
@@ -377,20 +381,22 @@
 	my $error = join(" ", @_);
 
 	my $fatal = '';
+	my $backtrace = '';
 
 	if ( $error !~ m{\n$} ) {
 		if ( my @backtrace = $self->backtrace ) {
-			$error .= "\n\t" . join( "\n\t", @backtrace );
+			$backtrace =
+				  "\n" . $self->html_self . "->error backtrace\n\t"
+				. $self->html_links( join( "\n\t", @backtrace ) )
+				;
 			$fatal = qq| frey-fatal|;
 		}
 	}
 
 	warn "ERROR: $error\n";
-	return
-		qq|<pre class="frey-error$fatal">|
-		. $self->html_links( $error ) .
-		qq|</pre>|
-		;
+	$self->add_icon('error');
+	$error = $self->html_links( $error );
+	return qq|<pre class="frey-error$fatal">$error $backtrace</pre>| ;
 }
 
 =head1 Status line
@@ -466,7 +472,6 @@
 
 sub icon_path {
 	my ($self,$class,$variant) = @_;
-#	$class ||= $self->title;
 
 	sub icon_exists {
 		my $class = shift;
@@ -497,8 +502,9 @@
 sub add_icon {
 	my ($self,$variant) = @_;
 
-	my $class = ref($self);
-	$class = $self->class if $self->can('class');
+	my $class = $self->class if $self->can('class');
+	#$class ||= $self->title;
+	$class ||= ref($self);
 	my $icon_path = $self->icon_path( $class, $variant ) || return;
 
 	$icon_html .= qq|<link rel="icon" type="image/png" href="/$icon_path">|;
@@ -669,7 +675,7 @@
 	my ($self) = @_;
 
 	my @backtrace;
-	foreach ( 0 .. 5 ) {
+	foreach ( 1 .. 5 ) { # 0 = backtrace
 		my (
 			$package,$path,$line
 			# subroutine hasargs