--- trunk/lib/Frey/Web.pm	2008/12/11 21:36:04	816
+++ trunk/lib/Frey/Web.pm	2008/12/14 22:15:51	838
@@ -174,37 +174,40 @@
 
 }
 
-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>
-	| );
-}
+sub _add_something {
+	my ( $self, $regex, $tag, $type, $content ) = @_;
 
-sub add_js {
-	my ($self,$js) = @_;
-	my ( $package, $path, $line ) = caller;
+	my ( $package, $path, $line ) = caller(1);
+
+	warn "# $regex $tag $type $content caller $package $path $line";
 
-	if ( $js =~ m{http.*\.js} ) {
-		$self->add_head( qq|
-			<script type="text/javascript" src="$js">
+	if ( $content =~ $regex ) {
+		$content = "/$content" if -e $content;
+		$self->add_head( strip ( qq|
+			<$tag type="$type"  src="$content">
 			/* via $package at $path line $line */
-			</script>
-		|);
+			</$tag>
+		| ) );
 	} else {
-		$self->add_head( qq|
-			<script type="text/javascript">
+		$self->add_head(qq|
+			<$tag type="$type">
 			/* via $package at $path line $line */
-			$js
-			</script>
-		| );
+			$content
+			</$tag>
+		|);
 	};
 }
 
+sub add_css {
+	my ($self,$css) = @_;
+	$self->_add_something( qr{\.css$}, qw{style text/css}, $css );
+}
+
+sub add_js {
+	my ($self,$js) = @_;
+	$self->_add_something( qr{\.js$}, qw{script text/javascript}, $js );
+}
+
 our $reload_counter = 0;
 
 
@@ -246,10 +249,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 +365,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 +384,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 +475,6 @@
 
 sub icon_path {
 	my ($self,$class,$variant) = @_;
-#	$class ||= $self->title;
 
 	sub icon_exists {
 		my $class = shift;
@@ -478,25 +486,28 @@
 	}
 
 	my $path = icon_exists( $class );
-
-	while ( $class =~ s{::[^:]+$}{} && ! $path ) {
-		$path = icon_exists( $class ) unless $class eq 'Frey'; # don't default on Frey icon
+	if ( ! $path ) {
+		my $super_class = $class;
+		while ( $super_class =~ s{::[^:]+$}{} && ! $path ) {
+			$path = icon_exists( $super_class ) unless $super_class eq 'Frey'; # don't default on Frey icon
+		}
 	}
 
-	if ( -e $path ) {
-		warn "# $class from $self icon_path $path" if $self->debug;
-		return $path;
-	} else {
-		$self->TODO( "add $path icon for $class $variant" );
+	if ( ! $path ) {
+		$self->TODO( "add icon for $class" . ( $variant ? " variant $variant" : '' ) );
 		return undef;
 	}
+
+	warn "# $class from $self icon_path $path" if $self->debug;
+	return $path;
 }
 
 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">|;
@@ -667,7 +678,7 @@
 	my ($self) = @_;
 
 	my @backtrace;
-	foreach ( 0 .. 5 ) {
+	foreach ( 1 .. 5 ) { # 0 = backtrace
 		my (
 			$package,$path,$line
 			# subroutine hasargs