--- trunk/lib/Frey/Web.pm 2008/12/02 02:01:23 677
+++ trunk/lib/Frey/Web.pm 2008/12/09 20:31:26 764
@@ -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 "$dump
";
}
@@ -184,6 +184,17 @@
| );
}
+sub add_js {
+ my ($self,$css) = @_;
+ my ( $package, $path, $line ) = caller;
+ $self->add_head( qq|
+
+ | );
+}
+
our $reload_counter = 0;
@@ -304,17 +315,19 @@
qq|>$class|;
}
-=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)][$1$2
$3]gs; # FIXME insert bless hiding back
# perl's backtrace
@@ -332,6 +345,12 @@
$error =~ s{(method ")(\w+)(" via)}
{$1$2$3}gsm;
+ # link paths to editor
+ $error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
+ {$1}gsm;
+
+ $error =~ s{(class ")([\w:]+)(")}
+ {$1$2$3}gsm;
return $error;
}
@@ -352,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|
| - . $self->editor_links( $error ) . + . $self->html_links( $error ) . qq|| ; } @@ -438,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'; @@ -498,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, @@ -558,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 ); @@ -603,7 +627,7 @@ return # need to wrap editor link into span so we can have links in warnings qq|warn
|
- . $self->editor_links( $warnings )
+ . $self->html_links( $warnings )
. qq|
|
;
}
@@ -636,4 +660,23 @@
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||;
+}
+
1;