diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-08-31 18:04:21 +0300 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-08-31 18:04:21 +0300 |
| commit | 0b6664e8f9d19df025739bc4a0cf1821563d6b3d (patch) | |
| tree | 5b1de2331d4a9d0eb8d97bbb74be6d794d6260a1 /themes/admin_wind | |
| parent | 0a128bab0a788288c5291491a68bd1c9ab432825 (diff) | |
| parent | 23d59dec7240dfa4bffe9d88f46a848e76ce0134 (diff) | |
Merge remote branch 'gallery3/master'
Diffstat (limited to 'themes/admin_wind')
| -rw-r--r-- | themes/admin_wind/css/screen.css | 20 | ||||
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 8 |
2 files changed, 5 insertions, 23 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 2ea60402..81b1a896 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -399,26 +399,6 @@ th { background-color: #FFF; } -/* Theme options ~~~~~~~~~~~~~~~~~~~~~~~~ */ -#g-theme-options-form { - border: 1px solid #a6c9e2; -} -#g-theme-options-form-tabs { - border: none !important; -} -#g-theme-options-form fieldset { - border: none; -} - -.ui-tabs .ui-tabs-nav li a { - padding: 0 1em; -} - -.ui-tabs .ui-tabs-nav li a.g-error { - background: none no-repeat scroll 0 0 transparent; - color: #FF0000 !important; -} - /* Language options ~~~~~~~~~~~~~~~~~~~~~~~~ */ #g-share-translations-form fieldset { border: 0px; diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index f9ef18c7..c4b51f41 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -11,7 +11,7 @@ <?= t("Admin dashboard") ?> <? endif ?> </title> - <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" /> + <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" /> <?= $theme->css("yui/reset-fonts-grids.css") ?> <?= $theme->css("themeroller/ui.base.css") ?> @@ -77,9 +77,11 @@ </div> <div id="g-footer" class="g-inline ui-helper-clearfix"> <?= $theme->admin_footer() ?> - <div> + <? if (module::get_var("gallery", "show_credits")): ?> + <ul id="g-credits" class="g-inline"> <?= $theme->admin_credits() ?> - </div> + </ul> + <? endif ?> </div> </div> <?= $theme->admin_page_bottom() ?> |