From c6f0cc036df6a1306b03c987092197d8bab27111 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 22 Nov 2008 21:46:34 +0000 Subject: Move all block callbacks from View::block_type() to $theme->block_type() so that the themer has a consistent interface. Also added a bunch more callbacks and normalized the names so that the module author has plenty of options for where stuff gets put on the page. Especially renamed album/photo/sidebar to be album_blocks() photo_blocks() and sidebar_blocks() to make it clear that those are going to be larger content sections and not just basic insertion points. Used __call() to collapse all functions in the theme, which incidentally makes it trivially easy to add a new insertion point. --- themes/default/views/album.html.php | 5 +++-- themes/default/views/header.html.php | 4 ++-- themes/default/views/page.html.php | 6 ++++-- themes/default/views/photo.html.php | 4 +++- themes/default/views/sidebar.html.php | 4 +++- 5 files changed, 15 insertions(+), 8 deletions(-) (limited to 'themes') 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 @@

title_edit ?>

description_edit ?> - + album_top() ?>
+ album_bottom() ?> 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 @@ +header_top() ?> " src="url("images/logo.png") ?>" /> - -
+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 @@ - + head() ?> -
+ page_top() ?> +
display("header.html") ?> @@ -48,6 +49,7 @@
+ page_bottom() ?> in_place_edit(); ?> 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 @@
Full size (1024x768) - + photo_top() ?> photo + + photo_bottom() ?>
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 @@ - +sidebar_top() ?> +sidebar_blocks() ?> +sidebar_bottom() ?> -- cgit v1.2.3