--- trunk/lib/Frey/Web.pm 2008/11/19 19:11:52 465
+++ trunk/lib/Frey/Web.pm 2008/11/20 11:56:41 473
@@ -24,8 +24,8 @@
isa => 'ArrayRef[HashRef[Str]]',
lazy => 1,
default => sub { [
- { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
{ 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
] },
);
@@ -180,6 +180,19 @@
$body = '';
}
+ $status_line
+ .= qq||
+ if $self->warnings;
+
+ my $right =
+ qq|
+
+ $url
+
+ |;
+
my $html = join("\n",
qq||,
$self->_head_html,
@@ -191,8 +204,8 @@
$body
Frey $Frey::VERSION
-
$url
$status_line
+ $right
|,
@@ -203,6 +216,18 @@
return $html;
}
+sub editor_links {
+ my ( $self, $error ) = @_;
+
+ $error =~ s{at\s+(\S+)\s+line\s+(\d+)}
+ {at $1 line $2}gsm;
+
+ $error =~ s{(via package ")([\w:]+)(")}
+ {$1$2$3}gsm;
+
+ return $error;
+}
+
sub error {
my $self = shift;
my $error = join(" ", @_);
@@ -211,12 +236,11 @@
$error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
warn "ERROR: $error\n";
- $error =~ s{at\s+(\S+)\s+line\s+(\d+)}
- {at $1 line $2}gsm;
- $error =~ s{(via package ")([\w:]+)(")}
- {$1$2$3}gsm;
-
- return qq|$error
|;
+ return
+ qq||
+ . $self->editor_links( $error ) .
+ qq|
|
+ ;
}
1;