tweaked pic960 template

1 files changed, 7 insertions, 7 deletions

diff --git a/design/templates/lib/img_pic960.html b/design/templates/lib/img_pic960.html
index 544e42e..faee439 100644
--- a/design/templates/lib/img_pic960.html
+++ b/design/templates/lib/img_pic960.html
@@ -1,9 +1,9 @@
 {% load get_image_by_size %}
-{% load get_image_width %}
-{% if caption %}
-<figure class="pic960">{%endif%}
-<a href="{%get_image_by_size image "original"%} " title="view larger image"><img class="picwide960" sizes="(max-width: 960px) 100vw, (min-width: 961px) 960px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} {% if image.is_portait %}{% get_image_width image size.height %}w{%else%}{{size.width}}w{%endif%}{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}
-   {% for size in image.sizes.all%}{%if forloop.first %} src="{% get_image_by_size image size.name %}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}" data-jslghtbx="{%get_image_by_size image "original"%}" data-jslghtbx-group="group" {% if caption%}data-jslghtbx-caption="{{image.caption}}"{%endif%}></a>
-{% if caption %}<figcaption>{{image.caption|safe}}</figcaption>
-</figure>
+{% if caption or exif or image.photo_credit_source %}
+<figure{%if not is_cluster %} class="pic960"{%endif%}>{%else%}{%if not is_cluster %}<div class="pic960">{%endif%}{%endif%}
+        <a itemscope itemtype="http://schema.org/ImageObject" href="{%get_image_by_size image "original"%} " title="view larger image">
+            <img class="u-photo" itemprop="contentUrl" sizes="(max-width: 959px) 100vw, (min-width: 960px) 960px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} {{size.width}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}{% for size in image.sizes.all%}{%if not forloop.first and not forloop.last%} src="{% get_image_by_size image size.name%}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}" data-jslghtbx="{%get_image_by_size image "original"%}" data-jslghtbx-group="group" {% if caption%}data-jslghtbx-caption="{{image.caption}}"{%endif%}>
+        </a>
+{% if caption or exif or image.photo_credit_source %}<figcaption>{% endif %}{% if caption %}{{image.caption|safe}}{% endif %}{% if exif %} | <small>Camera: {{image.exif_make}} {{image.exif_model}} with {{image.exif_lens}}</small>{% endif %}{% if image.photo_credit_source %}{%if caption or exif %} | {%endif%}image by {% if image.photo_credit_url %}<a href="{{image.photo_credit_url}}" itemprop="author">{%endif%}{{image.photo_credit_source}}{% if image.photo_credit_url %}</a>{%endif%}{%endif%}{% if caption or exif or image.photo_credit_source %}</figcaption>
+</figure>{%else%}{%if not is_cluster %}</div>{%endif%}
 {% endif %}