From b82b60c91a4ece468dad8981b7ccd46a8cf19662 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 12 Mar 2009 15:40:08 +0000
Subject: Rename tag.html.php to dynamic.html.php as part of ticket #115
 creating Dynamic Albums.  This name change reflects the usage better and
 allows multiple dynamic albums (including tags) to use the same page
 template.

---
 core/libraries/Theme_View.php         |  6 +++---
 modules/tag/controllers/tags.php      |  2 +-
 themes/default/views/dynamic.html.php | 29 +++++++++++++++++++++++++++++
 themes/default/views/tag.html.php     | 29 -----------------------------
 4 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 themes/default/views/dynamic.html.php
 delete mode 100644 themes/default/views/tag.html.php

diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php
index cc36de03..ecae3946 100644
--- a/core/libraries/Theme_View.php
+++ b/core/libraries/Theme_View.php
@@ -158,6 +158,8 @@ class Theme_View_Core extends View {
     case "album_bottom":
     case "album_top":
     case "credits";
+    case "dynamic_bottom":
+    case "dynamic_top":
     case "footer":
     case "head":
     case "header_bottom":
@@ -165,16 +167,14 @@ class Theme_View_Core extends View {
     case "page_bottom":
     case "page_top":
     case "photo_blocks":
+    case "photo_bottom":
     case "photo_top":
     case "sidebar_blocks":
     case "sidebar_bottom":
     case "sidebar_top":
-    case "tag_bottom":
-    case "tag_top":
     case "thumb_bottom":
     case "thumb_info":
     case "thumb_top":
-    case "photo_bottom":
       $blocks = array();
       foreach (module::installed() as $module) {
         $helper_class = "{$module->name}_theme";
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 01c5d2df..bba1a751 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -36,7 +36,7 @@ class Tags_Controller extends REST_Controller {
     $template->set_global('tag', $tag);
     $template->set_global('children', $tag->items($page_size, $offset));
     $template->set_global('children_count', $children_count);
-    $template->content = new View("tag.html");
+    $template->content = new View("dynamic.html");
 
     print $template;
   }
diff --git a/themes/default/views/dynamic.html.php b/themes/default/views/dynamic.html.php
new file mode 100644
index 00000000..8d2d2123
--- /dev/null
+++ b/themes/default/views/dynamic.html.php
@@ -0,0 +1,29 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="gAlbumHeader">
+  <div id="gAlbumHeaderButtons">
+    <?= $theme->dynamic_top() ?>
+  </div>
+  <h1><?= $tag->name ?></h1>
+</div>
+
+<ul id="gAlbumGrid">
+  <? foreach ($children as $i => $child): ?>
+  <li class="gItem <?= $child->is_album() ? "gAlbum" : "" ?>">
+    <?= $theme->thumb_top($child) ?>
+    <a href="<?= $child->url() ?>">
+      <img id="gPhotoId-<?= $child->id ?>" class="gThumbnail"
+           alt="photo" src="<?= $child->thumb_url() ?>"
+           width="<?= $child->thumb_width ?>"
+           height="<?= $child->thumb_height ?>" />
+    </a>
+    <h2><?= $child->title ?></h2>
+    <?= $theme->thumb_bottom($child) ?>
+    <ul class="gMetadata">
+      <?= $theme->thumb_info($child) ?>
+    </ul>
+  </li>
+  <? endforeach ?>
+</ul>
+<?= $theme->dynamic_bottom() ?>
+
+<?= $theme->pager() ?>
diff --git a/themes/default/views/tag.html.php b/themes/default/views/tag.html.php
deleted file mode 100644
index 27777e94..00000000
--- a/themes/default/views/tag.html.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAlbumHeader">
-  <div id="gAlbumHeaderButtons">
-    <?= $theme->tag_top() ?>
-  </div>
-  <h1><?= $tag->name ?></h1>
-</div>
-
-<ul id="gAlbumGrid">
-  <? foreach ($children as $i => $child): ?>
-  <li class="gItem <?= $child->is_album() ? "gAlbum" : "" ?>">
-    <?= $theme->thumb_top($child) ?>
-    <a href="<?= $child->url() ?>">
-      <img id="gPhotoId-<?= $child->id ?>" class="gThumbnail"
-           alt="photo" src="<?= $child->thumb_url() ?>"
-           width="<?= $child->thumb_width ?>"
-           height="<?= $child->thumb_height ?>" />
-    </a>
-    <h2><?= $child->title ?></h2>
-    <?= $theme->thumb_bottom($child) ?>
-    <ul class="gMetadata">
-      <?= $theme->thumb_info($child) ?>
-    </ul>
-  </li>
-  <? endforeach ?>
-</ul>
-<?= $theme->tag_bottom() ?>
-
-<?= $theme->pager() ?>
-- 
cgit v1.2.3