--- trunk/lib/Frey/Introspect.pm	2008/07/13 19:46:10	120
+++ trunk/lib/Frey/Introspect.pm	2008/07/15 14:56:28	134
@@ -138,18 +138,6 @@
 
 	while (1) {
 
-		my $js = $self->head_javascript;
-		$js .= << '__END_OF_JS__';
-<script type="text/javascript">
-joose.loadComponents("../lib")
-
-function $(id) {
-	return document.getElementById(id)
-}
-
-</script>
-__END_OF_JS__
-
 		my ( $class, $meta, $is_role ) = $self->load_package;
 
 		my $package = $self->package;
@@ -161,10 +149,9 @@
 		if ( $class->get_attribute_list ) {
 		@attributes = map {
 				my $attr = $class->get_attribute($_);
-#				warn "## $_ ", $attr->is_required ? 'required' : 'optional';
-				qq|<td><a href="/~/$package/$_?">$_</a></td><td>| .
-				( $attr->is_required ? ' <b>required</b>' : '' ) .
-				qq|</td>|;
+				my ( $before, $title, $after ) = ( '', '', '' );
+				( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->can('is_required') && $attr->is_required;
+				qq|<td>$before<a href="/~/$package/$_?"$title>$_</a>$after</td>|
 			} sort $class->get_attribute_list
 		}
 
@@ -179,22 +166,39 @@
 
 		my $classes =
 			qq|<div class="classes">| .
-			Frey::ClassBrowser->new->html_markup .
+			Frey::ClassBrowser->new->markup .
 			qq|</div>|;
 
-		my $html = dom2html(
-			html => [
-				head => [
-					link => { rel=>"stylesheet", href=>"/static/app.css", type=>"text/css", media=>"screen" },
-					$js,
-					title => [ 'Introspect ', $self->package ],
-				],
-				body => [
-					h1 => [ $self->package ],
-					$table,
-					$classes,
-				],
-			]
+		$self->add_css( 'static/introspect.css' );
+
+		warn "## css = ",dump( $self->css );
+
+		my ( $superclasses, $roles ) = ( '', 'Role' );
+		if ( ! $is_role ) {
+			if ( $meta->superclasses ) {
+				$superclasses = 'Superclasses: ' .
+					join(', ',
+						map { my $s = $_->meta->name; qq|<a href="/~/$s">$s</a>| }
+						#grep { $_ ne 'Moose::Object' }
+						$meta->superclasses
+					);
+			}
+
+			if ( $meta->can('roles') ) {
+				$roles = join(', ', map { my $r = $_->name; qq|<a href="/~/$r">$r</a>| } @{ $meta->roles } );
+				$roles = " with roles: $roles" if $roles;
+			}
+		}
+
+		my $pod = Frey::Pod->new( class => $package )->markup;
+
+		my $html = $self->page(
+			title => "Introspect $package",
+			body => qq|<h1>$package</h1>|
+				. qq|$superclasses\n$roles\n|
+				. ( $pod ? qq|<a href="#___top" title="Skip to POD" style="font-size: 80%; color: #aaa;">&darr;pod&darr</a>| : '' )
+				. qq|$table\n$pod\n$classes|,
+
 		);
 
 		$request->print($html);