--- trunk/lib/Frey/ObjectBrowser.pm	2008/07/11 09:25:02	93
+++ trunk/lib/Frey/ObjectBrowser.pm	2008/07/11 10:29:31	95
@@ -64,8 +64,8 @@
 			warn "# new layout = $layout\n";
 		}
 
-		my $rows_delimiter = '<hr/>';
-		$rows_delimiter = '' if $layout eq 'table';
+		my $rows_delimiter = '';
+		$rows_delimiter = '<hr/>' if $layout eq 'div';
 
 		my $form = join($rows_delimiter, map {
 			$_->_layout( $layout );
@@ -82,6 +82,27 @@
 
 		$form = qq|<table>$form</table>| 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|<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 $doc = Continuity::Widget::DomNode->create(
 			html => [
@@ -90,12 +111,7 @@
 				],
 				body => [
 					h1 => [ 'Strix::User' ],
-					$layout eq 'table' ?
-						# gen_link doesn't work since Widngets have it's own scope of layout
-#						gen_link( 'div layout', sub { $layout = 'div' } ) :
-#						gen_link( 'table layout', sub { $layout = 'table' } ),
-						qq|<a href="?layout=div">div layout</a>| :
-						qq|<a href="?layout=table">table layout</a>|,
+					$layout_picker,
 					form => { method=>'post' } => [
 						$form,
 					],