--- trunk/lib/Frey/ClassBrowser.pm	2008/11/27 17:39:00	555
+++ trunk/lib/Frey/Class/Browser.pm	2008/12/10 17:51:32	794
@@ -1,4 +1,4 @@
-package Frey::ClassBrowser;
+package Frey::Class::Browser;
 use Moose;
 
 extends 'Frey::ClassLoader';
@@ -16,24 +16,29 @@
 	documentation => 'Show usage on top of list',
 );
 
+our $usage;
+
 sub as_markup {
 	my $self = shift;
 	my $row;
 	my @icons;
 
-	my $usage = $self->session_dump( $self->usage );
+	$usage ||= $self->session_dump( $self->usage );
 	#warn "# usage ",dump( $usage );
+
+	if ( ! $self->can('icon_path') ) {
+		$self->TODO( "re-apply Frey::Web on $self" );
+		Frey::Web->meta->apply( $self );
+	}
+
 	foreach my $class ( $self->classes ) {
 
-		my $icon = '';
-		if ( ! $self->can('icon_path') ) {
-			warn "FIXME: re-apply Frey::Web on $self";
-			Frey::Web->meta->apply( $self );
-		}
-		$icon = $self->icon_path( $class );
+		my $icon = $self->icon_path( $class );
 		if ($icon) {
 			push @icons, $icon;
 			$icon = qq|<!-- icon:$icon -->|;
+		} else {
+			$icon = '';
 		}
 
 		my $html
@@ -50,8 +55,10 @@
 		}
 
 		my @run = map {
+			my $invoke = $_;
 			s{^as_}{};
-			qq|<a target="$class" 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 target="$class" href="/Frey-ObjectBrowser?class=$class">collection</a>| if $class->can('collection_table');
 
@@ -72,16 +79,17 @@
 
 	my $icons_html = $self->combine_images( @icons );
 	sub icon {
-		my $path = shift;
-		warn "# icon $path";
+		my ($icons_html,$path) = @_;
 		$icons_html->{ $path } || die "can't find $path in ",dump($icons_html);
 	};
 
+	$self->title('Frey');
+
 	return 
 		qq|<table>| . join("\n",
 			map {
 				my $html = $row->{$_};
-				$html =~ s{<!-- icon:(\S+) -->}{icon($1)}gse;
+				$html =~ s{<!-- icon:(\S+) -->}{icon($icons_html,$1)}gse;
 				$html;
 			}
 			sort {