From 60d35b89929d9029c794f72d6a9c38b676e282f6 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 30 Sep 2009 07:31:11 -0700
Subject: Use the block_manager to manage site sidebar panels. Fixes ticket
 #110. * Extend block_manager to handle sidebar blocks. get_available has
 become get_available_admin_blocks, get_list becomes get_admin_list. * Create
 new functions get_available_site_blocks which will look for gallery_block
 get_available_site_blocks. * Refactor sidebar_blocks into a separate function
 and then call block_manager::get_html(site.sidebar). Convert image_block to
 use block management instead of theme::sidebar_blocks * Change the
 block_manager api so that the theme is passed into the get method. convert
 info to the new sidebar block approach * Convert the user module to use the
 new sidebar block structure. remove the installers for info and image_block
 modules. * Convert tag and rss modules to the new sidebar framework. reset
 the version number to 1 for info and image_block modules. * Change the
 get_html method to ignore empty blocks and change the individual handlers to
 return an empty string if no block is generated * Add a warning message if no
 sidebar blocks are active and provide a link to the admin page that
 configures the sidebar.

---
 modules/gallery/helpers/gallery_block.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/helpers/gallery_block.php')

diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index b7816954..f2cb8ded 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class gallery_block_Core {
-  static function get_list() {
+  static function get_admin_list() {
     return array(
       "welcome" => t("Welcome to Gallery 3!"),
       "photo_stream" => t("Photo Stream"),
@@ -94,7 +94,8 @@ class gallery_block_Core {
     $form = new Forge("admin/dashboard/add_block", "", "post",
                       array("id" => "gAddDashboardBlockForm"));
     $group = $form->group("add_block")->label(t("Add Block"));
-    $group->dropdown("id")->label(t("Available Blocks"))->options(block_manager::get_available());
+    $group->dropdown("id")->label(t("Available Blocks"))
+      ->options(block_manager::get_available_admin_blocks());
     $group->submit("center")->value(t("Add to center"));
     $group->submit("sidebar")->value(t("Add to sidebar"));
     return $form;
-- 
cgit v1.2.3