From 992cf22c795100a4f42c17c38cf1aaa2029af279 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 21 Nov 2008 07:06:11 +0000
Subject: Revert module block approach

---
 modules/media_rss/helpers/media_rss.php           | 25 -----------------------
 modules/media_rss/helpers/media_rss_installer.php |  5 -----
 modules/slideshow/helpers/slideshow.php           |  9 ++------
 modules/slideshow/helpers/slideshow_installer.php |  7 -------
 4 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 modules/media_rss/helpers/media_rss.php

(limited to 'modules')

diff --git a/modules/media_rss/helpers/media_rss.php b/modules/media_rss/helpers/media_rss.php
deleted file mode 100644
index c627d837..00000000
--- a/modules/media_rss/helpers/media_rss.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 media_rss_Core {
-  public static function link($theme) {
-    $url = url::site("media_rss/feed/{$theme->item()->id}");
-    return "<link rel=\"alternate\" type=\"application/rss+xml\" href=\"$url\"  />";
-  }
-}
diff --git a/modules/media_rss/helpers/media_rss_installer.php b/modules/media_rss/helpers/media_rss_installer.php
index 03ec1d34..481adf8a 100644
--- a/modules/media_rss/helpers/media_rss_installer.php
+++ b/modules/media_rss/helpers/media_rss_installer.php
@@ -24,15 +24,10 @@ class media_rss_installer {
     Kohana::log("debug", "version: $version");
     if ($version == 0) {
       module::set_version("media_rss", 1);
-
-      dynamic_block::define_blocks("media_rss", array(
-        dynamic_block::HEAD_LINK => "media_rss::link",
-      ));
     }
   }
 
   public static function uninstall() {
     module::delete("media_rss");
-    dynamic_block::remove_blocks("media_rss");
   }
 }
diff --git a/modules/slideshow/helpers/slideshow.php b/modules/slideshow/helpers/slideshow.php
index e7efd615..5fadf36b 100644
--- a/modules/slideshow/helpers/slideshow.php
+++ b/modules/slideshow/helpers/slideshow.php
@@ -17,13 +17,8 @@
  * 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_Core {
-  public static function link($theme) {
+class slideshow {
+  public static function link() {
     return "<a href=\"javascript:PicLensLite.start()\" id=\"gSlideshowLink\" class=\"gButtonLink\">Slideshow</a>";
   }
-
-  public static function script($theme) {
-    return "<script src=\"http://lite.piclens.com/current/piclens.js\" " .
-                    "type=\"text/javascript\"></script>";
-  }
 }
diff --git a/modules/slideshow/helpers/slideshow_installer.php b/modules/slideshow/helpers/slideshow_installer.php
index 08687c7b..bd8ef4fc 100644
--- a/modules/slideshow/helpers/slideshow_installer.php
+++ b/modules/slideshow/helpers/slideshow_installer.php
@@ -24,17 +24,10 @@ class slideshow_installer {
     Kohana::log("debug", "version: $version");
     if ($version == 0) {
       module::set_version("slideshow", 1);
-
-      dynamic_block::define_blocks("slideshow", array(
-        dynamic_block::CONTENT_ALBUM => "slideshow::link",
-        dynamic_block::CONTENT_PHOTO => "slideshow::link",
-        dynamic_block::HEAD_SCRIPT => "slideshow::script",
-      ));
     }
   }
 
   public static function uninstall() {
     module::delete("slideshow");
-    dynamic_block::remove_blocks("slideshow");
   }
 }
-- 
cgit v1.2.3