--- trunk/lib/Frey/Introspect.pm	2008/07/15 23:35:27	139
+++ trunk/lib/Frey/Introspect.pm	2008/10/28 21:47:18	199
@@ -138,8 +138,7 @@
 sub html {
 	my ( $self, $request ) = @_;
 
-	$self->add_css( 'static/introspect.css' );
-	warn "## css = ",dump( $self->css );
+	$self->add_head( 'static/introspect.css' );
 
 	while (1) {
 
@@ -156,11 +155,28 @@
 				my $attr = $meta->get_attribute($_);
 				my ( $before, $title, $after ) = ( '', '', '' );
 				( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->is_required;
-				qq|<td>$before<a href="/~/$package/?$_">$_</a>$after</td>|
+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;
+					
+					$getter = $check;
+					$getter =~ s/^has_//;
+					
+					if ( $attr->$check ) {
+						if ( $getter eq $check ) {
+							$after .= "$check ";
+						} else {
+							$after .= qq{<span class="frey-popup">$check};
+							$after .= '<span>' . $attr->$getter->dump . '</span>' if $getter ne $check;
+							$after .= ' </span>';
+						}
+					}
+				}
+				qq|<td align="right">$before<a href="/~/$package/?$_">$_</a></td><td>$after</td>|
 			} sort $meta->get_attribute_list
 		}
 
-		my $table = qq|<table><tr><th>Methods</th><th>Attributes</th></tr>|;
+		my $table = qq|<table class="frey-object-browser"><tr><th>Methods</th><th align="right">Attributes</th><th align="left">Properties</th></tr>|;
 		while ( @methods || @attributes ) {
 			my ($m,$a) = ( shift @methods, shift @attributes );
 			$m ||= '<td></td>';
@@ -174,21 +190,31 @@
 			Frey::ClassBrowser->new->markup .
 			qq|</div>|;
 
-		my ( $superclasses, $roles ) = ( '', 'Role' );
+		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-popup" href="/~/$name">$name<span>| . $_->meta->dump(2) . qq|</span></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;
-			}
+		if ( $meta->can('roles') ) {
+			$roles = join(', ',
+				grep { ! m/\Q$package\E/ }	# skip me
+				map {
+					my $name = $_->name;
+					qq|<a class="frey-popup" href="/~/$name">$name<span>| . $name->meta->dump(2) . qq|</span></a>|;
+				}
+				$meta->calculate_all_roles
+			);
+			$roles = " with roles: $roles" if $roles;
 		}
 
 		my $pod = Frey::Pod->new( class => $package )->markup;