--- trunk/lib/Frey/Server.pm	2008/07/13 12:22:14	106
+++ trunk/lib/Frey/Server.pm	2008/07/13 17:41:13	114
@@ -8,6 +8,7 @@
 #use Continuity::REPL;
 use Data::Dump qw/dump/;
 
+#use Carp::REPL;
 use Frey::ClassLoader;
 
 my @messages;    # Global (shared) list of messages
@@ -27,6 +28,7 @@
 		debug_level => 1,
 		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ },
 	);
+	$Module::Reload::Debug = 1;
 	Frey::ClassLoader->new->load_all_classes();
 	$server->loop;
 }
@@ -45,15 +47,16 @@
 
 	eval {
 
-		if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
-			my $f = Frey::Introspect->new( package => $1 );
-			$f->html( $req );
-		}
+		my $f;
 
-		if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
-			my $f = Frey::ObjectBrowser->new( fey_class => $1 );
-			$f->html( $req );
+		if ( $path =~ m!/~/([^/]+)(.*)! ) {
+			$f = Frey::Introspect->new( package => $1 );
+		} elsif ( $path =~ m!/ob/([^/]+)(.*)! ) {
+			$f = Frey::ObjectBrowser->new( fey_class => $1 );
+		} elsif ( $path =~ m!/od/([^/]+)(.*)! ) {
+			$f = Frey::ObjectDesigner->new( fey_class => $1 );
 		}
+		$f->html( $req ) if $f;
 
 	};
 
@@ -61,25 +64,24 @@
 		warn $@;
 		#$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
 		$req->print( qq{<pre class="error">$@<pre>} );
-
+#		Carp::REPL::repl;	# FIXME if $self->debug
 	} else {
 
 		my $f = Frey::ClassLoader->new;
 		my $classes = dom2html(
-			ul => [
+			table => [
 				map {
 					warn dump( $_ );
 					my $package = $_;
-					( li => [
-						a => { href => '/~/' . $package . '/' } => [ $package ],
-						' <tt>', $f->package_path( $package ), '</tt> ',
-						$package->can('collection') ?
-							( a => { href => '/ob/' . $package } => [ 'collection' ] ) : '',
+					( tr => [
+						td => [ a => { href => '/~/' . $package, title => $f->package_path( $package ) } => [ $package ] ],
+						td => [ $package->can('meta') ? ( a => { href => '/od/' . $package } => [ 'design' ] ) : '' ],
+						td => [ $package->can('collection') ? ( a => { href => '/ob/' . $package } => [ 'collection' ] ) : '' ],
 					] )
 				} $f->classes
 			],
 		);
-		$req->print( $classes );
+		$req->print( "<h1>Classes</h1>$classes" );
 
 	}