From ce43f29e2ceaac3d638061f81dc6037b5e0018d3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 27 Aug 2011 11:18:07 -0700
Subject: Refactor the display context code a bit: 1) Move the display context
 code into the controller themselves so that it's    more logically a
 continuation callback from the original controller    rendering code. 2)
 Simplify the display context set/get code and put it in the item helper,   
 it's just a couple of lines of code now. 3) Add more descriptive breadcrumb
 strings

---
 modules/tag/controllers/tag.php               | 34 +++++++++++++++----
 modules/tag/libraries/Tag_Display_Context.php | 49 ---------------------------
 2 files changed, 28 insertions(+), 55 deletions(-)
 delete mode 100644 modules/tag/libraries/Tag_Display_Context.php

(limited to 'modules/tag')

diff --git a/modules/tag/controllers/tag.php b/modules/tag/controllers/tag.php
index 1628f0ac..559e2a5a 100644
--- a/modules/tag/controllers/tag.php
+++ b/modules/tag/controllers/tag.php
@@ -50,10 +50,6 @@ class Tag_Controller extends Controller {
     }
 
     $root = item::root();
-    Display_Context::factory("tag")
-      ->set(array("tag" => $tag))
-      ->save();
-
     $template = new Theme_View("page.html", "collection", "tag");
     $template->set_global(
       array("page" => $page,
@@ -63,11 +59,37 @@ class Tag_Controller extends Controller {
             "children" => $tag->items($page_size, $offset),
             "breadcrumbs" => array(
               Breadcrumb::instance($root->title, $root->url())->set_first(),
-              Breadcrumb::instance($tag->name, $tag->url())->set_last()),
+              Breadcrumb::instance(t("Tag: %tag_name", array("tag_name" => $tag->name)),
+                                   $tag->url())->set_last()),
             "children_count" => $children_count));
     $template->content = new View("dynamic.html");
     $template->content->title = t("Tag: %tag_name", array("tag_name" => $tag->name));
-
     print $template;
+
+    item::set_display_context_callback("Tag_Controller::get_display_context", $tag->id);
+  }
+
+  static function get_display_context($item, $tag_id) {
+    $tag = ORM::factory("tag", $tag_id);
+    $where = array(array("type", "!=", "album"));
+
+    $position = tag::get_position($tag, $item, $where);
+    if ($position > 1) {
+      list ($previous_item, $ignore, $next_item) = $tag->items(3, $position - 2, $where);
+    } else {
+      $previous_item = null;
+      list ($next_item) = $tag->items(1, $position, $where);
+    }
+
+    $root = item::root();
+    return array("position" => $position,
+                 "previous_item" => $previous_item,
+                 "next_item" => $next_item,
+                 "sibling_count" => $tag->items_count($where),
+                 "breadcrumbs" => array(
+                   Breadcrumb::instance($root->title, $root->url())->set_first(),
+                   Breadcrumb::instance(t("Tag: %tag_name", array("tag_name" => $tag->name)),
+                                        $tag->url("show={$item->id}")),
+                   Breadcrumb::instance($item->title, $item->url())->set_last()));
   }
 }
diff --git a/modules/tag/libraries/Tag_Display_Context.php b/modules/tag/libraries/Tag_Display_Context.php
deleted file mode 100644
index 47c79088..00000000
--- a/modules/tag/libraries/Tag_Display_Context.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2011 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 Tag_Display_Context_Core extends Display_Context {
-  protected function __construct() {
-    parent::__construct("tag");
-  }
-
-  function display_context($item) {
-    $tag = $this->get("tag");
-
-    $where = array(array("type", "!=", "album"));
-
-    $position = tag::get_position($tag, $item, $where);
-    if ($position > 1) {
-      list ($previous_item, $ignore, $next_item) = $tag->items(3, $position - 2, $where);
-    } else {
-      $previous_item = null;
-      list ($next_item) = $tag->items(1, $position, $where);
-    }
-
-    $root = item::root();
-    return array("position" =>$position,
-                 "previous_item" => $previous_item,
-                 "next_item" =>$next_item,
-                 "sibling_count" => $tag->items_count($where),
-                 "breadcrumbs" => array(
-                   Breadcrumb::instance($root->title, $root->url())->set_first(),
-                   Breadcrumb::instance($tag->name, $tag->url("show={$item->id}")),
-                   Breadcrumb::instance($item->title, $item->url())->set_last()));
-  }
-}
-- 
cgit v1.2.3