--- lib/Arh/View/UnitPictures.pm	2007/12/10 14:56:12	28
+++ lib/Arh/View/UnitPictures.pm	2008/04/06 20:56:54	54
@@ -8,7 +8,7 @@
 
 use Data::Dump qw/dump/;
 
-sub object_type { 'UnitPicture' };
+sub object_type { 'Picture' };
 
 private template search_region => sub {};
 private template 'no_items_found' => sub {};
@@ -32,6 +32,9 @@
     my $collection =  $self->_current_collection();
 	# XXX show just pictures from current unit
 	$collection->limit( column => 'unit', value => $unit ) if $unit;
+
+	warn "## list page: $page unit: $unit fragment_for_new_picture: $fragment_for_new_picture item_path: $item_path";
+
     div {
 		{ class is 'pictures' }; 
 
@@ -61,11 +64,15 @@
 		moniker => "delete-" . Jifty->web->serial,
 	);
 
-	warn "## id: $id unit $unit";
+	warn "## view id: $id unit $unit";
 
 	form {
+		img { attr { src => "/pictures/show/" . $record->filename } }
+		tt { $record->filename }
+		span { $record->type->name };
+
 		if ( $record->current_user_can('delete') && $self->current_user->editing ) {
-			hyperlink(
+			outs_raw( $delete->button(
 				label   => _("Delete picture"),
 				class   => "float-crud-button button-delete",
 				onclick => {
@@ -75,11 +82,8 @@
 					refresh_self => 1,
 					args => { id => $id },
 				},
-				as_button => 1,
-			);
+			));
 		};
-		img { attr { src => "/static/pics/" . $record->picture->filename } }
-		tt{ $record->picture->filename }
 	}; 
 
 };
@@ -89,21 +93,26 @@
 	return unless $self->current_user->editing;
 
 	my ( $id, $unit ) = get(qw(id unit));
+	warn "## new_picture id: $id unit: $unit";
+
 	my $record_class = $self->record_class;
-	my $create = $record_class->as_create_action(
+	warn "## new_picture record_class: $record_class\n";
+#	my $create = $record_class->as_create_action(
+	my $create = new_action(
+		class => 'UploadPicture',
 		moniker => "create-" . Jifty->web->serial,
 	);
-	warn "## unit $unit";
 
 	my $attach_to =
-		Jifty->web->current_region->parent ?
-		Jifty->web->current_region->parent->get_element( 'div.list' ) :
-		Jifty->web->current_region;
+#		Jifty->web->current_region->parent ?
+#		Jifty->web->current_region->parent->get_element( 'div.list' ) :
+#		Jifty->web->current_region;
+		Jifty->web->current_region->parent->get_element( 'div.list' );
 
 	warn "## attach_to = $attach_to";
 
     form {
-		render_param($create => 'picture');
+		render_action( $create => [ 'campaign', 'content', 'type' ] );
 		outs_raw( $create->hidden( unit => $unit ) );
 		hyperlink(
 			label   => _("Add picture"),
@@ -131,18 +140,24 @@
 template 'fragment' => sub {
 	my ( $self, $unit ) = @_;
 
-	warn "## unit = ", dump( $unit );
+	#warn "## unit = ", dump( $unit );
 
-	my $unitpictures = Arh::Model::UnitPictureCollection->new;
+	my $unitpictures = Arh::Model::PictureCollection->new;
 	$unitpictures->limit( column => 'unit', value => $unit->id );
 	warn "## ", $unitpictures->count, " pictures for unit ",$unit->id;
 
 	div {
 		{ class is 'pictures-by-unit' };
-	
-		em { 'pictures for unit ', $unit->name };
+
+		if ( $unitpictures->count ) {
+			em { _('Pictures for unit'), ' ', $unit->name };
+
+		} else {
+			em { _('No pictures for unit'), ' ', $unit->name };
+		}
 
 		set( search_collection => $unitpictures );
+
 		render_region(
 			name => 'unit-pictures',
 			path => '/unitpictures/list',
@@ -151,6 +166,7 @@
 				unit => $unit->id,
 			}
 		);
+
 	}
 };