--- trunk/lib/Frey/Web.pm 2008/11/19 19:59:52 468 +++ trunk/lib/Frey/Web.pm 2008/11/20 15:23:13 482 @@ -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 }, ] }, ); @@ -49,6 +49,14 @@ is => 'rw', isa => 'Str', default => 'text/html', + documentation => 'Content-type header', +); + +has 'dump_max_bytes' => ( + is => 'rw', + isa => 'Int', + default => 4096, + documentation => 'Maximum dump size sent to browser before truncation', ); =head2 inline_smaller_than @@ -158,7 +166,7 @@ if ( ref($content) ) { $content = '' . dump($content) . ''; my $l = length($content); - $content = qq|$l bytes| if $l > 1024; + $content = qq|$l bytes| if $l > $self->dump_max_bytes; } else { $content = qq|$content|; } @@ -180,12 +188,39 @@ $body = ''; } + my $warn_colors = { + '#' => '#444', + '##' => '#888', + }; + $status_line - .= qq|warn| - . $self->editor_links( join("", $self->warnings ) ) - . qq|| + .= qq|warn| + . $self->editor_links( + join("", map { + warn "# $_"; + my $style = ''; + $style = $warn_colors->{$1} + ? ' style="color:' . $warn_colors->{$1} . '"' + : '' + if m{^(#+)}; + qq|$_
|; # XXX should be but CSS hates me + } $self->warnings ) + ) + . qq|| if $self->warnings; + my ($exit,$description) = ('exit','stop server'); + ($exit,$description) = ('restart','restart server') + if $ENV{FREY_RESTART}; # tune labels on exit link + + my $right = + qq| + + $url + $exit + + |; + my $html = join("\n", qq||, $self->_head_html, @@ -197,8 +232,8 @@ $body
Frey $Frey::VERSION - $url $status_line + $right
|, @@ -209,6 +244,31 @@ return $html; } +=head2 editor + +Create HTML editor link with optional line and title + + my $html = $self->editor( $class, $line, $title ); + +=cut + +sub editor { + my ( $self, $class, $line, $title ) = @_; + confess "need class" unless $class; + $line ||= 1; + qq|$class|; +} + +=head2 editor_links + +Create HTML links to editor for perl error message + + my $html = $self->editor_links( $error ) + +=cut + sub editor_links { my ( $self, $error ) = @_;