From c69b55610e3cceb5cbd48784fb7cc0458d463f3a Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@animus.robocracy.org>
Date: Sat, 24 Feb 2007 21:39:51 -0800
Subject: Revert "i'm confused?"

This reverts commit 71520ba4e171195c983320b9c00e37c215fad39c.
---
 bn_django/photos/templates/photos/base.html           | 4 ++++
 bn_django/photos/templates/photos/gallery_detail.html | 4 ++--
 bn_django/photos/templates/photos/gallery_list.html   | 1 -
 bn_django/photos/templates/photos/photo_detail.html   | 5 ++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'bn_django/photos')

diff --git a/bn_django/photos/templates/photos/base.html b/bn_django/photos/templates/photos/base.html
index 94d9808..d229057 100644
--- a/bn_django/photos/templates/photos/base.html
+++ b/bn_django/photos/templates/photos/base.html
@@ -1 +1,5 @@
 {% extends "base.html" %}
+
+{% block path %}
+    <a href="/photos/">photos</a> 
+{% endblock %}
diff --git a/bn_django/photos/templates/photos/gallery_detail.html b/bn_django/photos/templates/photos/gallery_detail.html
index f9d1bd6..318091b 100644
--- a/bn_django/photos/templates/photos/gallery_detail.html
+++ b/bn_django/photos/templates/photos/gallery_detail.html
@@ -2,8 +2,9 @@
 {# {% load markup %} #}
 
 {% block path %}
-  <a href="../">photos</a> &raquo;
+{{ block.super }}
 {% if object %}
+  &raquo;
   <a href="../{{ object.id }}">{{ object.title }}</a>
 {% endif %}
 {% endblock %}
@@ -20,7 +21,6 @@ Gallery: {{ object.title }}
 {% if object.photo_set.count %}
 
 {% for item in object.photo_set.all %}
-
 <span class="photo_thumb">
     <a href="../detail/{{ item.id }}">
     <img src="{{ item.thumburl }}"
diff --git a/bn_django/photos/templates/photos/gallery_list.html b/bn_django/photos/templates/photos/gallery_list.html
index 61225c4..b709092 100644
--- a/bn_django/photos/templates/photos/gallery_list.html
+++ b/bn_django/photos/templates/photos/gallery_list.html
@@ -1,7 +1,6 @@
 {% extends "photos/base.html" %}
 {# {% load markup %} #}
 
-{% block path %}photos{% endblock %}
 {% block title %}Photo Galleries{% endblock %}
 
 {% block content %}
diff --git a/bn_django/photos/templates/photos/photo_detail.html b/bn_django/photos/templates/photos/photo_detail.html
index d9c2177..10bf8ba 100644
--- a/bn_django/photos/templates/photos/photo_detail.html
+++ b/bn_django/photos/templates/photos/photo_detail.html
@@ -2,8 +2,11 @@
 {# {% load markup %} #}
 
 {% block path %}
-  <a href="../..">photos</a> &raquo;
+  {{ block.super }}
+  &raquo;
   <a href="../../{{ object.gallery.id }}">{{ object.gallery.title }}</a>
+  &raquo;
+  <a href="../{{ object.id }}">{{ object.title }}</a>
 {% endblock %}
 
 {% block title %} 
-- 
cgit v1.2.3