--- trunk/lib/Frey/ObjectBrowser.pm 2008/07/10 20:00:54 89 +++ trunk/lib/Frey/ObjectBrowser.pm 2008/07/11 12:47:50 96 @@ -64,8 +64,8 @@ warn "# new layout = $layout\n"; } - my $rows_delimiter = '
'; - $rows_delimiter = '' if $layout eq 'table'; + my $rows_delimiter = ''; + $rows_delimiter = '
' if $layout eq 'div'; my $form = join($rows_delimiter, map { $_->_layout( $layout ); @@ -74,7 +74,7 @@ if ( $w[ $#w ]->_fey ) { warn "+++ added new item widget\n"; - my $w = Strix::View::User->new( render_as => 'edit' ); + my $w = Strix::View::User->new( _render_as => 'edit' ); $w->_layout( $layout ); $form .= $rows_delimiter . $w->process; push @w, $w; @@ -82,6 +82,27 @@ $form = qq|$form
| if $layout eq 'table'; + if ( $layout eq 'columns' ) { + # add header to table + my $header = $w[0]->render_iterator( sub { + my ( $name, $field_name, $label, $val ) = @_; + return if $name =~ /^_/; + return qq|$label|; + }); + $form = qq|$header$form
|; + } + + my $layout_picker = join(' ', + qq|
layout:|, + map { + if ( $layout eq $_ ) { + qq|$_|; + } else { + qq|$_|; + } + } ( 'div', 'table', 'columns' ), + qq|
|, + ); my $doc = Continuity::Widget::DomNode->create( html => [ @@ -90,20 +111,22 @@ ], body => [ h1 => [ 'Strix::User' ], - $layout eq 'table' ? - qq|div layout| : - qq|table layout|, + $layout_picker, form => { method=>'post' } => [ $form, ], ], ] - ); + )->to_string; + + warn ">>> $layout ",length( $doc ),"\n"; - $req->print( $doc->to_string ); + $req->print( $doc ); $req->next; $f = { $req->params }; + + process_links( $req ); } warn "NO WAY OUT!";