--- trunk/lib/Frey/Web.pm 2008/11/26 00:45:52 524
+++ trunk/lib/Frey/Web.pm 2008/11/26 02:35:59 527
@@ -142,6 +142,8 @@
our @status;
sub status { @status };
+our $icon_html;
+
sub page {
my $self = shift;
my $a = {@_};
@@ -220,13 +222,14 @@
my $revision = Frey::SVK->info->{Revision} || '';
$revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
- $self->add_icon;
+ $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|
@@ -308,6 +311,7 @@
sub clean_status {
@status = ();
+ $icon_html = '';
}
sub status_parts {
@@ -319,18 +323,28 @@
cluck "## 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 add_icon {
- my $self = shift;
+ my ($self,$name) = @_;
my $icon = ref($self);
$icon = $self->class if $self->can('class');
$icon =~ s{::}{/}g;
+ $icon .= "/$name" if $name;
my $icon_path = "static/icons/$icon.png";
if ( -e $icon_path ) {
- $self->add_head( qq|| );
+ $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};
@@ -338,10 +352,12 @@
system "convert $icon_path $ico_path";
warn "# convert $icon_path $ico_path : $@";
}
- $self->add_head( qq|| ) if -e $ico_path;
+ $icon_html .= qq|| if -e $ico_path;
+
+=cut
} else {
- warn "can't find $icon_path";
+ warn "TODO add $icon_path icon";
}
}