[Jifty-commit] r1315 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: trs
Date: Sun Jun 18 21:39:23 2006
New Revision: 1315

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/Web.pm

Log:
 r13219 at zot:  tom | 2006-06-18 21:37:37 -0400
 CSS::Squish now supports multiple search roots, so now we can support Jifty's static root


Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Sun Jun 18 21:39:23 2006
@@ -10,7 +10,7 @@
 requires('Class::Container');
 requires('Class::Data::Inheritable');
 requires('Compress::Zlib');
-requires('CSS::Squish' => 0.01 );
+requires('CSS::Squish' => 0.04 );
 requires('DBD::SQLite' => 1.11 );
 requires('Data::Page');
 requires('DateTime');

Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Sun Jun 18 21:39:23 2006
@@ -1039,13 +1039,20 @@
                            'css'
                       );
 
-         my $css = CSS::Squish->concatenate(
-                      Jifty::Util->absolute_path(
-                          File::Spec->catpath( '', $css_dir, 'main.css' )
-                      )
-                   );
+        CSS::Squish->roots(
+            File::Spec->catdir(
+                Jifty->config->framework('Web')->{'DefaultStaticRoot'},
+                'css'
+            )
+        );
+        
+        my $css = CSS::Squish->concatenate(
+                     Jifty::Util->absolute_path(
+                         File::Spec->catpath( '', $css_dir, 'main.css' )
+                     )
+                  );
 
-         __PACKAGE__->cached_css( $css );
+        __PACKAGE__->cached_css( $css );
         __PACKAGE__->cached_css_digest( md5_hex( $css ) );
         __PACKAGE__->cached_css_mtime( time );
     }