--- trunk/lib/Frey/Web.pm 2008/11/26 00:45:52 524
+++ trunk/lib/Frey/Web.pm 2008/11/26 04:26:43 529
@@ -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 {
@@ -316,33 +320,54 @@
sub DEMOLISH {
my ( $self ) = @_;
- cluck "## DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status;
+ warn "## $self 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;
+=head2 add_icon
- my $icon_path = "static/icons/$icon.png";
+ Frey::Foo->add_icon; # /static/icons/Frey/Foo.png
+ Frey::Foo->add_icon('warning'); # /static/icons/Frey/Foo/warning.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;
+=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 "can't find $icon_path";
+ 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;