--- trunk/lib/Frey/Web.pm 2009/06/29 16:54:02 1109 +++ branches/zimbardo/lib/Frey/Web.pm 2010/11/03 21:43:50 1196 @@ -1,8 +1,7 @@ package Frey::Web; use Moose::Role; -with 'Frey::Session'; -with 'Frey::Class::Icon'; +with 'Frey::Session', 'Frey::Class::Icon'; use Data::Dump qw/dump/; use Carp qw/confess cluck carp/; @@ -313,6 +312,14 @@ my $revision = $svk->info->{Revision} || ''; $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)}; + $status_line = $ENV{FREY_DEV} ? qq| +
+ Frey $Frey::VERSION $revision + $status_line + $right +
+ | : ''; + $self->add_icon; my $title = undef @@ -339,11 +346,7 @@ qq| $body -
- Frey $Frey::VERSION $revision - $status_line - $right -
+ $status_line |, ); @@ -432,6 +435,10 @@ my $self = shift; my $error = join(" ", @_); + if ( $error =~ m{(.+)}s ) { + return qq|
$1
|; + } + my $fatal = ''; my $backtrace = ''; @@ -479,11 +486,11 @@ Called at beginning of each request - $self->clean_status; + $self->setup_request; =cut -sub clean_status { +sub setup_request { my ($self) = shift; warn "## clean_status"; @head = ( 'static/frey.css' ); @@ -535,7 +542,7 @@ =cut sub log_path { - $Frey::Bootstrap::log_path || die "no log_path?"; + $Frey::Bootstrap::log_path || die "no log_path did you load Frey::Bootstrap?"; } our $pwd = `pwd`; @@ -715,4 +722,6 @@ return $t; } +no Moose::Role; + 1;