aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-05-28 16:34:47 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-05-28 16:35:14 -0500
commitab4cbb103ebcb00b7473c4344b1d3a5da2770824 (patch)
tree39b4f67704cf5cf87c4f1cf7c79b3c885d93fbb3
parentf9e032212dff4d54de644cb5537bc0bef6d24c7f (diff)
downloadmediagoblin-ab4cbb103ebcb00b7473c4344b1d3a5da2770824.tar.lz
mediagoblin-ab4cbb103ebcb00b7473c4344b1d3a5da2770824.tar.xz
mediagoblin-ab4cbb103ebcb00b7473c4344b1d3a5da2770824.zip
Fixing bug where non-image types might break if app_config['original_date_visible'] is true
Not all media managers have the .get_original_date attribute, so of course break. This is fixed by making a new space where individual media types can define this if they like. This commit sponsored by Matthieu Dupont de Dinechin. Thank you!
-rw-r--r--mediagoblin/templates/mediagoblin/media_displays/image.html17
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html15
2 files changed, 19 insertions, 13 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html
index 158dd67f..d0050f50 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/image.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/image.html
@@ -27,3 +27,20 @@
{{ super() }}
{% template_hook("image_sideinfo") %}
{% endblock %}
+
+{% block mediagoblin_after_added_sidebar %}
+ {% if app_config['original_date_visible'] %}
+ {% set original_date = media.media_manager.get_original_date() %}
+
+ {% if original_date %}
+ <h3>{% trans %}Created{% endtrans %}</h3>
+
+ <p><span title="{{ original_date.strftime("%I:%M%p %Y-%m-%d") }}">
+ {%- trans formatted_time=timesince(original_date) -%}
+ {{ formatted_time }} ago
+ {%- endtrans -%}
+ </span></p>
+ {%- endif %}
+ {% endif %}
+{% endblock %}
+
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 92c01c48..fb892fd7 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -154,19 +154,8 @@
{%- endtrans -%}
</span></p>
- {% if app_config['original_date_visible'] %}
- {% set original_date = media.media_manager.get_original_date() %}
-
- {% if original_date %}
- <h3>{% trans %}Created{% endtrans %}</h3>
-
- <p><span title="{{ original_date.strftime("%I:%M%p %Y-%m-%d") }}">
- {%- trans formatted_time=timesince(original_date) -%}
- {{ formatted_time }} ago
- {%- endtrans -%}
- </span></p>
- {%- endif %}
- {% endif %}
+ {% block mediagoblin_after_added_sidebar %}
+ {% endblock %}
{% if media.tags %}
{% include "mediagoblin/utils/tags.html" %}