--- trunk/lib/Frey/ClassBrowser.pm	2008/11/27 17:37:52	554
+++ trunk/lib/Frey/ClassBrowser.pm	2008/11/27 17:39:00	555
@@ -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,6 +19,7 @@
 sub as_markup {
 	my $self = shift;
 	my $row;
+	my @icons;
 
 	my $usage = $self->session_dump( $self->usage );
 	#warn "# usage ",dump( $usage );
@@ -29,7 +31,10 @@
 			Frey::Web->meta->apply( $self );
 		}
 		$icon = $self->icon_path( $class );
-		$icon = qq|<img src="/$icon" alt="$class">| if $icon;
+		if ($icon) {
+			push @icons, $icon;
+			$icon = qq|<!-- icon:$icon -->|;
+		}
 
 		my $html
 			= qq|<tr><td>$icon</td><td><a target="$class" href="/$class" title="|
@@ -65,9 +70,20 @@
 		$row->{$class} = $html;
 	}
 
+	my $icons_html = $self->combine_images( @icons );
+	sub icon {
+		my $path = shift;
+		warn "# icon $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($1)}gse;
+				$html;
+			}
 			sort {
 				if ( $usage->{$a} || $usage->{$b} ) {
 					$self->usage_on_top ? $usage->{$b} <=> $usage->{$a} : $usage->{$a} <=> $usage->{$b};