From 1e79ca2dcbad102aab876169f706e7c5eef587f3 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 30 Aug 2009 23:22:54 -0600
Subject: Move header and footer into page.html.php since they're not included
 in any other view template.

---
 themes/default/views/page.html.php | 39 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

(limited to 'themes/default/views/page.html.php')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 2696442b..636b2f99 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -76,7 +76,33 @@
     <div id="doc4" class="yui-t5 gView">
       <?= $theme->site_status() ?>
       <div id="gHeader">
-        <?= new View("header.html") ?>
+        <div id="gBanner">
+          <?= $theme->header_top() ?>
+          <? if ($header_text = module::get_var("gallery", "header_text")): ?>
+          <?= $header_text ?>
+          <? else: ?>
+          <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
+            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+          </a>
+          <? endif ?>
+          <div id="gSiteMenu">
+          <?= $theme->site_menu() ?>
+          </div>
+          <?= $theme->header_bottom() ?>
+        </div>
+
+        <? if (!empty($parents)): ?>
+        <ul class="gBreadcrumbs">
+          <? foreach ($parents as $parent): ?>
+          <li>
+            <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
+              <?= html::purify($parent->title) ?>
+            </a>
+          </li>
+          <? endforeach ?>
+          <li class="active"><?= html::purify($item->title) ?></li>
+        </ul>
+        <? endif ?>
       </div>
       <div id="bd">
         <div id="yui-main">
@@ -94,7 +120,16 @@
         </div>
       </div>
       <div id="gFooter">
-        <?= new View("footer.html") ?>
+        <?= $theme->footer() ?>
+        <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
+        <?= $footer_text ?>
+        <? endif ?>
+
+        <? if (module::get_var("gallery", "show_credits")): ?>
+        <ul id="gCredits">
+          <?= $theme->credits() ?>
+        </ul>
+        <? endif ?>
       </div>
     </div>
     <?= $theme->page_bottom() ?>
-- 
cgit v1.2.3


From e6c2fe60c42efee8ce898e208befe63565d98ffc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 17:17:14 -0700
Subject: Use $theme->item() instead of $item.

---
 themes/default/views/page.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes/default/views/page.html.php')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 636b2f99..ebe6b0cf 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -95,12 +95,12 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
+            <a href="<?= url::site("albums/{$parent->id}?show=$theme->item()->id") ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
           <? endforeach ?>
-          <li class="active"><?= html::purify($item->title) ?></li>
+          <li class="active"><?= html::purify($theme->item()->title) ?></li>
         </ul>
         <? endif ?>
       </div>
-- 
cgit v1.2.3


From 74a124b261dabfae2613449addbcabc4310994ac Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 17:41:34 -0700
Subject: Oops, fix up the show argument that I "fixed" in the last change.

---
 themes/default/views/page.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/default/views/page.html.php')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index ebe6b0cf..7d181ea0 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -95,7 +95,7 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= url::site("albums/{$parent->id}?show=$theme->item()->id") ?>">
+            <a href="<?= url::site("albums/{$parent->id}?show={$theme->item()->id}") ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
-- 
cgit v1.2.3