--- trunk/lib/Frey/ObjectBrowser.pm	2008/07/13 13:09:56	109
+++ trunk/lib/Frey/ObjectBrowser.pm	2008/07/15 17:14:10	135
@@ -31,7 +31,8 @@
 #$Data::Dumper::Deparse = 1;
 use Data::Dump qw/dump/;
 
-use Frey::Web::Row;
+use Frey::Web::Item;
+use Frey::Web::Links;
 
 sub html {
 	my ( $self, $req ) = @_;
@@ -40,6 +41,7 @@
 	my $layout = delete( $f->{layout} ) || 'div';
 
 	my @w;
+	my $pager;
 
 	while ( 1 ) {
 	
@@ -51,19 +53,20 @@
 			warn "# new layout = $layout\n";
 		}
 
-		if ( ! @w || $f->{limit} || $f->{offset} ) {
-			my $s = $self->fey_class->collection( $f );
+		if ( ! @w || $f->{page} || $f->{per_page} ) {
+			my $s;
+			( $s, $pager ) = $self->fey_class->collection( $f );
 			warn "# s ",$self->fey_class," = ",dump( $s ) if $self->debug;
 
 			@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 );
+			warn "# got $#w elements: ",dump( map { $_->fey->id } @w ), " from total of ", $s->handle->rows;
 		}
 
 		my $rows_delimiter = '';
@@ -76,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;
 		}
@@ -85,39 +88,48 @@
 
 		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>|;
 		}
 
-		my $layout_picker = join(' ',
-			qq|<div class="layout">layout:|,
-			map {
-				if ( $layout eq $_ ) {
-					qq|<em>$_</em>|;
-				} else {
-					qq|<a href="?layout=$_">$_</a>|;
-				}
-			} ( 'div', 'table', 'columns' ),
-			qq|</div>|,
+		my $layout_picker =
+			qq|<div class="layout">layout: | .
+			Frey::Web::Links->new(
+				name => 'layout',
+				current => $layout,
+				values => [ 'div', 'table', 'columns' ],
+			)->links .
+			qq|</div>|
+		;
+
+		my $pager = join( ' ',
+			qq|<div class="notice">|,
+			'Showing',
+			$pager->first, '-', $pager->last,
+			'of',
+			$pager->total_entries,
+			'results<br>',
+#			'page', $pager->current_page, '/', $pager->last_page,
+			Frey::Web::Links->new(
+				name => 'page',
+				current => $pager->current_page,
+				values => [ $pager->first_page .. $pager->last_page ],
+			)->links,
+			qq|</div>|
 		);
 
-	    my $html = dom2html(
-			html => [
-				head => [
-					link  => { rel=>"stylesheet", href=>"/static/form.css", type=>"text/css" }
-				],
-				body => [
-					h1 => [ $self->fey_class ],
-					$layout_picker,
-					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";