From bac4ff2046a9413ad53caca47842b63d3e5a5385 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 27 Nov 2008 16:19:07 +0000 Subject: 1) Create a Theme_View class that combines the functionality of the Theme class with the View class. 2) Only define the form.html.php::DrawForm method once if there are multiple forms on the page (i.e. comments and add tags) --- core/controllers/albums.php | 6 +-- core/controllers/photos.php | 8 +-- core/libraries/Theme.php | 107 -------------------------------------- core/libraries/Theme_View.php | 118 ++++++++++++++++++++++++++++++++++++++++++ core/tests/Theme_Test.php | 47 ----------------- 5 files changed, 121 insertions(+), 165 deletions(-) delete mode 100644 core/libraries/Theme.php create mode 100644 core/libraries/Theme_View.php delete mode 100644 core/tests/Theme_Test.php (limited to 'core') diff --git a/core/controllers/albums.php b/core/controllers/albums.php index c2935c09..50317979 100644 --- a/core/controllers/albums.php +++ b/core/controllers/albums.php @@ -27,19 +27,15 @@ class Albums_Controller extends Items_Controller { $theme_name = "default"; $page_size = 9; - $template = new View("page.html"); + $template = new Theme_View("page.html", "album", $theme_name); $page = $this->input->get("page", "1"); - $theme = new Theme($theme_name, $template); - $template->set_global("page_type", "album"); $template->set_global('page_size', $page_size); $template->set_global('item', $item); $template->set_global('children', $item->children($page_size, ($page - 1) * $page_size)); $template->set_global('children_count', $item->children_count()); $template->set_global('parents', $item->parents()); - $template->set_global('theme', $theme); - $template->set_global('user', Session::instance()->get('user', null)); $template->content = new View("album.html"); print $template; diff --git a/core/controllers/photos.php b/core/controllers/photos.php index 2e0c63f5..143c3bb8 100644 --- a/core/controllers/photos.php +++ b/core/controllers/photos.php @@ -23,18 +23,14 @@ class Photos_Controller extends Items_Controller { * @see Rest_Controller::_show($resource) */ public function _show($item) { - $template = new View("page.html"); - // @todo: this needs to be data-driven - $theme = new Theme("default", $template); + $template = new Theme_View("page.html", "photo", "default"); - $template->set_global("page_type", "photo"); $template->set_global('item', $item); $template->set_global('children', $item->children()); $template->set_global('children_count', $item->children_count()); $template->set_global('parents', $item->parents()); - $template->set_global('theme', $theme); - $template->set_global('user', Session::instance()->get('user', null)); + $template->content = new View("photo.html"); print $template; diff --git a/core/libraries/Theme.php b/core/libraries/Theme.php deleted file mode 100644 index 99a44f9f..00000000 --- a/core/libraries/Theme.php +++ /dev/null @@ -1,107 +0,0 @@ -theme_name = $theme_name; - $this->template = $template; - } - - public function url($path) { - return url::file("themes/{$this->theme_name}/$path"); - } - - public function item() { - return $this->template->item; - } - - public function page_type() { - return $this->template->page_type; - } - - public function display($page_name, $view_class="View") { - return new $view_class($page_name); - } - - public function pager() { - $this->pagination = new Pagination(); - $this->pagination->initialize( - array('query_string' => 'page', - 'total_items' => $this->template->children_count, - 'items_per_page' => $this->template->page_size, - 'style' => 'classic')); - return $this->pagination->render(); - } - - /** - * Handle all theme functions that insert module content. - */ - public function __call($function, $args) { - switch ($function) { - case "album_blocks": - case "album_bottom": - case "album_top": - case "head": - case "header_bottom": - case "header_top": - case "navigation_top": - case "navigation_bottom": - case "page_bottom": - case "page_top": - case "photo_blocks": - case "photo_top": - case "sidebar_blocks": - case "sidebar_bottom": - case "sidebar_top": - case "tag_bottom": - case "tag_top": - case "thumbnail_bottom": - case "thumbnail_info": - case "thumbnail_top": - case "photo_bottom": - // @todo: restrict access to this option - $debug = Session::instance()->get("debug", false); - - $blocks = array(); - foreach (module::get_list() as $module) { - $helper_class = "{$module->name}_block"; - if (method_exists($helper_class, $function)) { - $blocks[] = call_user_func_array( - array($helper_class, $function), - array_merge(array($this), $args)); - } - } - if ($debug) { - if ($function != "head") { - array_unshift( - $blocks, "
" . - "
$function
"); - $blocks[] = "
"; - } - } - return implode("\n", $blocks); - - default: - throw new Exception("@todo UNKNOWN_THEME_FUNCTION: $function"); - } - } -} diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php new file mode 100644 index 00000000..5bb1b843 --- /dev/null +++ b/core/libraries/Theme_View.php @@ -0,0 +1,118 @@ +theme_name = $theme_name; + $this->set_global('theme', $this); + $this->set_global('user', Session::instance()->get('user', null)); + $this->set_global("page_type", $page_type); + } + + public function url($path) { + return url::file("themes/{$this->theme_name}/$path"); + } + + public function item() { + return $this->item; + } + + public function page_type() { + return $this->page_type; + } + + public function display($page_name, $view_class="View") { + return new $view_class($page_name); + } + + public function pager() { + $this->pagination = new Pagination(); + $this->pagination->initialize( + array('query_string' => 'page', + 'total_items' => $this->children_count, + 'items_per_page' => $this->page_size, + 'style' => 'classic')); + return $this->pagination->render(); + } + + /** + * Handle all theme functions that insert module content. + */ + public function __call($function, $args) { + switch ($function) { + case "album_blocks": + case "album_bottom": + case "album_top": + case "head": + case "header_bottom": + case "header_top": + case "navigation_top": + case "navigation_bottom": + case "page_bottom": + case "page_top": + case "photo_blocks": + case "photo_top": + case "sidebar_blocks": + case "sidebar_bottom": + case "sidebar_top": + case "tag_bottom": + case "tag_top": + case "thumbnail_bottom": + case "thumbnail_info": + case "thumbnail_top": + case "photo_bottom": + // @todo: restrict access to this option + $debug = Session::instance()->get("debug", false); + + $blocks = array(); + foreach (module::get_list() as $module) { + $helper_class = "{$module->name}_block"; + if (method_exists($helper_class, $function)) { + $blocks[] = call_user_func_array( + array($helper_class, $function), + array_merge(array($this), $args)); + } + } + if ($debug) { + if ($function != "head") { + array_unshift( + $blocks, "
" . + "
$function
"); + $blocks[] = "
"; + } + } + return implode("\n", $blocks); + + default: + throw new Exception("@todo UNKNOWN_THEME_FUNCTION: $function"); + } + } +} \ No newline at end of file diff --git a/core/tests/Theme_Test.php b/core/tests/Theme_Test.php deleted file mode 100644 index 8852a6a1..00000000 --- a/core/tests/Theme_Test.php +++ /dev/null @@ -1,47 +0,0 @@ -assert_equal("http://./themes/fake_theme/file", $theme->url("file")); - } - - public function display_test() { - $theme = new Theme("fake_theme", new View()); - $view = $theme->display("test_page", "Theme_Test_Mock_View"); - $this->assert_equal("test_page", $view->page_name); - } - - public function item_test() { - $v = new View(); - $v->item = "fake_item"; - $theme = new Theme("fake_theme", $v); - $this->assert_equal("fake_item", $theme->item()); - } -} - -class Theme_Test_Mock_View { - public $page_name = null; - - public function __construct($page_name) { - $this->page_name = $page_name; - } -} \ No newline at end of file -- cgit v1.2.3