diff options
Diffstat (limited to 'themes/default')
-rw-r--r-- | themes/default/views/album.html.php | 5 | ||||
-rw-r--r-- | themes/default/views/header.html.php | 4 | ||||
-rw-r--r-- | themes/default/views/page.html.php | 6 | ||||
-rw-r--r-- | themes/default/views/photo.html.php | 4 | ||||
-rw-r--r-- | themes/default/views/sidebar.html.php | 4 |
5 files changed, 15 insertions, 8 deletions
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php index ff0b441f..f4869479 100644 --- a/themes/default/views/album.html.php +++ b/themes/default/views/album.html.php @@ -2,11 +2,11 @@ <div id="gAlbumHeader"> <h1><?= $item->title_edit ?></h1> <span class="gUnderState"><?= $item->description_edit ?></span> - <?= View::album_top($theme) ?> + <?= $theme->album_top() ?> </div> <ul id="gAlbumGrid"> - <? foreach ($children as $i => $child): ?> +<? foreach ($children as $i => $child): ?> <? $album_class = ""; ?> <? if ($child->is_album()): ?> <? $album_class = "gAlbum "; ?> @@ -27,6 +27,7 @@ </ul> </li> <? endforeach ?> + <?= $theme->album_bottom() ?> </ul> <?= $theme->pager() ?> diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php index 9dba9c71..c8eb2145 100644 --- a/themes/default/views/header.html.php +++ b/themes/default/views/header.html.php @@ -1,8 +1,7 @@ <? defined("SYSPATH") or die("No direct script access."); ?> +<?= $theme->header_top() ?> <img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" /> -<?= View::top($theme) ?> - <div id="gSiteMenu" class="gClearFix"> <ul class="ui-tabs-nav"> <li><a href="<?= url::base() ?>"><?= _("HOME") ?></a></li> @@ -26,3 +25,4 @@ <? endforeach ?> <li class="active"><?= $item->title_edit ?></li> </ul> +<?= $theme->header_bottom() ?> diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index ca4a5688..8a93c9dc 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -20,11 +20,12 @@ <script src="<?= $theme->url("jquery/jquery.ui.tabs.js") ?>" type="text/javascript"></script> <!--script src="<?= $theme->url("jquery/jquery.ui.accordion.js") ?>" type="text/javascript"></script--> <!--script src="<?= $theme->url("jquery/jquery.ui.init.js") ?>" type="text/javascript"></script--> - <?= View::head($theme) ?> + <?= $theme->head() ?> </head> <body> - <div id="doc4" class="yui-t5 gView"> + <?= $theme->page_top() ?> + <div id="doc4" class="yui-t5 gView"> <div id="hd"> <div id="gHeader"> <?= $theme->display("header.html") ?> @@ -48,6 +49,7 @@ </div> </div> </div> + <?= $theme->page_bottom() ?> <? if ($user): ?> <?= $theme->in_place_edit(); ?> <? endif; ?> diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php index 88ffedf9..2a5079b4 100644 --- a/themes/default/views/photo.html.php +++ b/themes/default/views/photo.html.php @@ -1,7 +1,7 @@ <? defined("SYSPATH") or die("No direct script access."); ?> <div id="gItem"> <a href="" class="gButtonLink">Full size (1024x768)</a> - <?= View::photo($theme) ?> + <?= $theme->photo_top() ?> <img id="gPhotoID-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>" width="<?= $item->resize_width ?>" @@ -12,4 +12,6 @@ <? if (module::is_installed("comment")): ?> <?= comment::block($theme, true); ?> <? endif ?> + + <?= $theme->photo_bottom() ?> </div> diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php index fc47d72e..f05ee025 100644 --- a/themes/default/views/sidebar.html.php +++ b/themes/default/views/sidebar.html.php @@ -1,2 +1,4 @@ <? defined("SYSPATH") or die("No direct script access."); ?> -<?= View::sidebar($theme) ?> +<?= $theme->sidebar_top() ?> +<?= $theme->sidebar_blocks() ?> +<?= $theme->sidebar_bottom() ?> |