From b78cee63950479abfa78df37a03388007f332543 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 20 Nov 2008 17:32:58 +0000 Subject: A look at away to allow modules to define html head contents (links and js) and also allow modules to contribute blocks to the layout. --- core/helpers/core_installer.php | 10 +++++++++ core/helpers/dynamic_block.php | 48 +++++++++++++++++++++++++++++++++++++++++ core/libraries/Theme.php | 17 +++++++++++++++ core/models/block.php | 21 ++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 core/helpers/dynamic_block.php create mode 100644 core/models/block.php (limited to 'core') diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php index e0e4f7d9..c627145a 100644 --- a/core/helpers/core_installer.php +++ b/core/helpers/core_installer.php @@ -62,6 +62,15 @@ class core_installer { KEY `type` (`type`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;"); + $db->query("CREATE TABLE `blocks` ( + `id` int(9) NOT NULL auto_increment, + `module` char(255) NOT NULL, + `type` char(32) NOT NULL, + `method` char(255) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY(`type`, `module`)) + ENGINE=InnoDB DEFAULT CHARSET=utf8;"); + foreach (array("albums", "resizes") as $dir) { @mkdir(VARPATH . $dir); } @@ -84,6 +93,7 @@ class core_installer { $db = Database::instance(); $db->query("DROP TABLE IF EXISTS `items`;"); $db->query("DROP TABLE IF EXISTS `modules`;"); + $db->query("DROP TABLE IF EXISTS `blocks`;"); system("/bin/rm -rf " . VARPATH . "albums"); system("/bin/rm -rf " . VARPATH . "resizes"); } diff --git a/core/helpers/dynamic_block.php b/core/helpers/dynamic_block.php new file mode 100644 index 00000000..db302bc9 --- /dev/null +++ b/core/helpers/dynamic_block.php @@ -0,0 +1,48 @@ + $method) { + $block = ORM::factory("block"); + $block->module = $module; + $block->type = $type; + $block->method = $method; + $block->save(); + } + } + + public static function remove_blocks($module) { + // @todo and don't forget one for this + try { + ORM::factory("block")->where("module",$module)->find()->delete(); + } catch (Exception $e) { + Kohana::log("error", $e); + } + } +} diff --git a/core/libraries/Theme.php b/core/libraries/Theme.php index 4bd8237a..642bfb87 100644 --- a/core/libraries/Theme.php +++ b/core/libraries/Theme.php @@ -57,7 +57,23 @@ class Theme_Core { return new View("in_place_edit.html"); } + public function block($type, $module=null) { + $block = ORM::factory("block") + ->where("type", $type); + if (isset($module)) { + $block->where("module", $module); + } + $result = $block->find_all(); + $blocks = ""; + foreach ($result as $block) { + $blocks .= call_user_func($block->method, $this); + } + + return $blocks; + } + public function blocks() { + // @todo make type mandatory, its only optional while i try this out for slideshow /** @todo: make this data driven */ $blocks = array( 'carousel' => carousel::block($this), @@ -65,6 +81,7 @@ class Theme_Core { 'info' => info::block($this), 'gmaps' => gmaps::block($this), ); + kohana::Log("debug", print_r($blocks, true)); return $blocks; } } diff --git a/core/models/block.php b/core/models/block.php new file mode 100644 index 00000000..20bcee4d --- /dev/null +++ b/core/models/block.php @@ -0,0 +1,21 @@ +