summaryrefslogtreecommitdiff
path: root/templates/details/photo_galleries.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/details/photo_galleries.html')
-rw-r--r--templates/details/photo_galleries.html9
1 files changed, 5 insertions, 4 deletions
diff --git a/templates/details/photo_galleries.html b/templates/details/photo_galleries.html
index 9596737..cd73b5f 100644
--- a/templates/details/photo_galleries.html
+++ b/templates/details/photo_galleries.html
@@ -31,7 +31,7 @@
{%for photo in object.photos.all reversed %}
<article id="image-{{forloop.counter}}">
<h6><a href="#image-{{forloop.counter}}" class="permalink" title="link to this image">&#8734; {{forloop.counter|number_to_word}} &#8734;</a></h6>
- <img src="{{photo.get_local_slideshow_url}}" alt="{{photo.title}}" title="{{photo.title}}" />
+ <div class="fig"><img src="{{photo.get_local_slideshow_url}}" alt="{{photo.title}}" title="{{photo.title}}" height="{{photo.slideshowimage_height}}" width="{{photo.slideshowimage_width}}" style="margin-left:{{photo.slideshowimage_marginleft}}px; " /></div>
<div class="figcaption">
<div class="caption" id="id-{{photo.id}}">
<h3>{{photo.title}} &nbsp;&nbsp;<span>{{photo.exif_date|date:"M j, Y"}}</span></h3>
@@ -39,8 +39,9 @@
{%if photo.description %}<p>{{photo.description|safe}}</p> {%endif%}
</div>
<div class="photo-options">
- <p class="camera">{% if photo.exif_make == 'Canon'%}{{photo.exif_model}}{%endif%}{% if photo.exif_model == 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endif%}{%if photo.exif_model == 'DMC-GF1' %}Panasonic GF1 w/{%endif%} {%if photo.exif_lens == 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">Lumix 14-45mm lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">Lumix 20mm prime lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G VARIO 45-200/F4.0-5.6' %}<a href="http://amzn.to/a9DfV7" title="buy the {{photo.exif_lens}} on Amazon">Lumix 45-200mm lens</a>{%endif%}{%if photo.exif_lens == None %}Built-in{%endif%}</p>
- <p class="details">{{photo.exif_exposure}} sec @ {{photo.exif_aperture}}, ISO {{photo.exif_iso}} </p>
+ <p>{% if photo.exif_make == 'Canon'%}{{photo.exif_model}}{%endif%}{% if photo.exif_model == 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endif%}{%if photo.exif_model == 'DMC-GF1' %}Panasonic GF1 w/{%endif%} {%if photo.exif_lens == 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">Lumix 14-45mm lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">Lumix 20mm prime lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G VARIO 45-200/F4.0-5.6' %}<a href="http://amzn.to/a9DfV7" title="buy the {{photo.exif_lens}} on Amazon">Lumix 45-200mm lens</a>{%endif%}{%if photo.exif_lens == None %}Built-in{%endif%}</p>
+ <p>{{photo.exif_exposure}} sec @ {{photo.exif_aperture}}, ISO {{photo.exif_iso}} </p>
+ <!--<p><a href="{{photo.flickr_link}}" title="View this Photo on Flickr.com">View on Flickr</a></p>-->
<!--<a href="#" class="exif-link" title="{{photo.id}}">Camera</a>-->
</div>
@@ -73,7 +74,7 @@
{% block js %}
<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.js"></script>
<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.scrollTo-1.4.2-min.js"></script>
- <script type="text/javascript" src="{{MEDIA_URL}}js/slideshow.js" ></script>
+ <script type="text/javascript" src="{{MEDIA_URL}}js/slideshow.pack.js" ></script>
<!-- if you'd like to see a non-packed version of my slideshow script, see this file: http://media.luxagraf.net/js/slideshow.js (requires jquery, jcarousel and cycle) -->
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
{% endblock%}