Refractored media.html template and related includes

- Added <p> around license part to separate it properly
  from other sidebar content
- Moved exif part to mediagoblin/utils/exif.html
- Moved geolocation map to mediagoblin/utils/geolocation_map.html
This commit is contained in:
Joar Wandborg 2012-01-25 23:53:02 +01:00
parent 63bd7c04bd
commit cc7ca4da73
4 changed files with 86 additions and 45 deletions

View File

@ -181,44 +181,8 @@
{% 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>
{% set gps = media.media_data.gps %}
<div id="tile-map" style="width: 100%; height: 196px;">
<input type="hidden" id="gps-longitude"
value="{{ gps.longitude }}" />
<input type="hidden" id="gps-latitude"
value="{{ gps.latitude }}" />
</div>
<p>
<small>
View on
<a href="http://openstreetmap.org/?mlat={{ gps.latitude }}&mlon={{ gps.longitude }}">
OpenStreetMap
</a>
</small>
</p>
</div>
{% endif %}
{% 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 %}
{% include "mediagoblin/utils/geolocation_map.html" %}
{% include "mediagoblin/utils/exif.html" %}
</div>
{% endblock %}

View File

@ -0,0 +1,33 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% block exif_content %}
{% if media.media_data.has_key('exif')
and app_config['exif_visible']
and media.media_data.exif.has_key('useful') %}
<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 %}
{% endblock %}

View File

@ -0,0 +1,42 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% block geolocation_map %}
{% if media.media_data.has_key('gps')
and app_config['geolocation_map_visible']
and media.media_data.gps %}
<h4>Map</h4>
<div>
{% set gps = media.media_data.gps %}
<div id="tile-map" style="width: 100%; height: 196px;">
<input type="hidden" id="gps-longitude"
value="{{ gps.longitude }}" />
<input type="hidden" id="gps-latitude"
value="{{ gps.latitude }}" />
</div>
<p>
<small>
View on
<a href="http://openstreetmap.org/?mlat={{ gps.latitude }}&mlon={{ gps.longitude }}">
OpenStreetMap
</a>
</small>
</p>
</div>
{% endif %}
{% endblock %}

View File

@ -17,10 +17,12 @@
#}
{% block license_content -%}
{% trans %}License:{% endtrans %}
{% if media.license %}
<a href="{{ media.license }}">{{ media.get_license_data().abbreviation }}</a>
{% else %}
{% trans %}All rights reserved{% endtrans %}
{% endif %}
<p>
{% trans %}License:{% endtrans %}
{% if media.license %}
<a href="{{ media.license }}">{{ media.get_license_data().abbreviation }}</a>
{% else %}
{% trans %}All rights reserved{% endtrans %}
{% endif %}
</p>
{% endblock %}