--- trunk/lib/Frey/Web.pm	2008/12/02 01:49:49	674
+++ trunk/lib/Frey/Web.pm	2008/12/09 20:31:42	781
@@ -86,7 +86,7 @@
 	$dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;
 	$dump = $self->html_escape( $dump );
 	$dump =~ s{\Q...\E}{…}gs;
-#	$dump =~ $self->editor_links( $dump ); # FIXME include this
+#	$dump =~ $self->html_links( $dump ); # FIXME include this
 	return "<code>$dump</code>";
 }
 
@@ -184,6 +184,17 @@
 	| );
 }
 
+sub add_js {
+	my ($self,$css) = @_;
+	my ( $package, $path, $line ) = caller;
+	$self->add_head( qq|
+	<script type="text/javascript">
+	/* via $package at $path line $line */
+	$css
+	</script>
+	| );
+}
+
 our $reload_counter = 0;
 
 
@@ -304,33 +315,42 @@
 	qq|>$class</a>|;
 }
 
-=head2 editor_links
+=head2 html_links
 
 Create HTML links to editor for perl error message
 
-  my $html = $self->editor_links( $error )
+  my $html = $self->html_links( $error )
 
 =cut
 
-sub editor_links {
+sub html_links {
 	my ( $self, $error ) = @_;
 
+	$error = $self->strip_full_path( $error );
+
 #	$error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back
 
 	# perl's backtrace
 	$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
-		{at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;
+		{at <a target="editor" href="/editor+$1+$2" title="vi $1 +$2">$1</a> line $2}gsm;
 
 	$error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
-		{$1<a target="$2" href="/$2">$2</a>$3}gsm;
+		{$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm
+	|| # or anything that looks like "Class::Name"
+	$error =~ s{"(\w+(?:::\w+)+)"}
+		{"<a target="$1" href="/$1" title="introspect $1">$1</a>"}gsm;
 
 	# method error messages
-#	$error =~ s{(method ")(\w+)"}
-#		{$1<a target="/Frey::Shell::Grep?pattern=$2">$2</a>"}gsm; # FIXME replace with link to Frey::Introspect data
+	# FIXME replace with link to Frey::Introspect data
+	$error =~ s{(method ")(\w+)(" via)}
+		{$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm;
+
+	# link paths to editor
+	$error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
+		{<a target="editor" href="/editor+$1+1" title="vi $1 [$2]">$1</a>}gsm;
 
-	# anything that looks like "Class::Name"
-	$error =~ s{"(\w+(?:::\w+)+)"}
-		{"<a target="$1" href="/$1">$1</a>"}gsm;
+	$error =~ s{(class ")([\w:]+)(")}
+		{$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm;
 
 	return $error;
 }
@@ -351,14 +371,14 @@
 	if ( $error !~ m{\n$} ) {
 		if ( my @backtrace = $self->backtrace ) {
 			$error .= "\n\t" . join( "\n\t", @backtrace );
-			$fatal = qq| class="fatal"|;
+			$fatal = qq| frey-fatal|;
 		}
 	}
 
 	warn "ERROR: $error\n";
 	return
 		qq|<pre class="frey-error$fatal">|
-		. $self->editor_links( $error ) .
+		. $self->html_links( $error ) .
 		qq|</pre>|
 		;
 }
@@ -437,6 +457,7 @@
 sub icon_path {
 	my ($self,$class,$variant) = @_;
 	my $icon = $class;
+	$icon ||= $self->title;
 	$icon =~ s{::}{/}g;
 	$icon .= "/$variant" if $variant;
 	my $path = 'static/icons/' . $icon . '.png';
@@ -497,12 +518,20 @@
 	$Frey::Bootstrap::log_path || die "no log_path?";
 }
 
-our $last_log_pos  = 0;
-our $last_log_line = 0;
-
 our $pwd = `pwd`;
 chomp $pwd;
 
+sub strip_full_path {
+	my ($self, $msg) = @_;
+	# Mojo seems to expand warn messages to full path which is annoying
+	$msg =~ s{/[^/]+/\.\./}{/}gs;
+	$msg =~ s{$pwd/*}{}gs;
+	return $msg;
+}
+
+our $last_log_pos  = 0;
+our $last_log_line = 0;
+
 sub warnings_html {
 	my ($self,$level) = shift;
 	$level ||= $self->debug,
@@ -557,11 +586,7 @@
 		if ( m{^(#*)} ) {
 
 			my $level = $1;
-			my $msg = $_;
-
-			# Mojo seems to expand warn messages to full path which is annoying
-			$msg =~ s{/[^/]+/\.\./}{/}gs;
-			$msg =~ s{$pwd/*}{}gs;
+			my $msg = $self->strip_full_path( $_ );
 
 			my $spacer = ' ';
 			my $real_msg = expand( $msg );
@@ -602,7 +627,7 @@
 	return
 		# need to wrap editor link into span so we can have links in warnings
 		  qq|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="$path \| $size -> $s bytes \| $line -> $pos lines \| level $level">warn</a><code>|
-		. $self->editor_links( $warnings )
+		. $self->html_links( $warnings )
 		. qq|</code></span>|
 		;
 }
@@ -635,4 +660,39 @@
 	return @backtrace;
 }
 
+=head2 checkbox
+
+Generate checkbox html markup from some attribute
+
+  my $html = $self->checkbox('attribute_name', $value);
+
+=cut
+
+sub checkbox {
+	my ($self,$name,$value) = @_;
+	my $checked = '';
+	my $all_checkboxes = eval { $self->$name };
+	warn "ERROR tried to get checkbox value for '$name' which is unknown: $@" if $@;
+	$all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty
+	$checked = ' checked' if grep { defined $_ && $_ eq $value } @$all_checkboxes;
+	warn "# checkbox $name $value $checked\t", $self->dump( $self->$name );
+	qq|<input name="$name" value="$value" type="checkbox"$checked>|;
+}
+
+=head2 strip
+
+Strip whitespace around content
+
+  my $stripped = strip('  no more whitespace around this   ');
+
+=cut
+
+sub strip {
+	my $t = shift;
+	$t =~ s{^\s+}{}gs;
+	$t =~ s{>\s+<}{><}gs;
+	$t =~ s{\s+$}{}gs;
+	return $t;
+}
+
 1;