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/user/helpers/user_block.php | 46 +++++++++++++++++++++++++++++++++++++
 modules/user/helpers/user_theme.php | 17 --------------
 2 files changed, 46 insertions(+), 17 deletions(-)
 create mode 100644 modules/user/helpers/user_block.php

(limited to 'modules/user/helpers')

diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php
new file mode 100644
index 00000000..e7671f06
--- /dev/null
+++ b/modules/user/helpers/user_block.php
@@ -0,0 +1,46 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class user_block_Core {
+  static function get_site_list() {
+    return array("language" => t("Language Preference"));
+  }
+
+  static function get($block_id, $theme) {
+    $block = "";
+    switch ($block_id) {
+    case "language":
+      $locales = locales::installed();
+      foreach ($locales as $locale => $display_name) {
+        $locales[$locale] = SafeString::of_safe_html($display_name);
+      }
+      if (count($locales) > 1) {
+        $block = new Block();
+        $block->css_id = "gUserLanguageBlock";
+        $block->title = t("Language Preference");
+        $block->content = new View("user_languages_block.html");
+        $block->content->installed_locales =
+          array_merge(array("" => t("« none »")), $locales);
+        $block->content->selected = (string) user::cookie_locale();
+      }
+      break;
+    }
+    return $block;
+  }
+}
\ No newline at end of file
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 098d87fd..69d63eaf 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -33,21 +33,4 @@ class user_theme_Core {
       return $view->render();
     }
   }
-
-  static function sidebar_blocks($theme) {
-    $locales = locales::installed();
-    foreach ($locales as $locale => $display_name) {
-      $locales[$locale] = SafeString::of_safe_html($display_name);
-    }
-    if (count($locales) > 1) {
-      $block = new Block();
-      $block->css_id = "gUserLanguageBlock";
-      $block->title = t("Language Preference");
-      $block->content = new View("user_languages_block.html");
-      $block->content->installed_locales =
-        array_merge(array("" => t("« none »")), $locales);
-      $block->content->selected = (string) user::cookie_locale();
-      return $block;
-    }
-  }
 }
-- 
cgit v1.2.3