diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-29 06:44:05 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-29 06:44:05 -0700 |
| commit | 10b4eda6f0cbb44fde9fb3158bd174c82467f2ee (patch) | |
| tree | 811d72521d8ad7bfb361030c4d320aa03b17ddea /themes/admin_default | |
| parent | 42c82ef7f081630c15a5d354205896764348a76a (diff) | |
| parent | b0bb107b7ebb5edbf3bec69ae2e716552eb1adf5 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
modules/gallery/libraries/Theme_View.php
themes/admin_default/views/admin.html.php
Diffstat (limited to 'themes/admin_default')
| -rw-r--r-- | themes/admin_default/views/admin.html.php | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index 1361ae33..2a231057 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -6,7 +6,26 @@ <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <title><?= t("Admin Dashboard") ?></title> <link rel="shortcut icon" href="<?= url::file("themes/default/images/favicon.ico") ?>" type="image/x-icon" /> - <?= $theme->admin_head() ?> + + <?= $theme->css("lib/yui/reset-fonts-grids.css") ?> + <?= $theme->css("lib/themeroller/ui.base.css") ?> + <?= $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]--> + + <?= $theme->script("lib/jquery.js") ?> + <?= $theme->script("lib/jquery.form.js") ?> + <?= $theme->script("lib/jquery-ui.js") ?> + <?= $theme->script("lib/gallery.common.js") ?> + <?= $theme->script("lib/gallery.dialog.js") ?> + <?= $theme->script("lib/superfish/js/superfish.js") ?> + <?= $theme->theme_script("js/jquery.dropshadow.js") ?> + <?= $theme->theme_script("js/ui.init.js") ?> + + <?= $theme->admin_head() ?> </head> <body <?= $theme->body_attributes() ?>> |