A Combined javascript seems to work.

1) CSS files are added to the combined version by use of $theme->css() or $theme->css_theme() methods
2) url references in the css are converted to full paths as opposed to relative
3) @import statements in the css are resolved as well.
4) need to move the [if IE] statements into the css files so the will be honored in the browser. currently the ie fix css are always included.

3 files changed, 37 insertions, 23 deletions

diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index 50fe77c4..399a60f4 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -99,10 +99,5 @@ class Combined_Controller extends Controller {
     Kohana::close_buffers(false);
     print $content;
   }
-
-  public function __call($function, $args) {
-    array_unshift($args, $function);
-    print "<!-- " . implode("/", $args) . " -->";
-  }
 }
 
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 01496c0d..5e0d5feb 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -99,6 +99,7 @@ class Admin_View_Core extends Gallery_View {
       }
 
       if ($function == "admin_head") {
+        array_unshift($blocks, $this->combine_css());
         array_unshift($blocks, $this->combine_script());
       }
 
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 1c1dec38..b4cfde46 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -113,7 +113,6 @@ class Gallery_View_Core extends View {
   protected function combine_css() {
     $links = array();
     $key = "";
-    static $PATTERN = "#url\(\s*['|\"]{0,1}(.*?)['|\"]{0,1}\s*\)#";
 
     foreach (array_keys($this->css) as $file) {
       $path = DOCROOT . $file;
@@ -130,27 +129,12 @@ class Gallery_View_Core extends View {
     $key = md5($key);
     $cache = Cache::instance();
     $contents = $cache->get($key);
-    $docroot_length = strlen(DOCROOT);
 
+    $contents = "";
     if (empty($contents)) {
       $contents = "";
       foreach ($links as $link) {
-        $css = file_get_contents($link);
-        if (preg_match_all($PATTERN, $css, $matches, PREG_SET_ORDER)) {
-          $search = $replace = array();
-          foreach ($matches as $match) {
-            $relative = substr(realpath(dirname($link) . "/$match[1]"), $docroot_length);
-            if (!empty($relative)) {
-              $search[] = $match[1];
-              $replace[] = url::abs_file($relative);
-            } else {
-              Kohana::log("alert", sprintf("Missing URL reference '%s' in CSS file '%s' ",
-                                           $match[1], $link));
-            }
-          }
-          $css = str_replace($search, $replace, $css);
-        }
-        $contents .= $css;
+        $contents .= $this->process_css($link);
       }
       $cache->set($key, $contents, array("css"), 30 * 84600);
       if (function_exists("gzencode")) {
@@ -162,4 +146,38 @@ class Gallery_View_Core extends View {
       url::site("combined/css/$key") . "\" />";
   }
 
+  private function process_css($css_file) {
+    static $PATTERN = "#url\(\s*['|\"]{0,1}(.*?)['|\"]{0,1}\s*\)#";
+    $docroot_length = strlen(DOCROOT);
+
+    $css = file_get_contents($css_file);
+    if (preg_match_all($PATTERN, $css, $matches, PREG_SET_ORDER)) {
+      $search = $replace = array();
+      foreach ($matches as $match) {
+        $relative = substr(realpath(dirname($css_file) . "/$match[1]"), $docroot_length);
+        if (!empty($relative)) {
+          $search[] = $match[0];
+          $replace[] = "url('" . url::abs_file($relative) . "')";
+        } else {
+          Kohana::log("alert", sprintf("Missing URL reference '%s' in CSS file '%s' ",
+                                       $match[1], $css_file));
+        }
+      }
+      $css = str_replace($search, $replace, $css);
+    }
+    $imports = preg_match_all("#@import\s*['|\"]{0,1}(.*?)['|\"]{0,1};#",
+                              $css, $matches, PREG_SET_ORDER);
+
+    if ($imports) {
+      $search = $replace = array();
+      foreach ($matches as $match) {
+        Kohana::log("error", dirname($css_file) . "/$match[1]");
+        $search[] = $match[0];
+        $replace[] = $this->process_css(dirname($css_file) . "/$match[1]");
+      }
+      $css = str_replace($search, $replace, $css);
+    }
+
+    return $css;
+  }
 }
\ No newline at end of file