diff options
Diffstat (limited to 'templates/details/photo.html')
| -rw-r--r-- | templates/details/photo.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/templates/details/photo.html b/templates/details/photo.html index 22adeb9..200995f 100644 --- a/templates/details/photo.html +++ b/templates/details/photo.html @@ -1,8 +1,8 @@ {% extends 'base.html' %} {% load typogrify %} {% block pagetitle %}Luxagraf | {{object.title|title|smartypants|safe}}{% endblock %} -{% block metadescription %}Luxagraf: Photo, {{object.title}}, Photographer: Scott Gilbertson, Published: {{ object.pub_date|date:"N j, Y" }} {{ object.pub_date|date:"h:i a" }}Camera:{%if object.exif_make%}{%ifnotequal object.exif_make 'Canon'%}{{ object.exif_make }}{%endifnotequal%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}, Aperture: {%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}, Shutter Speed: {%if object.exif_shutter%}{{ object.exif_shutter }} sec{%else%}Not Recorded{%endif%}, Film Speed: {%if object.exif_iso%}{{ object.exif_iso }} ISO{%else%}Not Recorded{%endif%}.{% endblock %} -{% block date %}{{object.pub_date|date:"F j, Y"}}<span class="small byline">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endifequal%}</span>{% endblock %} +{% block metadescription %}Luxagraf: Photo, {{object.title}}, Photographer: Scott Gilbertson, Published: {{ object.pub_date|date:"N j, Y" }} {{ object.pub_date|date:"h:i a" }}Camera:{%if object.exif_make%}{%if object.exif_make != 'Canon'%}{{ object.exif_make }}{%endif%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}, Aperture: {%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}, Shutter Speed: {%if object.exif_shutter%}{{ object.exif_shutter }} sec{%else%}Not Recorded{%endif%}, Film Speed: {%if object.exif_iso%}{{ object.exif_iso }} ISO{%else%}Not Recorded{%endif%}.{% endblock %} +{% block date %}{{object.pub_date|date:"F j, Y"}}<span class="small byline">{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endif%}</span>{% endblock %} @@ -12,9 +12,9 @@ {% block primary %} <a href="http://flickr.com/photos/luxagraf/{{object.flickr_id}}/" title="View {{object.flickr_title}} on Flickr.com"><img class="flickr-image" src="{{ object.get_medium_url }}" alt="{{object.title}}" title="{{object.title}}" /></a> - {% ifnotequal object.description 'None' %} + {% if object.description != 'None' %} <p>{{ object.description|smartypants|widont|safe }}</p> - {%endifnotequal %} + {%endif %} <p>Other Sizes: <a href="{{object.get_large_url}}" title="see large image">Large</a> and <a href="http://flickr.com/photo_zoom.gne?id={{object.flickr_id}}&size=o" title="see original image">Original</a></p> @@ -72,7 +72,7 @@ <dl class="sidebar meta"> <dt>Camera:</dt> - <dd>{%if object.exif_make%}{%ifnotequal object.exif_make 'Canon'%}{{ object.exif_make }}{%endifnotequal%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}</dd> + <dd>{%if object.exif_make%}{%if object.exif_make != 'Canon'%}{{ object.exif_make }}{%endif%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}</dd> <dt>Aperture:</dt> <dd>{%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}</dd> <dt>Shutter Speed:</dt> |