--- trunk/lib/Frey/Web.pm	2008/12/14 22:47:48	839
+++ trunk/lib/Frey/Web.pm	2008/12/24 21:32:14	892
@@ -94,7 +94,7 @@
 sub popup    { my $self = shift; $self->popup_dropdown('popup',    @_); }
 sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }
 
-our $re_html = qr{<(?:!--.+?--|(\w+).+?/\1|[^>]+/?)>}s; # relaxed html check for one semi-valid tag
+our $re_html = qr{<(?:!--|(\w+)|[^>]+)/?>}s; # relaxed html check for one semi-valid tag
 
 sub popup_dropdown {
 	my ( $self, $type, $name, $content, $full ) = @_;
@@ -116,9 +116,11 @@
 	}
 }
 
-sub _inline_path {
+sub _inline {
 	my ( $self, $path ) = @_;
-	-s $path < $self->inline_smaller_than;
+	return unless defined $path;
+	warn "# _inline $path";
+	-e $path && -s $path < $self->inline_smaller_than && -s $path;
 }
 
 sub _head_html {
@@ -127,12 +129,14 @@
 	foreach my $path ( @head ) {
 		$path =~ s!^/!!;
 		if ( $path =~ m/\.js$/ ) {
-			$out .= $self->_inline_path( $path ) ?
-				qq|<script type="text/javascript">\n/* inline $path */\n\n| . read_file($path) . qq|\n</script>| :
+			my $size;
+			$out .= $size = _inline( $path ) ?
+				qq|<script type="text/javascript">\n/* inline $path $size bytes */\n\n| . read_file($path) . qq|\n</script>| :
 				qq|<script type="text/javascript" src="/$path"></script>|;
 		} elsif ( $path =~ m/\.css$/ ) {
-			$out .= $self->_inline_path( $path ) ?
-				qq|<style type="text/css">\n/* inline $path */\n\n| . read_file( $path ) . qq|\n</style>| :
+			my $size;
+			$out .= $size = _inline( $path ) ?
+				qq|<style type="text/css">\n/* inline $path $size bytes */\n\n| . read_file( $path ) . qq|\n</style>| :
 				qq|<link type="text/css" rel="stylesheet" href="/$path" media="screen">|;
 		} elsif ( $path =~ m{<.+>}s ) {
 			$out .= $path;
@@ -185,16 +189,21 @@
 
 	if ( $content =~ m{\.(js|css)} ) {
 		$content = "/$content" if -e $content;
-		if ( $what eq 'js' ) {
+		if ( $content =~ $re_html ) {
+			$head = qq|
+				$content
+				<!-- $type via $package at $path line $line -->
+			|;
+		} elsif ( $what eq 'js' ) {
 			$head = qq|
 				<$tag type="$type" src="$content">
-				/* via $package at $path line $line */
+				/* $what via $package at $path line $line */
 				</$tag>
 			|;
 		} else {
 			$head = qq|
 				<link rel="stylesheet" type="$type" href="$content">
-				<!-- via $package at $path line $line -->
+				<!-- $what via $package at $path line $line -->
 			|;
 		}
 	} else {
@@ -240,8 +249,6 @@
 	my $self = shift;
 	my $a = {@_};
 
-	warn "## page ",dump($a);
-
 	$reload_counter++;
 
 	my $status_line = '';