Fixing bug where non-image types might break if app_config['original_date_visible...

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!

diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html
index 158dd67fb5a771814c6356feb52ede21c0fb9bf0..d0050f5088c6dfa6ac60c417822df0f65f86b6fb 100644 (file)
--- 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 92c01c48b6e1791b4dd048779bb115b848682565..fb892fd788ab1e364a2eea976dcd33009c594fd3 100644 (file)
--- 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" %}