diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-01-10 22:20:12 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-01-10 22:20:12 -0800 |
| commit | 5ac49d497f51a3828c1254b5024a4aa898f86530 (patch) | |
| tree | 9463433526813e5fd234a351308b7ce1c15c9e70 /themes/admin_wind | |
| parent | 9dfb733ad7d5e7e5aa002833d52d1b8642609161 (diff) | |
Create new APIs for allowing themers to control what CSS/JS get
combined and when. Backwards compatible in that old themes will work,
but their CSS/JS will no longer be combined unless they make some
changes. Fixes #1600.
Diffstat (limited to 'themes/admin_wind')
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index c8041069..54b30c6f 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -4,6 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <? $theme->start_combining("script,css") ?> <title> <? if ($page_title): ?> <?= t("Gallery Admin: %page_title", array("page_title" => $page_title)) ?> @@ -11,8 +12,26 @@ <?= t("Admin dashboard") ?> <? endif ?> </title> - <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" /> + <link rel="shortcut icon" + href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" + type="image/x-icon" /> + <?= $theme->script("jquery.js") ?> + <?= $theme->script("jquery.form.js") ?> + <?= $theme->script("jquery-ui.js") ?> + <?= $theme->script("gallery.common.js") ?> + <? /* MSG_CANCEL is required by gallery.dialog.js */ ?> + <script type="text/javascript"> + var MSG_CANCEL = <?= t("Cancel")->for_js() ?>; + </script> + <?= $theme->script("gallery.ajax.js") ?> + <?= $theme->script("gallery.dialog.js") ?> + <?= $theme->script("superfish/js/superfish.js") ?> + + <?= $theme->admin_head() ?> + + <? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?> + <?= $theme->script("ui.init.js") ?> <?= $theme->css("yui/reset-fonts-grids.css") ?> <?= $theme->css("themeroller/ui.base.css") ?> <?= $theme->css("superfish/css/superfish.css") ?> @@ -22,20 +41,11 @@ media="screen,print,projection" /> <![endif]--> - <?= $theme->script("jquery.js") ?> - <?= $theme->script("jquery.form.js") ?> - <?= $theme->script("jquery-ui.js") ?> - <?= $theme->script("gallery.common.js") ?> - <? /* MSG_CANCEL is required by gallery.dialog.js */ ?> - <script type="text/javascript"> - var MSG_CANCEL = <?= t("Cancel")->for_js() ?>; - </script> - <?= $theme->script("gallery.ajax.js") ?> - <?= $theme->script("gallery.dialog.js") ?> - <?= $theme->script("superfish/js/superfish.js") ?> - <?= $theme->script("ui.init.js") ?> + <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below --> + <?= $theme->get_combined("script") ?> - <?= $theme->admin_head() ?> + <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below --> + <?= $theme->get_combined("css") ?> </head> <body <?= $theme->body_attributes() ?>> |