--- trunk/lib/Frey/Web.pm 2009/03/12 20:56:04 1045
+++ trunk/lib/Frey/Web.pm 2009/06/30 13:58:38 1124
@@ -1,12 +1,13 @@
package Frey::Web;
use Moose::Role;
-with 'Frey::Session';
+with 'Frey::Session', 'Frey::Class::Icon';
use Data::Dump qw/dump/;
use Carp qw/confess cluck carp/;
use File::Slurp;
use Text::Tabs; # expand, unexpand
+use Digest::MD5 qw/md5/;
use lib 'lib';
@@ -196,6 +197,9 @@
sub _add_css_js {
my ( $self, $what, $content ) = @_;
+ my $md5 = md5( $content );
+ return if $self->{_add_css_js_seen}->{$what}->{$md5}++;
+
my $tag = $what eq 'css' ? 'style' : 'script';
my $type = $what eq 'css' ? 'text/css' : 'text/javascript';
my $head;
@@ -258,8 +262,6 @@
our @status;
sub status { @status };
-our $icon_html;
-
sub html_page {
my $self = shift;
my $a = {@_};
@@ -310,7 +312,7 @@
my $revision = $svk->info->{Revision} || '';
$revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
- $self->add_icon unless $icon_html;
+ $self->add_icon;
my $title = undef
|| $a->{title}
@@ -331,7 +333,7 @@
$self->_head_html,
qq|$title|,
'',
- ( $icon_html || '' ),
+ ( $self->icon_html ),
( $a->{head} || '' ),
qq|
@@ -482,13 +484,13 @@
sub clean_status {
my ($self) = shift;
+ warn "## clean_status";
@head = ( 'static/frey.css' );
@status = (
{ 'ClassBrowser' => Frey::Class::Browser->new( usage_sort => 1, usage_on_top => 0 )->as_markup },
{ 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
- { 'INC' => Frey::INC->new->as_markup },
+ { 'INC' => Frey::INC->new->as_markup },
);
- $icon_html = '';
}
=head2 status_parts
@@ -512,68 +514,6 @@
=cut
-=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) = @_;
-
- sub icon_exists {
- my $class = shift;
- $class =~ s{::}{/}g;
- $class .= "/$variant" if $variant;
- my $icon_path = 'static/icons/' . $class . '.png';
- return $icon_path if -e $icon_path;
- return;
- }
-
- my $path = icon_exists( $class );
- if ( ! $path ) {
- my $super_class = $class;
- while ( $super_class =~ s{::[^:]+$}{} && ! $path ) {
- $path = icon_exists( $super_class ) unless $super_class eq 'Frey'; # don't default on Frey icon
- }
- }
-
- if ( ! $path ) {
- $self->TODO( "add icon for $class" . ( $variant ? " variant $variant" : '' ) );
- return undef;
- }
-
- warn "# $class from $self icon_path $path" if $self->debug;
- return $path;
-}
-
-sub add_icon {
- my ($self,$variant) = @_;
-
- my $class = $self->class if $self->can('class');
- #$class ||= $self->title;
- $class ||= ref($self);
- 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
-
-}
-
my $warn_colors = {
'#' => '#444',
'##' => '#888',