Moved EXIF to sidebar, added conditions for visibility configuration settings

This commit is contained in:
Joar Wandborg 2012-01-20 10:27:26 +01:00
parent 5907222c0b
commit 6d9ce47f5c

View File

@ -80,22 +80,6 @@
media= media._id) %} media= media._id) %}
<a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a> <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
{% endif %} {% endif %}
{% if media.media_data.has_key('exif')
and media.media_data.exif.has_key('useful') %}
{#-
TODO:
- Render GPS data in a human-readable format
#}
<h4>EXIF</h4>
<table>
{% for key, tag in media.media_data.exif.useful.items() %}
<tr>
<td>{{ key }}</td>
<td>{{ tag.printable }}</td>
</tr>
{% endfor %}
</table>
{% endif %}
</p> </p>
{% if comments %} {% if comments %}
<h3> <h3>
@ -195,7 +179,10 @@
{% include "mediagoblin/utils/tags.html" %} {% include "mediagoblin/utils/tags.html" %}
{% endif %} {% endif %}
{% include "mediagoblin/utils/license.html" %}
{% if media.media_data.has_key('gps') {% if media.media_data.has_key('gps')
and app_config['geolocation_map_visible']
and media.media_data.gps %} and media.media_data.gps %}
<h4>Map</h4> <h4>Map</h4>
<div> <div>
@ -216,6 +203,22 @@
</p> </p>
</div> </div>
{% endif %} {% endif %}
{% include "mediagoblin/utils/license.html" %} {% if media.media_data.has_key('exif')
and app_config['exif_visible']
and media.media_data.exif.has_key('useful') %}
{#-
TODO:
- Render GPS data in a human-readable format
#}
<h4>EXIF</h4>
<table>
{% for key, tag in media.media_data.exif.useful.items() %}
<tr>
<td>{{ key }}</td>
<td>{{ tag.printable }}</td>
</tr>
{% endfor %}
</table>
{% endif %}
</div> </div>
{% endblock %} {% endblock %}