--- trunk/lib/Frey/Web.pm 2008/11/26 16:33:58 536 +++ trunk/lib/Frey/Web.pm 2008/11/26 16:34:25 537 @@ -159,6 +159,21 @@ our $icon_html; +sub popup { + my ( $self, $name, $content, $full ) = @_; + + if ( ref($content) ) { + $content = '' . dump($content) . ''; + my $l = length($content); + $content = qq|$l bytes| if ! $full && $l > $self->dump_max_bytes; + } else { + $content = qq|$content|; + } + + warn "## popup [$name] = ", length( $content ), " bytes" if $self->debug; + return qq|$name $content\n|; +} + sub page { my $self = shift; my $a = {@_}; @@ -170,20 +185,11 @@ my $status_line = ''; unshift @status, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }; - unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }; +# unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }; foreach my $part ( @status ) { foreach my $name ( keys %$part ) { - my $content = $part->{$name}; - if ( ref($content) ) { - $content = '' . dump($content) . ''; - my $l = length($content); - $content = qq|$l bytes| if $l > $self->dump_max_bytes; - } else { - $content = qq|$content|; - } - warn "### part [$name] = ", length( $content ), " bytes" if $self->debug; - $status_line .= qq|$name $content\n|; + $status_line .= $self->popup( $name, $part->{$name} ); } } @@ -202,6 +208,8 @@ $status_line .= $self->warnings_html; + $status_line .= $self->popup( INC => { %INC }, 1 ); + my ($exit,$description) = ('exit','stop server'); ($exit,$description) = ('restart','restart server') if $ENV{FREY_RESTART}; # tune labels on exit link @@ -403,17 +411,17 @@ if ( $multiline_end ) { if ( m{^\Q$multiline_end\E} || m{^\s.+\Q$multiline_end\E;$} ) { - warn "## $line end of $multiline_end in '$_'\n"; +# warn "## $line end of $multiline_end in '$_'\n"; undef $multiline_end; } else { - warn "## $line skipped\n"; +# warn "## $line skipped\n"; } } elsif ( m{^(#*)\s+} ) { my $l = $1 ? length($1) : 0; if ( $l > $level ) { undef $multiline_end; $multiline_end = $multiline_markers->{$1} if m{($multiline_re)$}; - warn "## $line start $1 .. $multiline_end level $l > $level for '$_'\n" if $multiline_end; +# warn "## $line start $1 .. $multiline_end level $l > $level for '$_'\n" if $multiline_end; next; }