diff options
Diffstat (limited to 'themes/default')
| -rw-r--r-- | themes/default/css/screen.css | 1 | ||||
| -rw-r--r-- | themes/default/views/footer.html.php | 11 | ||||
| -rw-r--r-- | themes/default/views/header.html.php | 28 | ||||
| -rw-r--r-- | themes/default/views/page.html.php | 39 |
4 files changed, 37 insertions, 42 deletions
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 5eb30bde..7cf4cfbe 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -308,7 +308,6 @@ li.gError select { .gError { background-color: #f6cbca; - color: #f00; background-image: url('../images/ico-error.png'); } diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php deleted file mode 100644 index 040a4062..00000000 --- a/themes/default/views/footer.html.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php defined("SYSPATH") or die("No direct script access.") ?> -<?= $theme->footer() ?> -<? if ($footer_text = module::get_var("gallery", "footer_text")): ?> -<?= $footer_text ?> -<? endif ?> - -<? if (module::get_var("gallery", "show_credits")): ?> -<ul id="gCredits"> - <?= $theme->credits() ?> -</ul> -<? endif ?> diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php deleted file mode 100644 index dcfa6fd8..00000000 --- a/themes/default/views/header.html.php +++ /dev/null @@ -1,28 +0,0 @@ -<?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="gBanner"> - <?= $theme->header_top() ?> - <? if ($header_text = module::get_var("gallery", "header_text")): ?> - <?= $header_text ?> - <? else: ?> - <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>"> - <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" /> - </a> - <? endif ?> - <div id="gSiteMenu"> - <?= $theme->site_menu() ?> - </div> - <?= $theme->header_bottom() ?> -</div> - -<? if (!empty($parents)): ?> -<ul class="gBreadcrumbs"> - <? foreach ($parents as $parent): ?> - <li> - <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>"> - <?= html::purify($parent->title) ?> - </a> - </li> - <? endforeach ?> - <li class="active"><?= html::purify($item->title) ?></li> -</ul> -<? endif ?> diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index 2696442b..7d181ea0 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -76,7 +76,33 @@ <div id="doc4" class="yui-t5 gView"> <?= $theme->site_status() ?> <div id="gHeader"> - <?= new View("header.html") ?> + <div id="gBanner"> + <?= $theme->header_top() ?> + <? if ($header_text = module::get_var("gallery", "header_text")): ?> + <?= $header_text ?> + <? else: ?> + <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>"> + <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" /> + </a> + <? endif ?> + <div id="gSiteMenu"> + <?= $theme->site_menu() ?> + </div> + <?= $theme->header_bottom() ?> + </div> + + <? if (!empty($parents)): ?> + <ul class="gBreadcrumbs"> + <? foreach ($parents as $parent): ?> + <li> + <a href="<?= url::site("albums/{$parent->id}?show={$theme->item()->id}") ?>"> + <?= html::purify($parent->title) ?> + </a> + </li> + <? endforeach ?> + <li class="active"><?= html::purify($theme->item()->title) ?></li> + </ul> + <? endif ?> </div> <div id="bd"> <div id="yui-main"> @@ -94,7 +120,16 @@ </div> </div> <div id="gFooter"> - <?= new View("footer.html") ?> + <?= $theme->footer() ?> + <? if ($footer_text = module::get_var("gallery", "footer_text")): ?> + <?= $footer_text ?> + <? endif ?> + + <? if (module::get_var("gallery", "show_credits")): ?> + <ul id="gCredits"> + <?= $theme->credits() ?> + </ul> + <? endif ?> </div> </div> <?= $theme->page_bottom() ?> |