aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bn_django/photos/templates/photos/photo_detail.html21
1 files changed, 14 insertions, 7 deletions
diff --git a/bn_django/photos/templates/photos/photo_detail.html b/bn_django/photos/templates/photos/photo_detail.html
index ac1eb3b..5d02710 100644
--- a/bn_django/photos/templates/photos/photo_detail.html
+++ b/bn_django/photos/templates/photos/photo_detail.html
@@ -19,10 +19,22 @@
{% block content %}
{% if object %}
+<div class="right_stuff">
+{% if object.date %}
+<p class="photodate">Photo taken {{ object.date }}{% if object.photographer %}
+by {{ object.photographer }}.</p>
+{% else %}.</p>
+{% endif %}
+{% else %}
+{% if object.photographer %}
+<p class="photographer">Photo by {{ object.photographer }}.</p>
+{% endif %}
+{% endif %}
+</div>
{% if object.next %}
<div class="right_stuff" style="clear: right;">
<div class="small-image-box">
-<br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br />
+<br /><br /><br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br />
<a href="../{{ object.next.id }}/">
Next:<br/>
<img src="{{ object.next.thumburl}}" alt="{{ object.next.title }}"/>
@@ -33,6 +45,7 @@
{% if object.prev %}
<div class="right_stuff" style="clear: right;">
<div class="small-image-box">
+<br /> <br /><br /> <br />
<a href="../{{ object.prev.id }}/">
Previous:<br />
<img src="{{ object.prev.thumburl}}" alt="{{ object.prev.title }}"/>
@@ -49,12 +62,6 @@
</a>
<div>
<p class="photodesc"> {{ object.desc }} </p>
- {% if object.photographer %}
- <p class="photographer">Photo by {{ object.photographer }}.</p>
- {% endif %}
- {% if object.date %}
- <p class="photodate">Photo taken {{ object.date }}.</p>
- {% endif %}
{% if object.extra %}
<h3 class="photoextra">More information</h3>
<p class="photoextra">{{ object.extra }}</p>