diff options
| -rw-r--r-- | modules/gallery/libraries/Admin_View.php | 2 | ||||
| -rw-r--r-- | modules/gallery/libraries/Gallery_View.php | 13 | ||||
| -rw-r--r-- | modules/gallery/libraries/Theme_View.php | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php index f7de96bf..58daf3d2 100644 --- a/modules/gallery/libraries/Admin_View.php +++ b/modules/gallery/libraries/Admin_View.php @@ -100,7 +100,7 @@ class Admin_View_Core extends Gallery_View { if ($function == "head") { array_unshift($blocks, $this->combine_files($this->css, "css")); - array_unshift($blocks, $this->combine_files($this->css, "javascript")); + array_unshift($blocks, $this->combine_files($this->scripts, "javascript")); } if (Session::instance()->get("debug")) { diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php index 490fb574..40d78f94 100644 --- a/modules/gallery/libraries/Gallery_View.php +++ b/modules/gallery/libraries/Gallery_View.php @@ -74,7 +74,7 @@ class Gallery_View_Core extends View { $links = array(); $key = array(); - foreach (array_keys($this->css) as $file) { + foreach (array_keys($files) as $file) { $path = DOCROOT . $file; if (file_exists($path)) { $stats = stat($path); @@ -95,9 +95,9 @@ class Gallery_View_Core extends View { $contents = ""; foreach ($links as $link) { if ($type == "css") { - $contents .= $this->process_css($link); + $contents .= "/* $link */\n" . $this->process_css($link) . "\n"; } else { - $contents .= file_get_contents($link); + $contents .= "/* $link */\n" . file_get_contents($link) . "\n"; } } @@ -109,10 +109,11 @@ class Gallery_View_Core extends View { } if ($type == "css") { - return html::stylesheet("combined/css/$key", "screen,print,projection", true); + return "<!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->\n" . + html::stylesheet("combined/css/$key", "screen,print,projection", true); } else { - // Handcraft the script link because html::script will add a .js extenstion - return html::script("combined/javascript/$key", true); + return "<!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->\n" . + html::script("combined/javascript/$key", true); } } diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index b73a932c..898574d7 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -217,7 +217,7 @@ class Theme_View_Core extends Gallery_View { if ($function == "head") { array_unshift($blocks, $this->combine_files($this->css, "css")); - array_unshift($blocks, $this->combine_files($this->css, "javascript")); + array_unshift($blocks, $this->combine_files($this->scripts, "javascript")); } if (Session::instance()->get("debug")) { |