--- trunk/lib/Frey/ObjectBrowser.pm 2008/07/09 16:41:00 72 +++ trunk/lib/Frey/ObjectBrowser.pm 2008/07/11 09:35:32 94 @@ -34,50 +34,89 @@ sub html { my ( $self, $req ) = @_; - my $params = $req->param; - warn "# params = ",dump( $params ); + my $f = { $req->params }; + my $layout = delete( $f->{layout} ) || 'div'; use Strix::User; use Strix::View::User; my $s = Strix::User->rows(); - warn "# s = ",dump( $s ); + #warn "# s = ",dump( $s ); - my $f = {}; my @w; while ( my $u = $s->next ) { - warn "# u = ",dump( $u ); - my $w = Strix::View::User->new( - #%{ unbless( $u ) }, # FIXME this is cludge - %{ $u } # much better :-) - ); + my $w = Strix::View::User->new( %{ $u } ); $w->_fey( $u ); - warn "# w = ",dump( $w ); + $w->_layout( $layout ); + warn "# w = ",dump( $w ) if $self->debug; push @w, $w; } while ( 1 ) { - my $form = join('
', map { $_->process($f) } @w ); + + warn "# got $#w elements: ",dump( map { $_->id } @w ); + warn "<<< GOT REQUEST ",dump( $f ); + + # re-apply (changed?) layout to elements + if ( defined $f->{layout} ) { + $layout = delete( $f->{layout} ); + warn "# new layout = $layout\n"; + } + + my $rows_delimiter = '
'; + $rows_delimiter = '' if $layout eq 'table'; + + my $form = join($rows_delimiter, map { + $_->_layout( $layout ); + $_->process($f) || '' + } @w ); + + if ( $w[ $#w ]->_fey ) { + warn "+++ added new item widget\n"; + my $w = Strix::View::User->new( render_as => 'edit' ); + $w->_layout( $layout ); + $form .= $rows_delimiter . $w->process; + push @w, $w; + } + + $form = qq|$form
| if $layout eq 'table'; + + my $layout_picker = join(' ', + qq|
layout:|, + map { + if ( $layout eq $_ ) { + qq|$_|; + } else { + qq|$_|; + } + } ( 'div', 'table' ), + qq|
|, + ); + my $doc = Continuity::Widget::DomNode->create( html => [ head => [ - link => { rel=>"stylesheet", href=>"form.css", type=>"text/css" } + link => { rel=>"stylesheet", href=>"/static/form.css", type=>"text/css" } ], body => [ h1 => [ 'Strix::User' ], + $layout_picker, form => { method=>'post' } => [ - $form + $form, ], ], ] - ); + )->to_string; + + warn ">>> $layout ",length( $doc ),"\n"; - $req->print( $doc->to_string ); + $req->print( $doc ); $req->next; $f = { $req->params }; - warn "...here we go again..."; + + process_links( $req ); } warn "NO WAY OUT!";