diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-06-29 20:21:25 -0700 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-06-29 20:21:25 -0700 |
| commit | e3b4c6a57747429033ad9fd3d4ee321b93dcc1ad (patch) | |
| tree | 3e110f73136225c01bf1241b26b7ea557ccfe5ca | |
| parent | fe668abcb3612ec1b769e8b976a0aec856c21426 (diff) | |
| parent | f5f74e3638e31517e7513a3d9cbda48d9806a904 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | modules/gallery/libraries/Admin_View.php | 2 | ||||
| -rw-r--r-- | themes/admin_default/views/admin.html.php | 7 | ||||
| -rw-r--r-- | themes/default/views/page.html.php | 3 |
3 files changed, 7 insertions, 5 deletions
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")); } 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): ?> |