Rename theme callback helpers from xxx_block to xxx_theme to make room

for us to rename the dashboard helper to be a block helper since
sidebar blocks are not just in the dashboard.

13 files changed, 14 insertions, 16 deletions

diff --git a/core/helpers/core_block.php b/core/helpers/core_theme.php
index 48e158be..0ccad457 100644
--- a/core/helpers/core_block.php
+++ b/core/helpers/core_theme.php
@@ -17,8 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
-class core_block_Core {
+class core_theme_Core {
   static function head($theme) {
     $buf = "";
     if (Session::instance()->get("debug")) {
@@ -39,7 +38,7 @@ class core_block_Core {
       return "<div class=\"gQuick\" href=\"$edit_link\"></div>";
     }
   }
-  
+
   static function thumb_top($theme, $child) {
     if ($child->type == "photo" && access::can("edit", $child)) {
       $edit_link = url::site("quick/pane/$child->id");
diff --git a/core/libraries/Admin_View.php b/core/libraries/Admin_View.php
index af2d7fa8..e15c0d68 100644
--- a/core/libraries/Admin_View.php
+++ b/core/libraries/Admin_View.php
@@ -93,7 +93,7 @@ class Admin_View_Core extends View {
     case "admin_head":
       $blocks = array();
       foreach (module::installed() as $module) {
-        $helper_class = "{$module->name}_block";
+        $helper_class = "{$module->name}_theme";
         if (method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
             array($helper_class, $function),
diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php
index 38e8e056..1f8ca559 100644
--- a/core/libraries/Theme_View.php
+++ b/core/libraries/Theme_View.php
@@ -165,7 +165,7 @@ class Theme_View_Core extends View {
     case "photo_bottom":
       $blocks = array();
       foreach (module::installed() as $module) {
-        $helper_class = "{$module->name}_block";
+        $helper_class = "{$module->name}_theme";
         if (method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
             array($helper_class, $function),
diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_theme.php
index d8f08feb..3861bae0 100644
--- a/modules/comment/helpers/comment_block.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class comment_block_Core {
+class comment_theme_Core {
   static function head($theme) {
     $url = url::file("modules/comment/js/comment.js");
     return "<script src=\"$url\" type=\"text/javascript\"></script>\n";
diff --git a/modules/gmaps/helpers/gmaps_block.php b/modules/gmaps/helpers/gmaps_theme.php
index 06894005..582eccfe 100644
--- a/modules/gmaps/helpers/gmaps_block.php
+++ b/modules/gmaps/helpers/gmaps_theme.php
@@ -17,8 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
-class gmaps_block_Core {
+class gmaps_theme_Core {
   static function sidebar_blocks($theme) {
     if ($theme->item()) {
       $block = new Block();
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_theme.php
index c832b4f6..3b90c640 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_theme.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class info_block_Core {
+class info_theme_Core {
   static function sidebar_blocks($theme) {
     if ($theme->item()) {
       $block = new Block();
diff --git a/modules/media_rss/helpers/media_rss_block.php b/modules/media_rss/helpers/media_rss_theme.php
index 80fb009e..84788e61 100644
--- a/modules/media_rss/helpers/media_rss_block.php
+++ b/modules/media_rss/helpers/media_rss_theme.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class media_rss_block_Core {
+class media_rss_theme_Core {
   static function head($theme) {
     if ($theme->item()) {
       $url = media_rss::item_feed($theme->item());
diff --git a/modules/polar_rose/helpers/polar_rose_block.php b/modules/polar_rose/helpers/polar_rose_theme.php
index 85486917..aefc6713 100644
--- a/modules/polar_rose/helpers/polar_rose_block.php
+++ b/modules/polar_rose/helpers/polar_rose_theme.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class polar_rose_block_Core {
+class polar_rose_theme_Core {
   static function head($theme) {
     if (module::is_installed("media_rss")) {
       if ($theme->item()) {
diff --git a/modules/rearrange/helpers/rearrange_block.php b/modules/rearrange/helpers/rearrange_theme.php
index 999be91e..832e7200 100644
--- a/modules/rearrange/helpers/rearrange_block.php
+++ b/modules/rearrange/helpers/rearrange_theme.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class rearrange_block_Core {
+class rearrange_theme_Core {
   static function head($theme) {
     $head[] = html::script("modules/rearrange/js/jquery.gallery.rearrange.tree.js");
 
diff --git a/modules/search/helpers/search_block.php b/modules/search/helpers/search_theme.php
index e390b9fc..63cc41c4 100644
--- a/modules/search/helpers/search_block.php
+++ b/modules/search/helpers/search_theme.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class search_block_Core {
+class search_theme_Core {
   static function header_top($theme) {
     $view = new View("search_link.html");
     return $view->render();
diff --git a/modules/slideshow/helpers/slideshow_block.php b/modules/slideshow/helpers/slideshow_theme.php
index 6a5a3f95..56349dda 100644
--- a/modules/slideshow/helpers/slideshow_block.php
+++ b/modules/slideshow/helpers/slideshow_theme.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class slideshow_block_Core {
+class slideshow_theme_Core {
   static function head($theme) {
     return "<script src=\"http://lite.piclens.com/current/piclens.js\" type=\"text/javascript\">" .
       "</script>";
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_theme.php
index 8436dd08..7a014d24 100644
--- a/modules/tag/helpers/tag_block.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class tag_block_Core {
+class tag_theme_Core {
   static function head($theme) {
     $url = url::file("modules/tag/js/tag.js");
     return "<script src=\"$url\" type=\"text/javascript\"></script>";
diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_theme.php
index bb9e567f..68424708 100644
--- a/modules/user/helpers/user_block.php
+++ b/modules/user/helpers/user_theme.php
@@ -17,7 +17,7 @@
  * 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 {
+class user_theme_Core {
   static function head($theme) {
     // @todo: move this into the theme
     $user = user::active();