--- trunk/lib/Frey/Web.pm	2008/11/26 07:57:12	532
+++ trunk/lib/Frey/Web.pm	2008/11/26 16:34:25	537
@@ -50,19 +50,34 @@
 	documentation => 'Maximum dump size sent to browser before truncation',
 );
 
-=head2 inline_smaller_than
-
-Inline JavaScript and CSS smaller than this size into page reducing
-round-trips to server.
-
-=cut
-
 has 'inline_smaller_than' => (
 	is => 'rw',
 	isa => 'Int',
 	default => 10240,
+	documentation => 'Inline JavaScript and CSS to reduce round-trips',
+);
+
+has 'chop_warning' => (
+	is => 'rw',
+	isa => 'Int',
+	default => 80,
+	documentation => 'Crop lines longer',
 );
 
+my %escape = ('<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '"'=>'&quot;');
+my $escape_re  = join '|' => keys %escape;
+
+sub html_escape {
+	my ( $self, $html ) = @_;
+	$html =~ s/($escape_re)/$escape{$1}/g;
+	return $html;
+}
+
+sub html_dump {
+	my $self = shift;
+	$self->html_escape( dump( @_ ) );
+}
+
 sub dom2html {
 #	warn "## dom2html ",dump( @_ );
 	return Continuity::Widget::DomNode->create( @_ )->to_string;
@@ -144,6 +159,21 @@
 
 our $icon_html;
 
+sub popup {
+	my ( $self, $name, $content, $full ) = @_;
+
+	if ( ref($content) ) {
+		$content = '<code>' . dump($content) . '</code>';
+		my $l = length($content);
+		$content = qq|<span>$l bytes</span>| if ! $full && $l > $self->dump_max_bytes;
+	} else {
+		$content = qq|<span>$content</span>|;
+	}
+
+	warn "## popup [$name] = ", length( $content ), " bytes" if $self->debug;
+	return qq|<span class="frey-popup">$name $content</span>\n|;
+}
+
 sub page {
 	my $self = shift;
 	my $a = {@_};
@@ -155,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 = '<code>' . dump($content) . '</code>';
-				my $l = length($content);
-				$content = qq|<span>$l bytes</span>| if $l > $self->dump_max_bytes;
-			} else {
-				$content = qq|<span>$content</span>|;
-			}
-			warn "### part [$name] = ", length( $content ), " bytes" if $self->debug;
-			$status_line .= qq|<span class="frey-popup">$name $content</span>\n|;
+			$status_line .= $self->popup( $name, $part->{$name} );
 		}
 	}
 
@@ -187,6 +208,8 @@
 
 	$status_line .= $self->warnings_html;
 
+	$status_line .= $self->popup( INC => { %INC }, 1 );
+
 	my	($exit,$description) = ('exit','stop server');
 		($exit,$description) = ('restart','restart server')
 		if $ENV{FREY_RESTART}; # tune labels on exit link
@@ -357,9 +380,9 @@
 };
 
 my $multiline_markers = {
-	'(' => '\)',
+	'(' => ')',
 	'{' => '}',
-	'[' => '\]',
+	'[' => ']',
 	'"' => '"',
 };
 
@@ -372,7 +395,7 @@
 
 sub warnings_html {
 	my ($self,$level) = shift;
-	$level ||= $self->debug;
+	$level ||= $self->debug,
 	my $path = $self->log_path;
 
 	my $warnings;
@@ -384,25 +407,36 @@
 		chomp;
 		$line++;
 
-		if ( $multiline_end ) {
-			undef $multiline_end if m{^$multiline_end};
-			next;
-		}
-
 		my $style = '';
 
-		if ( m{^(#*)\s+} ) {
+		if ( $multiline_end ) {
+			if ( m{^\Q$multiline_end\E} || m{^\s.+\Q$multiline_end\E;$} ) {
+#				warn "## $line end of $multiline_end in '$_'\n";
+				undef $multiline_end;
+			} else {
+#				warn "## $line skipped\n";
+			}
+		} elsif ( m{^(#*)\s+} ) {
 			my $l = $1 ? length($1) : 0;
-			$multiline_end = $multiline_markers->{$1} if m{($multiline_re)$};
-			next if $l > $level;
-			warn "## multiline_end: $multiline_end $l > $level for '$_'" if $multiline_end;
-			undef $multiline_end;
+			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;
+				next;
+			}
 
 			$style = $warn_colors->{$1}
 				? ' style="color:' . $warn_colors->{$1} . '"'
 				: '';
 
-			$warnings .= qq|<tt$style>$_</tt> <small> <a target="editor" href="/editor+$path+$line">+$line</a> </small> <br/>|;
+			my $msg = $self->html_escape( $_ );
+			my $spacer = ' ';
+			if ( length($msg) > $self->chop_warning ) {
+				$msg = substr( $msg, 0, $self->chop_warning );
+				$spacer = '&hellip;'
+			}
+			$msg =~ s{^\s}{&nbsp;}g;
+			$warnings .= qq|<tt$style>$msg</tt>$spacer<small><a target="editor" href="/editor+$path+$line">+$line</a></small><br/>|;
 			# FIXME <tt> should be <code> but CSS hates me
 		}
 	}