--- trunk/lib/Frey/ObjectBrowser.pm	2008/07/13 16:17:34	111
+++ trunk/lib/Frey/ObjectBrowser.pm	2008/07/15 17:14:10	135
@@ -31,7 +31,7 @@
 #$Data::Dumper::Deparse = 1;
 use Data::Dump qw/dump/;
 
-use Frey::Web::Row;
+use Frey::Web::Item;
 use Frey::Web::Links;
 
 sub html {
@@ -61,12 +61,12 @@
 			@w = ();
 
 			while ( my $u = $s->next ) {
-				my $w = Frey::Web::Row->new( fey_class => $self->fey_class, fey => $u, layout => $layout );
+				my $w = Frey::Web::CRUD->new( fey_class => $self->fey_class, fey => $u, layout => $layout );
 				warn "# w = ",dump( $w ) if $self->debug;
 				push @w, $w;
 			}
 
-			warn "# got $#w elements: ",dump( map { $_->id } @w ), " from total of ", $s->handle->rows;
+			warn "# got $#w elements: ",dump( map { $_->fey->id } @w ), " from total of ", $s->handle->rows;
 		}
 
 		my $rows_delimiter = '';
@@ -79,7 +79,7 @@
 
 		if ( $w[ $#w ]->fey ) {
 			warn "+++ added new item widget\n";
-			my $w = Frey::Web::Row->new( fey_class => $self->fey_class, render_as => 'edit', layout => $layout );
+			my $w = Frey::Web::CRUD->new( fey_class => $self->fey_class, render_as => 'edit', layout => $layout );
 			$form .= $rows_delimiter . $w->process;
 			push @w, $w;
 		}
@@ -88,11 +88,12 @@
 
 		if ( $layout eq 'columns' ) {
 			# add header to table
-			my $header = $w[0]->render_iterator( sub {
-				my ( $name, $field_name, $label, $val ) = @_;
+			my $header;
+			foreach my $name ( @{ $w[0]->display_columns } ) {
 				return if $name =~ /^_/;
-				return qq|<th>$label</th>|;
-			});
+				my $label = $w[0]->field_label( $name );
+				$header .= qq|<th>$label</th>|;
+			};
 			$form = qq|<table><tr>$header</tr>$form</table>|;
 		}
 
@@ -122,20 +123,13 @@
 			qq|</div>|
 		);
 
-	    my $html = dom2html(
-			html => [
-				head => [
-					link  => { rel=>"stylesheet", href=>"/static/form.css", type=>"text/css" }
-				],
-				body => [
-					h1 => [ $self->fey_class ],
-					$layout_picker,
-					$pager,
-					form => { method=>'post' } => [
-						$form,
-					],
-				],
-			]
+		$self->add_css( 'static/form.css' );
+
+	    my $html = $self->page(
+			body => '<h1>' . $self->fey_class . '</h1>'
+				. $layout_picker
+				. $pager
+				. qq|<form method="post">$form</form>|
 		);
 
 		warn ">>> $layout ",length( $html ),"\n";