--- trunk/lib/Strix/View/User.pm	2008/07/10 20:57:27	90
+++ trunk/lib/Strix/View/User.pm	2008/07/11 12:47:50	96
@@ -9,29 +9,54 @@
 
 use Moose;
 
-extends 'Continuity::Widget';
+#extends 'Continuity::Widget';
+extends 'Frey::Web::Button';
 #with 'BonusTypes';
 
+has _render_as => ( is => 'rw', isa => 'Str', required => 1, default => 'view' );
+
+sub render_iterator {
+	confess "BACKWARD INCOMATIBLE CHANGE: render_iterator works ONLY with 2 params!" unless $#_ == 1;
+	my ($self, $iterator) = @_;
+	my %attrmap = %{ $self->meta->get_attribute_map };
+	my $out;
+	while( my ($name, $attr) = each %attrmap ) {
+		my $reader = $attr->get_read_method;
+		my $val = $self->$reader || '';
+		my $field_name = $self->field_name($name);
+		$out .= $iterator->( $name, $field_name, $attr->label, $val ) || '';	# || '' to shut warnings
+	}
+	return $out;
+}
+
 sub edit_delete_buttons {
 	my $self = shift;
 
 	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;
 		$self->next("Deleted id @{[$self->id]}!");
-		$self->render_as( 'deleted' );
+		$self->_render_as( 'deleted' );
 		Strix::Schema->ClearObjectCaches();	# XXX important!
 	});
-
 }
 
 sub main {
@@ -48,7 +73,7 @@
 			$self->_fey( $u );
 			# put ID in widget, so that it know it's not new
 			$self->id( $u->id );
-			$self->render_as( 'view' );
+			$self->_render_as( 'view' );
 			$self->edit_delete_buttons;
 			$self->remove_button( 'Add' );
 		});
@@ -60,12 +85,12 @@
 
 	while(1) {
     	my $out;
-		if ( $self->render_as eq 'edit' ) {
+		if ( $self->_render_as eq 'edit' ) {
 			$out .= $self->render_edit;
-		} elsif ( $self->render_as eq 'view' ) {
+		} elsif ( $self->_render_as eq 'view' ) {
 			$out .= $self->render_view;
 		} else {
-			warn "no renderer ",dump( $self->render_as ), " skipping...";
+			warn "no renderer ",dump( $self->_render_as ), " skipping...";
 		}
 
 		warn $@ if $@;
@@ -92,6 +117,11 @@
 			</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>
@@ -100,6 +130,9 @@
 			</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' );
 }
 
@@ -111,6 +144,7 @@
 		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>
@@ -119,6 +153,7 @@
 			</div>
 		|;
 	});
+	return qq|<tr>$out<td>| . $self->render_buttons . qq|</td></tr>| if $self->_layout eq 'columns';
 	$self->render_wrapper_class( $out, 'view' );
 }
 
@@ -160,7 +195,7 @@
 
 use Moose::Util::TypeConstraints;
 
-enum 'Layouts' => qw( div table );
+enum 'Layouts' => qw( div table columns );
 
 has _layout => (
 	is => 'rw',