--- trunk/lib/Frey/Web.pm	2008/11/26 02:35:59	527
+++ trunk/lib/Frey/Web.pm	2008/11/26 16:17:17	535
@@ -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;
@@ -185,26 +200,7 @@
 		$body = '<!-- no body -->';
 	}
 
-	my $warn_colors = {
-		'#'  => '#444',
-		'##' => '#888',
-	};
-
-	$status_line
-		.= qq|<span class="frey-popup">warn<span>|
-		. $self->editor_links(
-			join("", map {
-				warn "# $_";
-				my $style = '';
-				$style = $warn_colors->{$1}
-					? ' style="color:' . $warn_colors->{$1} . '"'
-					: ''
-					if m{^(#+)};
-				qq|<tt$style>$_</tt><br/>|; # XXX <tt> should be <code> but CSS hates me
-			} $self->warnings )
-		)
-		. qq|</span></span>|
-		if $self->warnings;
+	$status_line .= $self->warnings_html;
 
 	my	($exit,$description) = ('exit','stop server');
 		($exit,$description) = ('restart','restart server')
@@ -320,7 +316,7 @@
 
 sub DEMOLISH {
 	my ( $self ) = @_;
-	cluck "## DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status;
+	warn "## $self DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status;
 }
 
 =head2 add_icon
@@ -330,35 +326,119 @@
 
 =cut
 
-sub add_icon {
-	my ($self,$name) = @_;
-	my $icon = ref($self);
-	$icon = $self->class if $self->can('class');
+sub icon_path {
+	my ($self,$class,$variant) = @_;
+	my $icon = $class;
 	$icon =~ s{::}{/}g;
-	$icon .= "/$name" if $name;
+	$icon .= "/$variant" if $variant;
+	my $path = 'static/icons/' . $icon . '.png';
+	if ( -e $path ) {
+		warn "# $class from $self icon_path $path";
+		return $path;
+	} else {
+		warn "TODO: add $path icon for $class";
+		return undef;
+	}
+}
+
+sub add_icon {
+	my ($self,$variant) = @_;
 
-	my $icon_path = "static/icons/$icon.png";
+	my $class = ref($self);
+	$class = $self->class if $self->can('class');
+	my $icon_path = $self->icon_path( $class, $variant ) || return;
 
-	if ( -e $icon_path ) {
-		$icon_html .= qq|<link rel="icon" type="image/png" href="/$icon_path">|;
-		warn "# using icon $icon_path";
+	$icon_html .= qq|<link rel="icon" type="image/png" href="/$icon_path">|;
+	warn "# using icon $icon_path";
 
 =for later
 
-		# FIXME http://en.wikipedia.org/wiki/Favicon suggest just rel="icon" but that doesn't seem to work!
-		my $ico_path = $icon_path;
-		$ico_path =~ s{png$}{ico};
-		if ( ! -e $ico_path ) {
-			system "convert $icon_path $ico_path";
-			warn "# convert $icon_path $ico_path : $@";
-		}
-		$icon_html .= qq|<link rel="shortcut icon" type="image/x-icon" href="/$ico_path">| if -e $ico_path;
+	# FIXME http://en.wikipedia.org/wiki/Favicon suggest just rel="icon" but that doesn't seem to work!
+	my $ico_path = $icon_path;
+	$ico_path =~ s{png$}{ico};
+	if ( ! -e $ico_path ) {
+		system "convert $icon_path $ico_path";
+		warn "# convert $icon_path $ico_path : $@";
+	}
+	$icon_html .= qq|<link rel="shortcut icon" type="image/x-icon" href="/$ico_path">| if -e $ico_path;
 
 =cut
 
-	} else {
-		warn "TODO add $icon_path icon";
+}
+
+my $warn_colors = {
+	'#'  => '#444',
+	'##' => '#888',
+};
+
+my $multiline_markers = {
+	'(' => ')',
+	'{' => '}',
+	'[' => ']',
+	'"' => '"',
+};
+
+my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
+warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
+
+sub log_path {
+	$Frey::Bootstrap::log_path || warn "no log_path?";
+}
+
+sub warnings_html {
+	my ($self,$level) = shift;
+	$level ||= $self->debug,
+	my $path = $self->log_path;
+
+	my $warnings;
+	my $line = 0;
+	my $multiline_end;
+
+	open(my $log, '<', $path) || die "can't open $path: $!";
+	while(<$log>) {
+		chomp;
+		$line++;
+
+		my $style = '';
+
+		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;
+			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} . '"'
+				: '';
+
+			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
+		}
 	}
+	close($log) || die "can't close $path: $!";
+
+	return
+		  qq|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="open $path level $level">warn</a><span>|
+		. $self->editor_links( $warnings )
+		. qq|</span></span>|
+		;
 }
 
 1;