aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@manus.(none)>2007-02-24 16:59:31 -0800
committerbnewbold <bnewbold@manus.(none)>2007-02-24 16:59:31 -0800
commitd338fd66b3b401b75d890a4838df7edd9b08c956 (patch)
tree80bf4639c63dc81e5d2438c92dd599d02bafcf57
parent2f81eff5ea7c0c13ab3028cee35b591f56d76e2a (diff)
downloadbnewnet-d338fd66b3b401b75d890a4838df7edd9b08c956.tar.gz
bnewnet-d338fd66b3b401b75d890a4838df7edd9b08c956.zip
fixed path inheritence for photos section
-rw-r--r--bn_django/photos/templates/photos/base.html4
-rw-r--r--bn_django/photos/templates/photos/gallery_detail.html4
-rw-r--r--bn_django/photos/templates/photos/gallery_list.html1
-rw-r--r--bn_django/photos/templates/photos/photo_detail.html5
4 files changed, 10 insertions, 4 deletions
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 %}