--- trunk/lib/Frey/Web.pm 2008/11/20 14:39:43 480 +++ trunk/lib/Frey/Web.pm 2008/11/26 04:26:43 529 @@ -7,11 +7,12 @@ use Continuity::Widget::DomNode; use Data::Dump qw/dump/; -use Carp qw/confess/; +use Carp qw/confess cluck/; use File::Slurp; use Frey::Bookmarklet; use Frey::ClassBrowser; +use Frey::SVK; has 'head' => ( is => 'rw', @@ -19,16 +20,6 @@ default => sub { [ 'static/frey.css' ] }, ); -has 'status' => ( - is => 'rw', - isa => 'ArrayRef[HashRef[Str]]', - lazy => 1, - default => sub { [ - { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, - { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, - ] }, -); - has 'request_url' => ( is => 'rw', isa => 'Uri', coerce => 1, @@ -148,19 +139,25 @@ =cut +our @status; +sub status { @status }; + +our $icon_html; + sub page { my $self = shift; my $a = {@_}; + warn "## page ",dump($a); + $reload_counter++; my $status_line = ''; - foreach my $part ( @{ $self->status } ) { - if ( ref($part) ne 'HASH' ) { - warn "part not hash ",dump( $part ) ; - #$self->status( $part ); - next; - } + + unshift @status, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->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) ) { @@ -188,10 +185,25 @@ $body = ''; } + my $warn_colors = { + '#' => '#444', + '##' => '#888', + }; + $status_line - .= qq|warn| - . $self->editor_links( join("", $self->warnings ) ) - . qq|| + .= qq|warn| + . $self->editor_links( + join("", map { + warn "# $_"; + my $style = ''; + $style = $warn_colors->{$1} + ? ' style="color:' . $warn_colors->{$1} . '"' + : '' + if m{^(#+)}; + qq|$_
|; # XXX should be but CSS hates me + } $self->warnings ) + ) + . qq|| if $self->warnings; my ($exit,$description) = ('exit','stop server'); @@ -201,22 +213,29 @@ my $right = qq| - $url + reload $exit |; + my $info = Frey::SVK->info; + my $revision = Frey::SVK->info->{Revision} || ''; + $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)}; + + $self->add_icon unless $icon_html; + my $html = join("\n", qq||, $self->_head_html, '' . ( $self->title || $a->{title} || ref($self) ) . '', '', + ( $icon_html || '' ), ( $a->{head} || '' ), qq| $body
- Frey $Frey::VERSION + Frey $Frey::VERSION $revision $status_line $right
@@ -240,7 +259,11 @@ sub editor { my ( $self, $class, $line, $title ) = @_; confess "need class" unless $class; - $line ||= 1; + if ( ! defined $title ) { + $title = "edit $class"; + $title .= " line $line" if $line; + } + $line ||= 1; qq|$class|; @@ -281,4 +304,70 @@ ; } +sub add_status { + my ( $self, $data ) = @_; + push @status, $data; +} + +sub clean_status { + @status = (); + $icon_html = ''; +} + +sub status_parts { + warn "## status parts ", dump( map { keys %$_ } @status ); +} + +sub DEMOLISH { + my ( $self ) = @_; + warn "## $self DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status; +} + +=head2 add_icon + + Frey::Foo->add_icon; # /static/icons/Frey/Foo.png + Frey::Foo->add_icon('warning'); # /static/icons/Frey/Foo/warning.png + +=cut + +sub icon_path { + my ($self,$class,$variant) = @_; + my $icon = $class; + $icon =~ s{::}{/}g; + $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 $class = ref($self); + $class = $self->class if $self->can('class'); + my $icon_path = $self->icon_path( $class, $variant ) || return; + + $icon_html .= qq||; + 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|| if -e $ico_path; + +=cut + +} + 1;