--- trunk/lib/Frey/Introspect.pm	2008/10/28 20:46:35	197
+++ trunk/lib/Frey/Introspect.pm	2008/10/31 19:51:51	213
@@ -129,13 +129,13 @@
 
 =head1 OUTPUT GENERATION
 
-=head2 html
+=head2 request
 
-  $o->html( $request );
+  $o->request( $request );
 
 =cut
 
-sub html {
+sub request {
 	my ( $self, $request ) = @_;
 
 	$self->add_head( 'static/introspect.css' );
@@ -147,7 +147,7 @@
 		my $package = $self->package;
 
 		my @methods;
-		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods;
+		@methods = map { qq|<td class="m"><tt>$_</tt></td>| } $self->methods;
 
 		my @attributes;
 		if ( $meta->get_attribute_list ) {
@@ -155,7 +155,7 @@
 				my $attr = $meta->get_attribute($_);
 				my ( $before, $title, $after ) = ( '', '', '' );
 				( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->is_required;
-warn $attr->dump;
+warn $attr->dump(3);
 				foreach my $check ( qw/has_type_constraint has_handles is_weak_ref is_required is_lazy should_coerce should_auto_deref has_trigger has_documentation has_applied_traits/ ) {
 					my $getter;
 					
@@ -164,19 +164,20 @@
 					
 					if ( $attr->$check ) {
 						if ( $getter eq $check ) {
-							$after .= "$check ";
+							$after .= "$check";
 						} else {
-							$after .= qq{<span class="frey-popup">$check};
-							$after .= '<span>' . $attr->$getter->dump . '</span>' if $getter ne $check;
-							$after .= ' </span>';
+							$after .= qq{<span class="frey-popdown">$check};
+							$after .= '<code>' . $attr->$getter->dump . '</code>' if $getter ne $check;
+							$after .= '</span>';
 						}
 					}
+					$after .= ' ';
 				}
-				qq|<td>$before<a href="/~/$package/?$_">$_</a></td><td>$after</td>|
+				qq|<td class="a">$before<tt>$_</tt></td><td>$after</td>|
 			} sort $meta->get_attribute_list
 		}
 
-		my $table = qq|<table><tr><th>Methods</th><th>Attributes</th><th>Properties</th></tr>|;
+		my $table = qq|<table class="frey-object-browser"><tr><th class="m">Methods</th><th class="a">Attributes</th><th class="p">Properties</th></tr>|;
 		while ( @methods || @attributes ) {
 			my ($m,$a) = ( shift @methods, shift @attributes );
 			$m ||= '<td></td>';
@@ -185,17 +186,15 @@
 		}
 		$table .= qq|</table>|;
 
-		my $classes =
-			qq|<div class="classes">| .
-			Frey::ClassBrowser->new->markup .
-			qq|</div>|;
-
 		my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
 		if ( ! $is_role ) {
 			if ( $meta->superclasses ) {
 				$superclasses = 'Superclasses: ' .
 					join(', ',
-						map { my $s = $_->meta->name; qq|<a href="/~/$s">$s</a>| }
+						map {
+							my $name = $_->meta->name;
+							qq|<a class="frey-popdown" href="/~/$name">$name<code>| . $_->meta->dump(2) . qq|</code></a>|;
+						}
 						#grep { $_ ne 'Moose::Object' }
 						$meta->superclasses
 					);
@@ -205,7 +204,10 @@
 		if ( $meta->can('roles') ) {
 			$roles = join(', ',
 				grep { ! m/\Q$package\E/ }	# skip me
-				map { my $r = $_->name; qq|<a href="/~/$r">$r</a>| }
+				map {
+					my $name = $_->name;
+					qq|<a class="frey-popdown" href="/~/$name">$name<code>| . $name->meta->dump(2) . qq|</code></a>|;
+				}
 				$meta->calculate_all_roles
 			);
 			$roles = " with roles: $roles" if $roles;
@@ -218,7 +220,7 @@
 			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|,
+				. qq|$table\n$pod|,
 
 		);