From 992cf22c795100a4f42c17c38cf1aaa2029af279 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 21 Nov 2008 07:06:11 +0000
Subject: Revert module block approach

---
 themes/default/views/album.html.php | 4 +++-
 themes/default/views/page.html.php  | 7 ++++---
 themes/default/views/photo.html.php | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'themes')

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 037ce30b..43024840 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -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">
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index e64df820..3b11e14a 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -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; ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 26a28b18..47b7bf4f 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -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 ?>"
-- 
cgit v1.2.3