diff options
| -rw-r--r-- | themes/admin_default/views/admin.html.php | 35 | ||||
| -rw-r--r-- | themes/default/views/page.html.php | 14 |
2 files changed, 21 insertions, 28 deletions
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index f15bf152..55f0f884 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -37,20 +37,18 @@ <? else: ?> <div id="doc3" class="yui-t7 gView"> <? endif; ?> - <div id="hd"> - <?= $theme->site_status() ?> - <div id="gHeader"> - <?= $theme->admin_header_top() ?> - <ul id="gLoginMenu"> - <li class="first"><?= html::anchor("albums/1", "Browse the Gallery") ?></li> - <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1") ?>">Logout</a></li> - </ul> - <a href="<?= url::site("albums/1") ?>"><img src="<?= url::file("themes/default/images/logo.png") ?>" id="gLogo" alt="<?= t("Gallery 3: Your Photos on Your Web Site") ?>" /></a> - <div id="gSiteAdminMenu" style="display: none"> - <?= $theme->admin_menu() ?> - </div> - <?= $theme->admin_header_bottom() ?> + <?= $theme->site_status() ?> + <div id="gHeader"> + <?= $theme->admin_header_top() ?> + <ul id="gLoginMenu"> + <li class="first"><?= html::anchor("albums/1", "Browse the Gallery") ?></li> + <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1") ?>">Logout</a></li> + </ul> + <a href="<?= url::site("albums/1") ?>"><img src="<?= url::file("themes/default/images/logo.png") ?>" id="gLogo" alt="<?= t("Gallery 3: Your Photos on Your Web Site") ?>" /></a> + <div id="gSiteAdminMenu" style="display: none"> + <?= $theme->admin_menu() ?> </div> + <?= $theme->admin_header_bottom() ?> </div> <div id="bd"> <div id="yui-main"> @@ -67,12 +65,11 @@ </div> <? endif ?> </div> - <div id="ft"> - <div id="gFooter"> - <?= $theme->admin_footer() ?> - Footer - </div> - <?= $theme->admin_credits() ?> + <div id="gFooter"> + <?= $theme->admin_footer() ?> + <div> + <?= $theme->admin_credits() ?> + </div> </div> </div> <?= $theme->admin_page_bottom() ?> diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index 6bbce475..893e6f9b 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -41,11 +41,9 @@ <body> <?= $theme->page_top() ?> <div id="doc4" class="yui-t5 gView"> - <div id="hd"> - <?= $theme->site_status() ?> - <div id="gHeader"> - <?= $theme->display("header.html") ?> - </div> + <?= $theme->site_status() ?> + <div id="gHeader"> + <?= $theme->display("header.html") ?> </div> <div id="bd"> <div id="yui-main"> @@ -60,10 +58,8 @@ <?= $theme->display("sidebar.html") ?> </div> </div> - <div id="ft"> - <div id="gFooter"> - <?= $theme->display("footer.html") ?> - </div> + <div id="gFooter"> + <?= $theme->display("footer.html") ?> </div> </div> <?= $theme->page_bottom() ?> |