diff options
| author | Joar Wandborg <joar@wandborg.se> | 2013-05-23 22:21:02 +0200 |
|---|---|---|
| committer | Joar Wandborg <joar@wandborg.se> | 2013-05-23 22:21:02 +0200 |
| commit | 14aa2eaa197f776966f0041085276f4ec08218ae (patch) | |
| tree | ca2082446b9ddfed4626e4545c209263f798df16 /mediagoblin/templates | |
| parent | 24ede04415df1a79da83e2716ab3c714e2080563 (diff) | |
| download | mediagoblin-14aa2eaa197f776966f0041085276f4ec08218ae.tar.lz mediagoblin-14aa2eaa197f776966f0041085276f4ec08218ae.tar.xz mediagoblin-14aa2eaa197f776966f0041085276f4ec08218ae.zip | |
Cleaned up EXIF view
The last update made the assumption that EXIF metadata is in some way
consistent between camera models, images, manufacturers. This update
takes into account that nothing is certain whenever EXIF is involved.
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/exif.html | 52 |
1 files changed, 4 insertions, 48 deletions
diff --git a/mediagoblin/templates/mediagoblin/utils/exif.html b/mediagoblin/templates/mediagoblin/utils/exif.html index 746dccf5..b62208e1 100644 --- a/mediagoblin/templates/mediagoblin/utils/exif.html +++ b/mediagoblin/templates/mediagoblin/utils/exif.html @@ -17,32 +17,6 @@ #} {% block exif_content %} -<style type="text/css"> -#exif_content h3 { - border-bottom: 1px solid #333; -} -#exif_camera_information { - margin-bottom: 20px; -} - -#exif_additional_info { - display: none; -} -#exif_additional_info table { - font-size: 11px; - margin-top: 10px; -} -#exif_additional_info td { - vertical-align: top; - padding-bottom: 5px; -} -#exif_content .col1 { - padding-right: 20px; -} -#exif_additional_info table tr { - margin-bottom: 10px; -} -</style> <noscript> <style type="text/css"> #exif_additional_info { @@ -58,30 +32,12 @@ <h3>Camera Information</h3> <table id="exif_camera_information"> <tbody> + {% for label, value in media.exif_display_data_short().iteritems() %} <tr> - <td class="col1">Taken on</td> - <td>{{ media.exif_display_data_short()['Date Taken'] }}</td> - </tr> - <tr> - <td class="col1">Camera</td> - <td>{{ media.exif_display_data_short()['Camera'] }}</td> - </tr> - <tr> - <td class="col1">Exposure</td> - <td>{{ media.exif_display_data_short()['Exposure'] }}</td> - </tr> - <tr> - <td class="col1">Aperture</td> - <td>{{ media.exif_display_data_short()['Aperture'] }}</td> - </tr> - <tr> - <td class="col1">ISO</td> - <td>{{ media.exif_display_data_short()['ISO'] }}</td> - </tr> - <tr> - <td class="col1">Focal Length</td> - <td>{{ media.exif_display_data_short()['Focal Length'] }}</td> + <td class="col1">{{ label }}</td> + <td>{{ value }}</td> </tr> + {% endfor %} </tbody> </table> <h3 id="exif_additional_info_button" class="button_action"> |