diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-11 13:48:42 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-11 13:48:42 -0500 |
| commit | 058226d0d2d877715b263fd441deb01821f1f59a (patch) | |
| tree | c0871be7592fa4e86c6e98a23d1b197560ab56a9 /mediagoblin/templates | |
| parent | aac428bac2a4967999e1fad40ca9d3a7c6b71199 (diff) | |
| parent | 2d8ce464de32611a86532313564e2e5ff1e2c0e5 (diff) | |
| download | mediagoblin-058226d0d2d877715b263fd441deb01821f1f59a.tar.lz mediagoblin-058226d0d2d877715b263fd441deb01821f1f59a.tar.xz mediagoblin-058226d0d2d877715b263fd441deb01821f1f59a.zip | |
Merge remote-tracking branch 'refs/remotes/tryggvib/532-exif-creation-date'
Conflicts:
mediagoblin/config_spec.ini
mediagoblin/templates/mediagoblin/user_pages/media.html
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 6d32d009..8a65e4e9 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -153,6 +153,17 @@ {{ formatted_time }} ago {%- endtrans -%} </span></p> + + {% if app_config['original_date_visible'] %} + {% set original_date = media.media_data.get_original_date() %} + {% if original_date -%} + {% trans date=original_date.strftime("%Y-%m-%d") -%} + <h3>Created on</h3> + <p>{{ date }}</p> + {%- endtrans %} + {%- endif %} + {% endif %} + {% if media.tags %} {% include "mediagoblin/utils/tags.html" %} {% endif %} |