--- trunk/lib/Frey/Run.pm	2008/12/24 13:51:59	887
+++ trunk/lib/Frey/Run.pm	2009/01/26 14:51:11	1020
@@ -75,12 +75,16 @@
 	my ( $self ) = @_;
 
 	my ($html,$body,$data);
+
+	my $current_status;
+	$current_status->{$_}++ foreach $self->status;
+
 	eval {
 		my $class = $self->class;
 		$self->load_class( $class );
 
 		if ( my $form = $self->params_form ) {
-			$html = $self->page( body => $form );
+			$html = $self->html_page( body => $form );
 			warn "got required params form for $class ", $self->run, " format: ", $self->format;
 		} else {
 
@@ -106,7 +110,7 @@
 			$o->depends if $o->can('depends');
 
 			if ( $self->run =~ m{as_markup} ) {
-				$html = $o->page( run => $self->run );
+				$html = $o->html_page( run => $self->run );
 			} elsif ( $self->run =~ m{(.*as_sponge)} ) {
 				$data = $o->$1;
 				confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
@@ -118,6 +122,15 @@
 					$body .= '<tr><th>' . join('</th><th>', @{$data->{NAME}} ) . '</th></tr>';
 					$body .= '<tr><td>' . join('</td><td>', @$_ ) . '</td></tr>' foreach @{ $data->{rows} };
 					$body .= '</table>';
+
+					$self->add_css(qq|
+						tr:nth-child(even) {
+							background-color: #eee;
+						}
+					|);
+
+					delete( $data->{rows} ); # too much dumplication
+					$body .= Frey::View::Dumper->new( data => $data )->as_markup if $data;
 				}
 			} elsif ( $self->run =~ m{(as_data|sql)} ) {
 				my $run = $self->run;
@@ -134,15 +147,24 @@
 			}
 			if ( ! $html ) {
 				$body  = Frey::View::Dumper->new( data => $body )->as_markup if ref $body;
-				$body .= Frey::View::Dumper->new( data => $data )->as_markup if defined $data;
+				$body .= Frey::View::Dumper->new( data => $data )->as_markup if defined $data && ! defined $body;
 			}
 
 			$o->title( $class );
 
-			$html = $o->page( body => $body ) if $body && !$html;
+			$html = $o->html_page( body => $body ) if $body && !$html;
 			$self->content_type( $o->content_type );
 
 			confess "no html output for $class ", $o->dump unless defined $html;
+
+			if ( $o->can('status') ) {
+				foreach ( $o->status ) {
+					next if $current_status->{$_}++;
+					$self->add_status( $_ );
+					warn "# run add_status: ", $self->dump( $_ );
+				}
+			}
+
 		};
 
 	};
@@ -151,10 +173,14 @@
 
 	if ( $@ ) {
 		my $error = $@;
+		warn $error;
+
+		exit if $error =~ m{Attempt to reload \S+ aborted}; # FIXME Mojo can't reload DBIx::Class
+
 		my $o = Frey->new;
 		$o->{request_url} = $self->request_url; # sigh, this is dynamic languge, right?
 		Frey::Web->meta->apply( $o );
-		$html = $o->page( body => $self->error( $error, undef ) );
+		$html = $o->html_page( body => $self->error( $error, undef ) );
 	}
 
 	warn $self->class, " produced ", length($html), " bytes of ", $self->content_type;