diff options
| author | Joar Wandborg <git@wandborg.com> | 2012-01-20 10:27:26 +0100 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2012-01-25 23:46:11 +0100 |
| commit | 6d9ce47f5c90fffdac33c32dfcb9dd5c6fa37b11 (patch) | |
| tree | aee71b32b93310e900df8bc58b10d1b8f71eea17 | |
| parent | 5907222c0b5b1fb25b93de3b5cf5751de2da3013 (diff) | |
| download | mediagoblin-6d9ce47f5c90fffdac33c32dfcb9dd5c6fa37b11.tar.lz mediagoblin-6d9ce47f5c90fffdac33c32dfcb9dd5c6fa37b11.tar.xz mediagoblin-6d9ce47f5c90fffdac33c32dfcb9dd5c6fa37b11.zip | |
Moved EXIF to sidebar, added conditions for visibility configuration settings
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 60fca710..446c9f85 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -80,22 +80,6 @@ media= media._id) %} <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a> {% 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> {% if comments %} <h3> @@ -195,7 +179,10 @@ {% include "mediagoblin/utils/tags.html" %} {% endif %} + {% include "mediagoblin/utils/license.html" %} + {% if media.media_data.has_key('gps') + and app_config['geolocation_map_visible'] and media.media_data.gps %} <h4>Map</h4> <div> @@ -216,6 +203,22 @@ </p> </div> {% 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> {% endblock %} |