--- trunk/lib/Frey/ClassBrowser.pm	2008/11/26 04:27:00	530
+++ trunk/lib/Frey/ClassBrowser.pm	2008/11/28 13:18:18	582
@@ -4,6 +4,7 @@
 extends 'Frey::ClassLoader';
 with 'Frey::Web';
 with 'Frey::Session';
+with 'Frey::Web::CombineImages';
 
 use Frey::Run;
 use Data::Dump qw/dump/;
@@ -18,16 +19,27 @@
 sub as_markup {
 	my $self = shift;
 	my $row;
+	my @icons;
 
 	my $usage = $self->session_dump( $self->usage );
 	#warn "# usage ",dump( $usage );
 	foreach my $class ( $self->classes ) {
-		my $icon_path;
-		eval { $icon_path = $self->icon_path( $class ); };
+
+		my $icon = '';
+		if ( ! $self->can('icon_path') ) {
+			$self->TODO( "re-apply Frey::Web on $self" );
+			Frey::Web->meta->apply( $self );
+		}
+		$icon = $self->icon_path( $class );
+		if ($icon) {
+			push @icons, $icon;
+			$icon = qq|<!-- icon:$icon -->|;
+		} else {
+			$icon = '';
+		}
+
 		my $html
-			= qq|<tr><td>|
-			. ( $icon_path ? qq|<img src="/$icon_path" alt="$class">| : '?' )
-			. qq|</td><td><a target="introspect" href="/$class" title="|
+			= qq|<tr><td>$icon</td><td><a target="$class" href="/$class" title="|
 			. $self->class_path( $class )
 			. qq|">$class</a></td><td>|
 			;
@@ -35,15 +47,17 @@
 			if ( $class->meta->isa('Moose::Meta::Role') ) {
 				$html .= qq|role|;
 			} else {
-				$html .= qq|<a href="/Frey-ObjectDesigner?class=$class">design</a>| if $class->can('collection');
+				$html .= qq|<a target="$class" href="/Frey-ObjectDesigner?class=$class">design</a>| if $class->can('collection');
 			}
 		}
 
 		my @run = map {
+			my $invoke = $_;
 			s{^as_}{};
-			qq|<a href="/$class/as_$_" title="$class->as_$_">$_</a>|;
+			s{_as_\w+}{};
+			qq|<a target="$class" href="/$class/$invoke" title="$class->$invoke">$_</a>|;
 		} $self->class_runnable( $class );
-		push @run, qq|<a href="/Frey-ObjectBrowser?class=$class">collection</a>| if $class->can('collection_table');
+		push @run, qq|<a target="$class" href="/Frey-ObjectBrowser?class=$class">collection</a>| if $class->can('collection_table');
 
 		my @inputs = $self->class_inputs( $class );
 
@@ -60,18 +74,24 @@
 		$row->{$class} = $html;
 	}
 
+	my $icons_html = $self->combine_images( @icons );
+	sub icon {
+		my ($icons_html,$path) = @_;
+		$icons_html->{ $path } || die "can't find $path in ",dump($icons_html);
+	};
+
 	return 
 		qq|<table>| . join("\n",
-			map { $row->{$_} }
+			map {
+				my $html = $row->{$_};
+				$html =~ s{<!-- icon:(\S+) -->}{icon($icons_html,$1)}gse;
+				$html;
+			}
 			sort {
 				if ( $usage->{$a} || $usage->{$b} ) {
-					if ( $self->usage_on_top ) {
-						$usage->{$b} <=> $usage->{$a};
-					} else {
-						$usage->{$a} <=> $usage->{$b};
-					}
+					$self->usage_on_top ? $usage->{$b} <=> $usage->{$a} : $usage->{$a} <=> $usage->{$b};
 				} else {
-					$a cmp $b;
+					$self->usage_on_top ? $a cmp $b : $b cmp $a;
 				}
 			}
 			keys %$row