--- trunk/lib/Frey/Web.pm 2008/11/25 00:26:15 507
+++ trunk/lib/Frey/Web.pm 2008/11/26 00:45:52 524
@@ -7,7 +7,7 @@
use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
-use Carp qw/confess/;
+use Carp qw/confess cluck/;
use File::Slurp;
use Frey::Bookmarklet;
@@ -20,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,
@@ -149,19 +139,23 @@
=cut
+our @status;
+sub status { @status };
+
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) ) {
@@ -217,12 +211,16 @@
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;
my $html = join("\n",
qq||,
@@ -258,7 +256,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|;
@@ -301,8 +303,46 @@
sub add_status {
my ( $self, $data ) = @_;
- push @{ $self->status }, $data;
- warn "## current status ", $#{ $self->status }, " elements";
+ push @status, $data;
+}
+
+sub clean_status {
+ @status = ();
+}
+
+sub status_parts {
+ warn "## status parts ", dump( map { keys %$_ } @status );
+}
+
+sub DEMOLISH {
+ my ( $self ) = @_;
+ cluck "## DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status;
+}
+
+sub add_icon {
+ my $self = shift;
+ my $icon = ref($self);
+ $icon = $self->class if $self->can('class');
+ $icon =~ s{::}{/}g;
+
+ my $icon_path = "static/icons/$icon.png";
+
+ if ( -e $icon_path ) {
+ $self->add_head( qq|| );
+ warn "# using icon $icon_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 : $@";
+ }
+ $self->add_head( qq|| ) if -e $ico_path;
+
+ } else {
+ warn "can't find $icon_path";
+ }
}
1;