--- trunk/lib/Strix/View/User.pm	2008/07/10 15:29:01	82
+++ trunk/lib/Strix/View/User.pm	2008/07/11 10:29:31	95
@@ -1,6 +1,7 @@
 package Strix::View::User;
 
 use Data::Dump qw/dump/;
+use Carp qw/carp/;
 
 use metaclass 'Moose::Meta::Class' => (
 	attribute_metaclass => 'Continuity::Meta::Attribute::FormField'
@@ -17,12 +18,21 @@
 	return unless $self->_fey;
 
 	$self->add_button( 'Edit' => sub {
+		$self->remove_button( 'Delete' );
+		$self->rename_button( 'Edit' => 'Save' );
 		my $out = $self->render_edit;
 		my $f = $self->next($out);
 		my $hash = $self->set_from_hash($f);
-		$self->_fey->update( %$hash );
+		#warn "# Edit/Save hash = ",dump( $hash );
+		$self->_fey->update( %$hash ) if $hash;
+		$self->rename_button( 'Save' => 'Edit' );
+		$self->delete_button;
 	});
+	$self->delete_button;
+}
 
+sub delete_button {
+	my $self = shift;
 	$self->add_button('Delete' => sub {
 		print STDERR "delete ID @{[$self->id]}!\n";
 		$self->_fey->delete;
@@ -30,7 +40,6 @@
 		$self->render_as( 'deleted' );
 		Strix::Schema->ClearObjectCaches();	# XXX important!
 	});
-
 }
 
 sub main {
@@ -60,40 +69,9 @@
 	while(1) {
     	my $out;
 		if ( $self->render_as eq 'edit' ) {
-			$out = $self->render_iterator(
-				qq|<div class="editform">|,
-				sub {
-					#warn "# edit render_iterator ",dump( @_ );
-					my ( $name, $field_name, $label, $val ) = @_;
-					return if $name =~ /^_/;
-					return qq|
-						<div class=fieldholder>
-							<div class=label>$label</div>
-							<div class=field>
-								<input type=text id="$field_name" name="$field_name" value="$val">
-							</div>
-						</div>
-					|;
-				},
-				qq|</div>|
-			);
+			$out .= $self->render_edit;
 		} elsif ( $self->render_as eq 'view' ) {
-			$out = $self->render_iterator(
-				qq|<div class="view">|,
-				sub {
-					#warn "# view render_iterator ",dump( @_ );
-					my ( $name, $field_name, $label, $val ) = @_;
-					return if $name =~ /^_/;
-					return qq|
-						<div class=fieldholder>
-							<div class=label>$label</div>
-							<div class=field>$val</div>
-							</div>
-						</div>
-					|;
-				},
-				qq|</div>|
-			);
+			$out .= $self->render_view;
 		} else {
 			warn "no renderer ",dump( $self->render_as ), " skipping...";
 		}
@@ -106,6 +84,73 @@
 	}
 };
 
+sub render_edit {
+	my $self = shift;
+	warn "# render_edit ",$self->id," ",$self->uuid, " ", $self->_layout, "\n";
+	my $out = $self->render_iterator( sub {
+		#warn "# edit render_iterator ",dump( @_ );
+		my ( $name, $field_name, $label, $val ) = @_;
+		return if $name =~ /^_/;
+		return qq|
+			<tr class="editform">
+			<td class="label">$label</td>
+			<td class="field">
+				<input type=text id="$field_name" name="$field_name" value="$val">
+			</td>
+			</tr>
+		| if $self->_layout eq 'table';
+		return qq|
+			<td class="field">
+				<input type=text id="$field_name" name="$field_name" value="$val">
+			</td>
+		| if $self->_layout eq 'columns';
+		return qq|
+			<div class=fieldholder>
+				<label for="$field_name">$label</label>
+				<div class=field>
+					<input type=text id="$field_name" name="$field_name" value="$val">
+				</div>
+			</div>
+		|;
+	});
+
+	return qq|<tr class="editform">$out<td>| . $self->render_buttons . qq|</td></tr>| if $self->_layout eq 'columns';
+
+	$self->render_wrapper_class( $out, 'editform' );
+}
+
+sub render_view {
+	my $self = shift;
+	warn "# render_view ",$self->id," ",$self->uuid," ", $self->_layout,"\n";
+	my $out = $self->render_iterator( sub {
+		#warn "# view render_iterator ",dump( @_ );
+		my ( $name, $field_name, $label, $val ) = @_;
+		return if $name =~ /^_/;
+		return qq|<tr><td>$label</td><td>$val</td></tr>| if $self->_layout eq 'table';
+		return qq|<td>$val</td>| if $self->_layout eq 'columns';
+		return qq|
+			<div class=fieldholder>
+				<div class=label>$label</div>
+				<div class=field>$val</div>
+				</div>
+			</div>
+		|;
+	});
+	return qq|<tr>$out<td>| . $self->render_buttons . qq|</td></tr>| if $self->_layout eq 'columns';
+	$self->render_wrapper_class( $out, 'view' );
+}
+
+sub render_wrapper_class {
+	my ( $self, $out, $class ) = @_;
+	if ( length($out) == 0 ) {
+		carp "no output, skipping";
+		return '<!-- no output -->';
+	}
+	$out =~ s/^\t+//mg;	# XXX compress output
+	return $out . qq|<tr><td colspan=2>| . $self->render_buttons . qq|</td></tr>| if $self->_layout eq 'table';
+	return qq|<div class="$class">| . $out . $self->render_buttons . qq|</div>|;
+}
+
 use Data::Dump qw/dump/;
 
 use Strix::User;
@@ -125,15 +170,20 @@
 
 }
 
-has _foo => (
-	is => 'rw',
-	label => 'Foo',
-);
-
 has _fey => (
 	is => 'rw',
 	label => 'Fey object',
 	isa => 'Strix::User',
 );
 
+use Moose::Util::TypeConstraints;
+
+enum 'Layouts' => qw( div table columns );
+
+has _layout => (
+	is => 'rw',
+	isa => 'Layouts',
+	default => 'div',
+);
+
 1;