From b579db51733135a49c3d936caa80b61eba7cfb87 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 29 Jun 2009 20:08:35 -0700
Subject: Oops, "head" => "admin_head" to make the admin dashboard work.

---
 modules/gallery/libraries/Admin_View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 58daf3d2..47770a90 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -98,7 +98,7 @@ class Admin_View_Core extends Gallery_View {
         }
       }
 
-      if ($function == "head") {
+      if ($function == "admin_head") {
         array_unshift($blocks, $this->combine_files($this->css, "css"));
         array_unshift($blocks, $this->combine_files($this->scripts, "javascript"));
       }
-- 
cgit v1.2.3


From f5f74e3638e31517e7513a3d9cbda48d9806a904 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 29 Jun 2009 20:12:27 -0700
Subject: Remove fix-ie.css scripts from the combined bundle, since we only
 want to load them conditionally.

---
 themes/admin_default/views/admin.html.php | 7 ++++---
 themes/default/views/page.html.php        | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 2a231057..fed1afe6 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -12,9 +12,10 @@
     <?= $theme->css("lib/superfish/css/superfish.css") ?>
     <?= $theme->css("themes/default/css/screen.css") ?>
     <?= $theme->theme_css("css/screen.css") ?>
-   <!--[if IE]>
-    <?= $theme->theme_css("css/fix-ie.css") ?>
-   <![endif]-->
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
+          media="screen,print,projection" />
+    <![endif]-->
 
    <?= $theme->script("lib/jquery.js") ?>
    <?= $theme->script("lib/jquery.form.js") ?>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 2e68f571..519a0c39 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -29,7 +29,8 @@
     <?= $theme->css("lib/themeroller/ui.base.css") ?>
     <?= $theme->theme_css("css/screen.css") ?>
     <!--[if lt IE 8]>
-    <?= $theme->theme_css("css/fix-ie.css") ?>
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
+          media="screen,print,projection" />
     <![endif]-->
     <? if ($theme->page_type == 'album'): ?>
       <? if ($thumb_proportion != 1): ?>
-- 
cgit v1.2.3