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.

6 files changed, 7 insertions, 7 deletions

diff --git a/modules/carousel/helpers/carousel_block.php b/modules/carousel/helpers/carousel_block.php
index f83a48da..a93cfef6 100644
--- a/modules/carousel/helpers/carousel_block.php
+++ b/modules/carousel/helpers/carousel_block.php
@@ -19,7 +19,7 @@
  */
 
 class carousel_block_Core {
-  public static function sidebar($theme) {
+  public static function sidebar_blocks($theme) {
     $block = new Block();
     $block->id = "gCarousel";
     $block->title = "Album: <a href=#>{$theme->item()->title_edit}</a>";
diff --git a/modules/gmaps/helpers/gmaps_block.php b/modules/gmaps/helpers/gmaps_block.php
index 1620e881..0d3155d1 100644
--- a/modules/gmaps/helpers/gmaps_block.php
+++ b/modules/gmaps/helpers/gmaps_block.php
@@ -19,7 +19,7 @@
  */
 
 class gmaps_block_Core {
-  public static function sidebar($theme) {
+  public static function sidebar_blocks($theme) {
     $block = new Block();
     $block->id = "gMaps";
     $block->title = _("Location");
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
index 65b60289..62c2919c 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_block.php
@@ -19,7 +19,7 @@
  */
 
 class info_block_Core {
-  public static function sidebar($theme) {
+  public static function sidebar_blocks($theme) {
     $block = new Block();
     $block->id = "gMetadata";
     $block->title = _("Item Info");
diff --git a/modules/slideshow/helpers/slideshow_block.php b/modules/slideshow/helpers/slideshow_block.php
index 8272554f..3a089d22 100644
--- a/modules/slideshow/helpers/slideshow_block.php
+++ b/modules/slideshow/helpers/slideshow_block.php
@@ -23,11 +23,11 @@ class slideshow_block_Core {
       "</script>";
   }
 
-  public static function album_top() {
+  public static function album_top($theme) {
     return "<a href=\"javascript:PicLensLite.start()\" id=\"gSlideshowLink\" class=\"gButtonLink\">Slideshow</a>";
   }
 
-  public static function photo() {
+  public static function photo_top($theme) {
     return "<a href=\"javascript:PicLensLite.start()\" id=\"gSlideshowLink\" class=\"gButtonLink\">Slideshow</a>";
   }
 }
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php
index 63486435..0ade0acf 100644
--- a/modules/tag/helpers/tag_block.php
+++ b/modules/tag/helpers/tag_block.php
@@ -19,7 +19,7 @@
  */
 
 class tag_block_Core {
-  public static function sidebar($theme) {
+  public static function sidebar_blocks($theme) {
     $block = new Block();
     $block->id = "gTag";
     $block->title = _("Tags");
diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php
index 05767253..225ff82e 100644
--- a/modules/user/helpers/user_block.php
+++ b/modules/user/helpers/user_block.php
@@ -24,7 +24,7 @@ class user_block_Core {
     return empty($user) ? "" : "<script src=\"$url\" type=\"text/javascript\"></script>";
   }
 
-  public static function top($theme) {
+  public static function header_top($theme) {
     $view = new View("login.html");
     $view->user = Session::instance()->get('user', null);
     return $view->render();