--- trunk/lib/Frey/Web.pm 2008/11/26 16:17:17 535
+++ trunk/lib/Frey/Web.pm 2008/11/26 17:36:02 538
@@ -159,6 +159,21 @@
our $icon_html;
+sub popup {
+ my ( $self, $name, $content, $full ) = @_;
+
+ if ( ref($content) ) {
+ $content = '' . dump($content) . '
';
+ my $l = length($content);
+ $content = qq|$l bytes| if ! $full && $l > $self->dump_max_bytes;
+ } else {
+ $content = qq|$content|;
+ }
+
+ warn "## popup [$name] = ", length( $content ), " bytes" if $self->debug;
+ return qq|\n|;
+}
+
sub page {
my $self = shift;
my $a = {@_};
@@ -170,20 +185,11 @@
my $status_line = '';
unshift @status, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup };
- unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup };
+# unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup };
foreach my $part ( @status ) {
foreach my $name ( keys %$part ) {
- my $content = $part->{$name};
- if ( ref($content) ) {
- $content = '' . dump($content) . '
';
- my $l = length($content);
- $content = qq|$l bytes| if $l > $self->dump_max_bytes;
- } else {
- $content = qq|$content|;
- }
- warn "### part [$name] = ", length( $content ), " bytes" if $self->debug;
- $status_line .= qq|\n|;
+ $status_line .= $self->popup( $name, $part->{$name} );
}
}
@@ -202,6 +208,25 @@
$status_line .= $self->warnings_html;
+ my $inc_html;
+ {
+ my $inc;
+ map {
+ s{.pm$}{};
+ my $class = $_;
+ s[/][}->{]g;
+ $class =~ s[/][::]g;
+ eval '$inc->{' . $_ . '} = $class';
+ } sort keys %INC;
+ $inc_html = dump( $inc );
+ $inc_html =~ s{\s+=>\s+\d+}{}gs;
+ $inc_html =~ s{(['"]?)(\w+)\1\s+=>\s+(['"]?)([\w:]*\2)\3}{$2}gs;
+ $inc_html =~ s{\s+=>\s+}{ }gs;
+ $inc_html =~ s{,}{}gs;
+ }
+
+ $status_line .= $self->popup( INC => "$inc_html" );
+
my ($exit,$description) = ('exit','stop server');
($exit,$description) = ('restart','restart server')
if $ENV{FREY_RESTART}; # tune labels on exit link
@@ -403,17 +428,17 @@
if ( $multiline_end ) {
if ( m{^\Q$multiline_end\E} || m{^\s.+\Q$multiline_end\E;$} ) {
- warn "## $line end of $multiline_end in '$_'\n";
+# warn "## $line end of $multiline_end in '$_'\n";
undef $multiline_end;
} else {
- warn "## $line skipped\n";
+# warn "## $line skipped\n";
}
} elsif ( m{^(#*)\s+} ) {
my $l = $1 ? length($1) : 0;
if ( $l > $level ) {
undef $multiline_end;
$multiline_end = $multiline_markers->{$1} if m{($multiline_re)$};
- warn "## $line start $1 .. $multiline_end level $l > $level for '$_'\n" if $multiline_end;
+# warn "## $line start $1 .. $multiline_end level $l > $level for '$_'\n" if $multiline_end;
next;
}