2 files changed, 13 insertions, 35 deletions

diff --git a/bn_django/photos/templates/photos/gallery_detail.html b/bn_django/photos/templates/photos/gallery_detail.html
index da374b1..ef08807 100644
--- a/bn_django/photos/templates/photos/gallery_detail.html
+++ b/bn_django/photos/templates/photos/gallery_detail.html
@@ -1,44 +1,30 @@
 {% extends "photos/base.html" %}
 {# {% load markup %} #}
-
 {% block path %}
 {{ block.super }}
 {% if object %}
   »
   <a href="../{{ object.id }}">{{ object.title }}</a>
-{% endif %}
-{% endblock %}
-
+{% endif %} {% endblock %}
 {% block title %}
-{% if object %}
-Gallery: {{ object.title }}
-{% endif %}
+{% if object %} Gallery: {{ object.title }} {% endif %}
 {% endblock %}
-
 {% block content %}
-{% if object %}
-<br />
+{% if object %} <br />
 {% if object.photo_set.count %}
 <table width="100%" class="thumbs">
-{% for item in object.photo_set.all %}
-    {% cycle <tr/>,&nbsp;,&nbsp;,&nbsp; %}
+{% for item in object.photo_set.all %} {% cycle <tr/>,&nbsp;,&nbsp;,&nbsp; %}
     <td class="photo_thumb">
     <a href="../detail/{{ item.id }}">
     <img src="{{ item.thumburl }}"
         alt="{{ item.title }}" />
-    <!--<a href="../detail/{{ item.id }}" class="caption">{{ item.title }}</a>
-</a> -->
-    </td>
-
-{% endfor %}
+    </td> {% endfor %}
 </table>
-
 {% else %}
 <p>There are no photos in this gallery.  If you just uploaded a batch
 of photos, try hitting your browser's reload button to see if they
-show up.</p>
-{% endif %}
- &nbsp;
+show up.</p> {% endif %}
+&nbsp;
 <!--
 {% if not user.is_anonymous %}
 <p>
@@ -55,9 +41,5 @@ show up.</p>
 </p>
 {% endif %}
 -->
-
-{% else %}
-<p>This is not the gallery you are looking for.</p>
-{% endif %}
-
+{% else %} <p>This is not the gallery you are looking for.</p> {% endif %}
 {% endblock %}
diff --git a/bn_django/photos/templates/photos/photo_detail.html b/bn_django/photos/templates/photos/photo_detail.html
index a2a28c2..3b582b1 100644
--- a/bn_django/photos/templates/photos/photo_detail.html
+++ b/bn_django/photos/templates/photos/photo_detail.html
@@ -20,31 +20,27 @@
 
 {% if object %}
 {% if object.next %}
-<div class="right_stuff">
+<div class="right_stuff" style="clear: right;">
 <div class="small-image-box">
 <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 }}"/> 
-  </a> <!--
-  <a href="../{{ object.next.id }}/">
-  <span>{{ object.next.title }} &raquo;</span></a> -->
+  </a>
 </div></div>
 
 {% endif %}
-
 {% if object.prev %}
-<div class="right_stuff">
+<div class="right_stuff" style="clear: right;">
 <div class="small-image-box">
   <a href="../{{ object.prev.id }}/">
   Previous:<br />  
     <img src="{{ object.prev.thumburl}}" alt="{{ object.prev.title }}"/>
-  </a> <!--
-  <a href="../{{ object.prev.id }}/">
-  <span>&laquo;  {{ object.prev.title }} </span></a> -->
+  </a>
 </div>
 </div>
 {% endif %}
+
 <center>
 <div id="centerize">
   <a href="{{ object.fullurl }}">