--- trunk/lib/Frey/Web.pm 2008/11/26 03:22:21 528
+++ trunk/lib/Frey/Web.pm 2008/11/26 04:26:43 529
@@ -320,7 +320,7 @@
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;
}
=head2 add_icon
@@ -330,35 +330,44 @@
=cut
-sub add_icon {
- my ($self,$name) = @_;
- my $icon = ref($self);
- $icon = $self->class if $self->can('class');
+sub icon_path {
+ my ($self,$class,$variant) = @_;
+ my $icon = $class;
$icon =~ s{::}{/}g;
- $icon .= "/$name" if $name;
+ $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;
+ }
+}
- my $icon_path = "static/icons/$icon.png";
+sub add_icon {
+ my ($self,$variant) = @_;
- if ( -e $icon_path ) {
- $icon_html .= qq||;
- warn "# using icon $icon_path";
+ 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;
+ # 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
- } else {
- warn "TODO add $icon_path icon";
- }
}
1;