stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-25 15:09:14 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert module block approach

Browse Source
This commit is contained in:
Tim Almdal
2008-11-21 07:06:11 +00:00
parent e60ddd0bd8
commit 992cf22c79
12 changed files with 14 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/controllers/welcome.php
View File

@@ -48,11 +48,12 @@ class Welcome_Controller extends Template_Controller {
function uninstall($module_name) {
if ($module_name == "core") {
// Legacy support for uninstalling the auth module
// Legacy support for uninstalling the auth module and removing the blocks table
try {
$db = Database::instance();
$db->query("DROP TABLE IF EXISTS `passwords`;");
ORM::factory("module")->where("name", "auth")->find()->delete();
$db->query("DROP TABLE IF EXISTS `blocks`;");
} catch (Exception $e) {
}

10
core/helpers/core_installer.php
View File

@@ -62,15 +62,6 @@ 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);
}
@@ -93,7 +84,6 @@ 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");
}

48
core/helpers/dynamic_block.php
View File

@@ -1,48 +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 dynamic_block_Core{
const HEAD_LINK = "link";
const HEAD_SCRIPT = "script";
const HEADER_TYPE = "header";
const FOOTER_TYPE = "footer";
const SIDE_BAR_TYPE = "sidebar";
const CONTENT_ALBUM = "album";
const CONTENT_PHOTO = "photo";
public static function define_blocks($module, $callbacks) {
// @todo create unit test for this
foreach ($callbacks as $type => $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);
}
}
}

17
core/libraries/Theme.php
View File

@@ -57,23 +57,7 @@ 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),
@@ -81,7 +65,6 @@ class Theme_Core {
'info' => info::block($this),
'gmaps' => gmaps::block($this),
);
kohana::Log("debug", print_r($blocks, true));
return $blocks;
}
}

21
core/models/block.php
View File

@@ -1,21 +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 Block_Model extends ORM {
}

25
modules/media_rss/helpers/media_rss.php
View File

@@ -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\" />";
}
}

5
modules/media_rss/helpers/media_rss_installer.php
View File

@@ -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");
}
}

9
modules/slideshow/helpers/slideshow.php
View File

@@ -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>";
}
}

7
modules/slideshow/helpers/slideshow_installer.php
View File

@@ -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");
}
}

4
themes/default/views/album.html.php
View File

@@ -2,7 +2,9 @@
<div id="gAlbumHeader">
<h1><?= $item->title_edit ?></h1>
<span class="gUnderState"><?= $item->description_edit ?></span>
<?= $theme->block(dynamic_block::CONTENT_ALBUM, "slideshow") ?>
<? if ($theme->module("slideshow")): ?>
<?= slideshow::link() ?>
<? endif; ?>
</div>
<ul id="gAlbumGrid">

7
themes/default/views/page.html.php
View File

@@ -9,13 +9,14 @@
media="screen,print,projection" />
<link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
media="screen,print,projection" />
<?= $theme->block(dynamic_block::HEAD_LINK) ?>
<link rel="alternate" type="application/rss+xml"
href="<?= url::site("media_rss/feed/{$theme->item()->id}") ?>"
/>
<script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
<script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
<?= $theme->block(dynamic_block::HEAD_SCRIPT) ?>
<!-- The following scripts would be added via the theme block mechanism -->
<script src="<?= $theme->url("js/user.js") ?>" type="text/javascript"></script>
<script src="<?= $theme->url("js/comment.js") ?>" type="text/javascript"></script>
<script src="http://lite.piclens.com/current/piclens.js" type="text/javascript"></script>
<? if ($user): ?>
<script src="<?= url::file("lib/jquery.jeditable.js") ?>" type="text/javascript"></script>
<? endif; ?>

5
themes/default/views/photo.html.php
View File

@@ -1,8 +1,9 @@
<? defined("SYSPATH") or die("No direct script access."); ?>
<div id="gItem">
<a href="" class="gButtonLink">Full size (1024x768)</a>
<?= $theme->block(dynamic_block::CONTENT_PHOTO, "slideshow") ?>
<? if ($theme->module("slideshow")): ?>
<?= slideshow::link() ?>
<? endif; ?>
<img id="gPhotoID-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>"
width="<?= $item->resize_width ?>"