diff options
Diffstat (limited to 'themes/admin_wind')
| -rw-r--r-- | themes/admin_wind/css/screen.css | 4 | ||||
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 40 |
2 files changed, 27 insertions, 17 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 273ac116..a5376ff6 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -759,7 +759,7 @@ form .g-error { } .g-loading-small { - background: #e8e8e8 url('..lib/images/loading-small.gif') no-repeat center center !important; + background: #e8e8e8 url('../images/loading-small.gif') no-repeat center center !important; } /** ******************************************************************* @@ -888,10 +888,10 @@ button { background-position: .4em .3em; border: 1px solid #ccc; padding: 0; + margin-bottom: 1em; } #g-action-status { - margin-bottom: 1em; } #g-action-status li, diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index c8041069..9e011c69 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -1,9 +1,10 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> 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() ?>> |