+
reload
$exit
@@ -280,10 +316,24 @@
$self->add_icon unless $icon_html;
+ my $title = undef
+ || $a->{title}
+ || $self->title
+ || ref($self)
+ ;
+
+# $title =~ s{(\w)\w+::}{$1:}g; # XXX compress names of classes
+
+ $self->add_css(qq|
+ body {
+ padding-bottom: 3em; /* don't overlap status line */
+ }
+ |);
+
my $html = join("\n",
qq||,
$self->_head_html,
- '' . ( $self->title || $a->{title} || ref($self) ) . '',
+ qq|$title|,
'',
( $icon_html || '' ),
( $a->{head} || '' ),
@@ -365,6 +415,13 @@
return $error;
}
+sub html_self {
+ my $self = shift;
+ my $html = $self;
+ $html =~ s{([\w:]+)=}{$1=}gsm;
+ return $html;
+}
+
=head2 error
This method will return error to browser and backtrace unless
@@ -377,20 +434,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||
- . $self->html_links( $error ) .
- qq|
|
- ;
+ $self->add_icon('error');
+ $error = $self->html_links( $error );
+ return qq|$error $backtrace
| ;
}
=head1 Status line
@@ -405,8 +464,8 @@
sub add_status {
my ( $self, $data ) = @_;
- push @status, { 'X' => [ $self->backtrace ] };
- if ( ref($data) ) {
+ die "no data" unless $data;
+ if ( ref $data ) {
push @status, $data;
} else {
if ( defined $status[ $#status ] ) {
@@ -466,7 +525,6 @@
sub icon_path {
my ($self,$class,$variant) = @_;
-# $class ||= $self->title;
sub icon_exists {
my $class = shift;
@@ -497,8 +555,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||;
@@ -669,7 +728,7 @@
my ($self) = @_;
my @backtrace;
- foreach ( 0 .. 5 ) {
+ foreach ( 1 .. 5 ) { # 0 = backtrace
my (
$package,$path,$line
# subroutine hasargs