--- trunk/lib/Frey/Web.pm	2008/11/30 19:21:52	648
+++ trunk/lib/Frey/Web.pm	2008/11/30 23:49:32	653
@@ -7,7 +7,7 @@
 
 #use Continuity::Widget::DomNode;
 use Data::Dump qw/dump/;
-use Carp qw/confess cluck/;
+use Carp qw/confess cluck carp/;
 use File::Slurp;
 
 use Frey::Bookmarklet;
@@ -26,7 +26,7 @@
 	isa => 'Uri', coerce => 1,
 	required => 1,
 	default => sub {
-		cluck "undefined request_url";
+		carp "undefined request_url";
 		'/';
 	},
 );
@@ -373,11 +373,10 @@
 sub clean_status {
 	my ($self) = shift;
 	@head = ( 'static/frey.css' );
-	my $params = { request_url => $self->request_url };
 	@status = (
-		{ 'ClassBrowser' => Frey::ClassBrowser->new( %$params, usage_on_top => 0 )->as_markup },
-		{ 'Bookmarklets' => Frey::Bookmarklet->new( %$params )->as_markup },
-		{ 'INC' => Frey::INC->new( %$params )->as_markup }, 
+		{ 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
+		{ 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+		{ 'INC' => Frey::INC->new->as_markup }, 
 	);
 	$icon_html = '';
 }
@@ -472,6 +471,9 @@
 our $last_log_pos  = 0;
 our $last_log_line = 0;
 
+our $pwd = `pwd`;
+chomp $pwd;
+
 sub warnings_html {
 	my ($self,$level) = shift;
 	$level ||= $self->debug,
@@ -528,6 +530,10 @@
 			my $level = $1;
 			my $msg = $_;
 
+			# Mojo seems to expand warn messages to full path which is annoying
+			$msg =~ s{/[^/]+/\.\./}{/}gs;
+			$msg =~ s{$pwd/*}{}gs;
+
 			my $spacer = ' ';
 			my $real_msg = expand( $msg );
 			if ( length($real_msg) > $self->html_dump_width ) {