From 711cdde5b9755140981000adc6dd7897d836ccc5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 12 Sep 2009 20:46:54 -0700
Subject: Only tack ?show=<current_id> on for the last parent, because that's
 the only parent for which the id is relevant.  In a perfect world each
 parent's link would have a ?show=<id> for the next child's id.  But that
 would require some confusing code and I don't want to put that into the
 default/example theme yet.

---
 themes/default/views/page.html.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'themes/default/views')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 733534ea..19d8cc00 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -95,7 +95,12 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= $parent->url("show={$theme->item()->id}") ?>">
+            <!-- Adding ?show=<id> causes Gallery3 to display the page
+                 containing that photo.  For now, we just do it for
+                 the immediate parent so that when you go back up a
+                 level you're on the right page. -->
+            <a href="<?= $parent->url($parent == $theme->item()->parent() ?
+                     "show={$theme->item()->id}" : null) ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
-- 
cgit v1.2.3


From 75c68084136321b108e379643065fd21167990f8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 13 Sep 2009 14:25:56 -0700
Subject: Only show the block anchor if one exists.  Show block anchors for
 admin themes too.

---
 themes/admin_default/views/block.html.php | 3 +++
 themes/default/views/block.html.php       | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'themes/default/views')

diff --git a/themes/admin_default/views/block.html.php b/themes/admin_default/views/block.html.php
index 21512d02..6cbea76e 100644
--- a/themes/admin_default/views/block.html.php
+++ b/themes/admin_default/views/block.html.php
@@ -1,4 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<? if ($anchor): ?>
+<a name="<?= $anchor ?>"></a>
+<? endif ?>
 <div block_id="<?= $id ?>" id="<?= $css_id ?>" class="gBlock ui-widget">
   <div class="ui-dialog-titlebar ui-widget-header ui-helper-clearfix ui-icon-right">
     <? if ($css_id != "gBlockAdder"): ?>
diff --git a/themes/default/views/block.html.php b/themes/default/views/block.html.php
index 37504861..e8cff833 100644
--- a/themes/default/views/block.html.php
+++ b/themes/default/views/block.html.php
@@ -1,5 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<? if ($anchor): ?>
 <a name="<?= $anchor ?>"></a>
+<? endif ?>
 <div id="<?= $css_id ?>" class="gBlock">
   <h2><?= $title ?></h2>
   <div class="gBlockContent">
-- 
cgit v1.2.3


From 4e1e24ba1a976cd0bb7ca7dd03c6001f906a25dd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 16 Sep 2009 20:34:42 -0700
Subject: Add a movie_menu() theme callback, and have the default theme call it
 in the sidebar on movie page types.

---
 modules/gallery/libraries/Theme_View.php | 6 ++++++
 themes/default/views/sidebar.html.php    | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'themes/default/views')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 541bce88..130e2dce 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -111,6 +111,12 @@ class Theme_View_Core extends Gallery_View {
     return $menu->compact();
   }
 
+  public function movie_menu() {
+    $menu = Menu::factory("root");
+    module::event("movie_menu", $menu, $this);
+    return $menu->compact();
+  }
+
   public function context_menu($item, $thumbnail_css_selector) {
     $menu = Menu::factory("root")
       ->append(Menu::factory("submenu")
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
index 928ecb93..04379eb6 100644
--- a/themes/default/views/sidebar.html.php
+++ b/themes/default/views/sidebar.html.php
@@ -6,6 +6,8 @@
       <?= $theme->album_menu() ?>
     <? elseif ($page_type == "photo") : ?>
       <?= $theme->photo_menu() ?>
+    <? elseif ($page_type == "movie") : ?>
+      <?= $theme->movie_menu() ?>
     <? elseif ($page_type == "tag") : ?>
       <?= $theme->tag_menu() ?>
     <? endif ?>
-- 
cgit v1.2.3